r15752 - /trunk/libauthen-captcha-perl/Captcha.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Feb 27 14:43:51 2008
New Revision: 15752

URL: http://svn.debian.org/wsvn/?sc=1&rev=15752
Log:
Revert Captche.pm to the original version

Modified:
    trunk/libauthen-captcha-perl/Captcha.pm

Modified: trunk/libauthen-captcha-perl/Captcha.pm
URL: http://svn.debian.org/wsvn/trunk/libauthen-captcha-perl/Captcha.pm?rev=15752&op=diff
==============================================================================
--- trunk/libauthen-captcha-perl/Captcha.pm (original)
+++ trunk/libauthen-captcha-perl/Captcha.pm Wed Feb 27 14:43:51 2008
@@ -232,11 +232,7 @@
 	foreach my $line (@data) 
 	{
 		$line =~ s/\n//;
-        # Fixes Debian Bug #409731
-        # Extract untainted time and code
-        # Patch provided by Chris Dunlop <chris at onthe.net.au>
-        # applied by Ernesto Hernández-Novich <emhn at usb.ve>
-        my ($data_time,$data_code) = $line =~ m/(^\d+)::([[:xdigit:]]{32})$/;
+		my ($data_time,$data_code) = split(/::/,$line);
 		
 		my $png_file = File::Spec->catfile($self->output_folder(),$data_code . ".png");
 		if ($data_code eq $crypt)
@@ -355,12 +351,7 @@
 	foreach my $line (@data) 
 	{
 		$line =~ s/\n//;
-        # Fixes Debian Bug #409731
-        # Extract untainted time and code
-        # Patch provided by Chris Dunlop <chris at onthe.net.au>
-        # applied by Ernesto Hernández-Novich <emhn at usb.ve>
-        my ($data_time,$data_code) = $line =~ m/(^\d+)::([[:xdigit:]]{32})$/;
-
+		my ($data_time,$data_code) = split(/::/,$line);
 		if ( (($current_time - $data_time) > ($self->expire())) ||
 		     ($data_code  eq $md5) )
 		{	# remove expired captcha, or a dup