| [vhffs-dev] [1465] Actually the Authen::Captcha module were not modified as expected, removing it |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1465
Author: gradator
Date: 2009-06-29 23:12:42 +0200 (Mon, 29 Jun 2009)
Log Message:
-----------
Actually the Authen::Captcha module were not modified as expected, removing it
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Makefile.am
trunk/vhffs-panel/show_code.pl
trunk/vhffs-panel/subscribe.pl
Removed Paths:
-------------
trunk/vhffs-api/src/Vhffs/Panel/Captcha/
trunk/vhffs-api/src/Vhffs/Panel/Captcha.pm
Modified: trunk/vhffs-api/src/Vhffs/Makefile.am
===================================================================
--- trunk/vhffs-api/src/Vhffs/Makefile.am 2009-06-29 21:00:40 UTC (rev 1464)
+++ trunk/vhffs-api/src/Vhffs/Makefile.am 2009-06-29 21:12:42 UTC (rev 1465)
@@ -22,7 +22,6 @@
User.pm \
Panel/Admin.pm \
Panel/Avatar.pm \
- Panel/Captcha.pm \
Panel/Commons.pm \
Panel/Cvs.pm \
Panel/DNS.pm \
@@ -72,46 +71,7 @@
Tag/Category.pm \
Tag/Request.pm
-files_no_sed = \
- Panel/Captcha/images/a.png \
- Panel/Captcha/images/b.png \
- Panel/Captcha/images/c.png \
- Panel/Captcha/images/d.png \
- Panel/Captcha/images/e.png \
- Panel/Captcha/images/f.png \
- Panel/Captcha/images/g.png \
- Panel/Captcha/images/h.png \
- Panel/Captcha/images/i.png \
- Panel/Captcha/images/j.png \
- Panel/Captcha/images/k.png \
- Panel/Captcha/images/l.png \
- Panel/Captcha/images/m.png \
- Panel/Captcha/images/n.png \
- Panel/Captcha/images/o.png \
- Panel/Captcha/images/p.png \
- Panel/Captcha/images/q.png \
- Panel/Captcha/images/r.png \
- Panel/Captcha/images/s.png \
- Panel/Captcha/images/t.png \
- Panel/Captcha/images/u.png \
- Panel/Captcha/images/v.png \
- Panel/Captcha/images/w.png \
- Panel/Captcha/images/x.png \
- Panel/Captcha/images/y.png \
- Panel/Captcha/images/z.png \
- Panel/Captcha/images/2.png \
- Panel/Captcha/images/3.png \
- Panel/Captcha/images/4.png \
- Panel/Captcha/images/5.png \
- Panel/Captcha/images/6.png \
- Panel/Captcha/images/7.png \
- Panel/Captcha/images/8.png \
- Panel/Captcha/images/9.png \
- Panel/Captcha/images/background1.png \
- Panel/Captcha/images/background2.png \
- Panel/Captcha/images/background3.png \
- Panel/Captcha/images/background4.png \
- Panel/Captcha/images/background5.png
+files_no_sed =
nobase_dist_api_DATA = \
$(files_do_sed) \
Deleted: trunk/vhffs-api/src/Vhffs/Panel/Captcha.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Captcha.pm 2009-06-29 21:00:40 UTC (rev 1464)
+++ trunk/vhffs-api/src/Vhffs/Panel/Captcha.pm 2009-06-29 21:12:42 UTC (rev 1465)
@@ -1,737 +0,0 @@
-package Vhffs::Panel::Captcha;
-
-# $Source: /usr/local/cvs/Captcha/pm/Captcha.pm,v $
-# $Revision: 1.23 $
-# $Date: 2003/12/18 04:44:34 $
-# $Author: jmiller $
-# License: GNU General Public License Version 2 (see license.txt)
-
-use 5.00503;
-use strict;
-use GD;
-use Digest::MD5 qw(md5_hex);
-use Carp;
-# these are used to find default images dir
-use File::Basename;
-use File::Spec;
-
-use vars qw($VERSION);
-
-$VERSION = sprintf "%d.%03d", q$Revision: 1.23 $ =~ /(\d+)/g;
-
-# get our file name, used to find the default images
-my $default_images_folder;
-{
- my $this_file = __FILE__;
- my $this_dir = dirname($this_file);
- my @this_dirs = File::Spec->splitdir( $this_dir );
- $default_images_folder = File::Spec->catdir(@this_dirs,'Captcha','images');
-}
-
-my $num_of_soundfile_versions = 10;
-
-# Preloaded methods go here.
-
-sub new
-{
- my ($this) = shift;
- my $class = ref($this) || $this;
- my $self = {};
- bless( $self, $class );
-
- my %opts = @_;
-
- # default character source images
- my $type = defined($opts{type}) ? $opts{type} : 'image';
- $self->type($type);
- my $src_images = (defined($opts{images_folder}) && (-d $opts{images_folder}))
- ? $opts{images_folder} : $default_images_folder;
- $self->images_folder($src_images);
-
- my $debug = (defined($opts{debug}) && ($opts{debug} =~ /^\d+$/))
- ? $opts{debug} : 0;
- $self->debug($debug);
- $self->data_folder($opts{data_folder}) if($opts{data_folder});
- $self->output_folder($opts{output_folder}) if($opts{output_folder});
- my $expire = (defined($opts{expire}) && ($opts{expire} =~ /^\d+$/))
- ? $opts{expire} : 300;
- $self->expire($expire);
- my $width = (defined($opts{width}) && ($opts{width} =~ /^\d+$/))
- ? $opts{width} : 25;
- $self->width($width);
- my $height = (defined($opts{height}) && ($opts{height} =~ /^\d+$/))
- ? $opts{height} : 35;
- $self->height($height);
- my $keep_failures = (defined($opts{keep_failures}) && $opts{keep_failures})
- ? 1 : 0;
- $self->keep_failures($keep_failures);
-
- # create a random seed if perl version less than 5.004
- if ($] < 5.005)
- { # have to seed rand. using a fairly good seed
- srand( time() ^ ($$ + ($$ << 15)) );
- } # else, we're just going to let perl do it's thing
-
- return $self;
-}
-
-sub type
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- {
- if ($_[0] =~ /^(jpg|png|gif|image|picture)$/i)
- {
- $self->{_type} = 'image';
- } elsif ($_[0] =~ /^(sound|snd|wav|mp3)$/i) {
- $self->{_type} = 'sound';
- }
- return $self->{_type};
- } else {
- return $self->{_type};
- }
-}
-
-sub debug
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- {
- $self->{_debug} = $_[0];
- return $self->{_debug};
- } else {
- return $self->{_debug};
- }
-}
-
-sub keep_failures
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- {
- croak "keep_failures must be a zero or one" unless ($_[0] =~ /^[01]$/);
- $self->{_keep_failures} = $_[0];
- return $self->{_keep_failures};
- } else {
- return $self->{_keep_failures};
- }
-}
-
-sub expire
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- {
- croak "expire must be a possitive integer" unless ($_[0] =~ /^\d+$/);
- $self->{_expire} = $_[0];
- return $self->{_expire};
- } else {
- return $self->{_expire};
- }
-}
-
-sub width
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- {
- croak "width must be a possitive integer" unless ($_[0] =~ /^\d+$/);
- $self->{_width} = $_[0];
- return $self->{_width};
- } else {
- return $self->{_width};
- }
-}
-
-sub height
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- {
- croak "height must be a possitive integer" unless ($_[0] =~ /^\d+$/);
- $self->{_height} = $_[0];
- return $self->{_height};
- } else {
- return $self->{_height};
- }
-}
-
-sub output_folder
-{
-
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- { # it's a setter
- $self->{_output_folder} = $_[0];
- return $self->{_output_folder};
- } else {
- return $self->{_output_folder};
- }
-}
-
-sub images_folder
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- { # it's a setter
- $self->{_images_folder} = $_[0];
- return $self->{_images_folder};
- } else {
- return $self->{_images_folder};
- }
-}
-
-sub data_folder
-{
- ref(my $self = shift) or croak "instance variable needed";
- if (@_)
- { # it's a setter
- $self->{_data_folder} = $_[0];
- return $self->{_data_folder};
- } else {
- return $self->{_data_folder};
- }
-}
-
-
-sub check_code
-{
- ref(my $self = shift) or croak "instance variable needed";
- my ($code, $crypt) = @_;
-
- $code = lc($code);
-
- warn "$code $crypt\n" if($self->debug() >= 2);
-
- my $current_time = time;
- my $return_value = 0;
- my $database_file = File::Spec->catfile($self->data_folder(),"codes.txt");
-
- # create database file if it doesn't already exist
- $self->_touch_file($database_file);
-
- # zeros (0) and ones (1) are not part of the code
- # they could be confused with (o) and (l), so we swap them in
- $code =~ tr/01/ol/;
-
- my $md5 = md5_hex($code);
-
- # pull in current database
- warn "Open File: $database_file\n" if($self->debug() >= 2);
- open (DATA, "<$database_file") or die "Can't open File: $database_file\n";
- flock DATA, 1; # read lock
- my @data=<DATA>;
- close(DATA);
- warn "Close File: $database_file\n" if($self->debug() >= 2);
-
- my $passed=0;
- # $new_data will hold the part of the database we want to keep and
- # write back out
- my $new_data = "";
- my $found;
- foreach my $line (@data)
- {
- $line =~ s/\n//;
- my ($data_time,$data_code) = split(/::/,$line);
-
- my $png_file = File::Spec->catfile($self->output_folder(),$data_code . ".png");
- if ($data_code eq $crypt)
- {
- # the crypt was found in the database
- if (($current_time - $data_time) > $self->expire())
- {
- warn "Crypt Found But Expired\n" if($self->debug() >= 2);
- # the crypt was found but has expired
- $return_value = -1;
- } else {
- warn "Match Crypt in File Crypt: $crypt\n" if($self->debug() >= 2);
- $found = 1;
- }
- if ( ($md5 ne $crypt) && ($return_value != -1) && $self->keep_failures())
- { # solution was wrong, not expired, and we're keeping failures
- $new_data .= $line."\n";
- } else {
- # remove the found crypt so it can't be used again
- warn "Unlink File: " . $png_file . "\n" if($self->debug() >= 2);
- unlink($png_file) or carp("Can't remove png file [$png_file]\n");
- }
- } elsif (($current_time - $data_time) > $self->expire()) {
- # removed expired crypt
- warn "Removing Expired Crypt File: " . $png_file ."\n" if($self->debug() >= 2);
- unlink($png_file) or carp("Can't remove png file [$png_file]\n");
- } else {
- # crypt not found or expired, keep it
- $new_data .= $line."\n";
- }
- }
-
- if ($md5 eq $crypt)
- {
- warn "Match: " . $md5 . " And " . $crypt . "\n" if($self->debug() >= 2);
- # solution was correct
- if ($found)
- {
- # solution was correct and was found in database - passed
- $return_value = 1;
- } elsif (!$return_value) {
- # solution was not found in database
- $return_value = -2;
- }
- } else {
- warn "No Match: " . $md5 . " And " . $crypt . "\n" if($self->debug() >= 2);
- # incorrect solution
- $return_value = -3;
- }
-
- # update database
- open(DATA,">$database_file") or die "Can't open File: $database_file\n";
- flock DATA, 2; # write lock
- print DATA $new_data;
- close(DATA);
-
- return $return_value;
-}
-
-sub _touch_file
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $file = shift;
- # create database file if it doesn't already exist
- if (! -e $file)
- {
- open (DATA, ">>$file") or die "Can't create File: $file\n";
- close(DATA);
- }
-}
-
-sub generate_random_string
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $length = shift;
-
- # generate a new code
- my $code = "";
- for(my $i=0; $i < $length; $i++)
- {
- my $char;
- my $list = int(rand 4) +1;
- if ($list == 1)
- { # choose a number 1/4 of the time
- $char = int(rand 7)+50;
- } else { # choose a letter 3/4 of the time
- $char = int(rand 25)+97;
- }
- $char = chr($char);
- $code .= $char;
- }
- return $code;
-}
-
-sub _save_code
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $code = shift;
- my $md5 = shift;
-
- my $database_file = File::Spec->catfile($self->data_folder(),'codes.txt');
-
- # set a variable with the current time
- my $current_time = time;
-
- # create database file if it doesn't already exist
- $self->_touch_file($database_file);
-
- # clean expired codes and images
- open (DATA, "<$database_file") or die "Can't open File: $database_file\n";
- flock DATA, 1; # read lock
- my @data=<DATA>;
- close(DATA);
-
- my $new_data = "";
- foreach my $line (@data)
- {
- $line =~ s/\n//;
- my ($data_time,$data_code) = split(/::/,$line);
- if ( (($current_time - $data_time) > ($self->expire())) ||
- ($data_code eq $md5) )
- { # remove expired captcha, or a dup
- my $png_file = File::Spec->catfile($self->output_folder(),$data_code . ".png");
- unlink($png_file) or carp("Can't remove png file [$png_file]\n");
- } else {
- $new_data .= $line."\n";
- }
- }
-
- # save the code to database
- warn "open File: $database_file\n" if($self->debug() >= 2);
- open(DATA,">$database_file") or die "Can't open File: $database_file\n";
- flock DATA, 2; # write lock
- warn "-->>" . $new_data . "\n" if($self->debug() >= 2);
- warn "-->>" . $current_time . "::" . $md5."\n" if($self->debug() >= 2);
- print DATA $new_data;
- print DATA $current_time."::".$md5."\n";
- close(DATA);
- warn "Close File: $database_file\n" if($self->debug() >= 2);
-
-}
-
-sub create_image_file
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $code = shift;
- my $md5 = shift;
-
- my $length = length($code);
- my $im_width = $self->width();
- # create a new image and color
- my $im = new GD::Image(($im_width * $length),$self->height());
- my $black = $im->colorAllocate(0,0,0);
-
- # copy the character images into the code graphic
- for(my $i=0; $i < $length; $i++)
- {
- my $letter = substr($code,$i,1);
- my $letter_png = File::Spec->catfile($self->images_folder(),$letter . ".png");
- my $source = new GD::Image($letter_png);
- $im->copy($source,($i*($self->width()),0,0,0,$self->width(),$self->height()));
- my $a = int(rand (int(($self->width())/14)))+0;
- my $b = int(rand (int(($self->height())/12)))+0;
- my $c = int(rand (int(($self->width())/3)))-(int(($self->width())/5));
- my $d = int(rand (int(($self->height())/3)))-(int(($self->height())/5));
- $im->copyResized($source,($i*($self->width()))+$a,$b,0,0,($self->width())+$c,($self->height())+$d,$self->width(),$self->height());
- }
-
- # distort the code graphic
- for(my $i=0; $i<($length*($self->width())*($self->height())/14+200); $i++)
- {
- my $a = (int(rand ($length*($self->width())))+0);
- my $b = (int(rand $self->height())+0);
- my $c = (int(rand ($length*($self->width())))+0);
- my $d = (int(rand $self->height())+0);
- my $index = $im->getPixel($a,$b);
- if ($i < (($length*($self->width())*($self->height())/14+200)/100))
- {
- $im->line($a,$b,$c,$d,$index);
- } elsif ($i < (($length*($self->width())*($self->height())/14+200)/2)) {
- $im->setPixel($c,$d,$index);
- } else {
- $im->setPixel($c,$d,$black);
- }
- }
-
- # generate a background
- my $a = int(rand 5)+1;
- my $background_img = File::Spec->catfile($self->images_folder(),"background" . $a . ".png");
- my $source = new GD::Image($background_img);
- my ($background_width,$background_height) = $source->getBounds();
- my $b = int(rand (int($background_width/13)))+0;
- my $c = int(rand (int($background_height/7)))+0;
- my $d = int(rand (int($background_width/13)))+0;
- my $e = int(rand (int($background_height/7)))+0;
- my $source2 = new GD::Image(($length*($self->width())),$self->height());
- $source2->copyResized($source,0,0,$b,$c,($length*($self->width())),$self->height(),$background_width-$b-$d,$background_height-$c-$e);
-
- # merge the background onto the image
- $im->copyMerge($source2,0,0,0,0,($length*($self->width())),$self->height(),40);
-
- # add a border
- $im->rectangle(0,0,((($length)*($self->width()))-1),(($self->height())-1),$black);
-
- # save the image to file
- my $png_data = $im->png;
-
- return \$png_data;
-}
-
-sub create_sound_file
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $code = shift;
- my $md5 = shift;
- my $length = length($code);
-
- my @chars = split('',$code);
- my $snd_file;
- local $/; # input record separator. So we can slurp the data.
- # get a random voice speaking the code
- foreach my $char (@chars)
- {
- my $voice = int(rand $num_of_soundfile_versions) + 1;
- my $src_name = File::Spec->catfile($self->images_folder(),$voice, $char . ".wav");
- warn "Open File: $src_name\n" if($self->debug() >= 2);
- open (FILE,"< $src_name") or die "Can't open File: $src_name\n";
- flock FILE, 1; # read lock
- binmode FILE;
- $snd_file .= <FILE>;
- close FILE;
- warn "Close File: $src_name\n" if($self->debug() >= 2);
- }
- return \$snd_file;
-}
-
-sub _save_file
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $file_ref = shift;
- my $file_name = shift;
-
- warn "Open File: $file_name\n" if($self->debug() >= 2);
- open (FILE,">$file_name") or die "Can't open File: $file_name \n";
- flock FILE, 2; # write lock
- binmode FILE;
- print FILE $$file_ref;
- close FILE;
- warn "Close File: $file_name\n" if($self->debug() >= 2);
-}
-
-sub generate_code
-{
- ref(my $self = shift) or croak "instance variable needed";
- my $length = shift;
-
- my $code = $self->generate_random_string($length);
- my $md5 = md5_hex($code);
-
- my ($captcha_data_ref,$output_filename);
- if ($self->type() eq 'image')
- {
- $captcha_data_ref = $self->create_image_file($code,$md5);
- $output_filename = File::Spec->catfile($self->output_folder(),$md5 . ".png");
- } elsif ($self->type() eq 'sound') {
- $captcha_data_ref = $self->create_sound_file($code,$md5);
- $output_filename = File::Spec->catfile($self->output_folder(),$md5 . ".wav");
- } else {
- croak "invalid captcha type [" . $self->type() . "]";
- }
-
- $self->_save_file($captcha_data_ref,$output_filename);
- $self->_save_code($code,$md5);
-
- # return crypt (md5)... or, if they want it, the code as well.
- return wantarray ? ($md5,$code) : $md5;
-}
-
-sub version
-{
- return $VERSION;
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-Authen::Captcha - Perl extension for creating captcha's to verify the human element in transactions.
-
-=head1 SYNOPSIS
-
- use Authen::Captcha;
-
- # create a new object
- my $captcha = Authen::Captcha->new();
-
- # set the data_folder. contains flatfile db to maintain state
- $captcha->data_folder('/some/folder');
-
- # set directory to hold publicly accessable images
- $captcha->output_folder('/some/http/folder');
-
- # Alternitively, any of the methods to set variables may also be
- # used directly in the constructor
-
- my $captcha = Authen::Captcha->new(
- data_folder => '/some/folder',
- output_folder => '/some/http/folder',
- );
-
- # create a captcha. Image filename is "$md5sum.png"
- my $md5sum = $captcha->generate_code($number_of_characters);
-
- # check for a valid submitted captcha
- # $code is the submitted letter combination guess from the user
- # $md5sum is the submitted md5sum from the user (that we gave them)
- my $results = $captcha->check_code($code,$md5sum);
- # $results will be one of:
- # 1 : Passed
- # 0 : Code not checked (file error)
- # -1 : Failed: code expired
- # -2 : Failed: invalid code (not in database)
- # -3 : Failed: invalid code (code does not match crypt)
- ##############
-
-=head1 ABSTRACT
-
-Authen::Captcha provides an object oriented interface to captcha file creations. Captcha stands for Completely Automated Public Turning test to tell Computers and Humans Apart. A Captcha is a program that can generate and grade tests that:
-
- - most humans can pass.
- - current computer programs can't pass
-
-The most common form is an image file containing distorted text, which humans are adept at reading, and computers (generally) do a poor job.
-This module currently implements that method. We plan to add other methods,
-such as distorted sound files, and plain text riddles.
-
-=head1 REQUIRES
-
- GD (see http://search.cpan.org/~lds/GD-2.11/)
- Digest::MD5 (standard perl module)
-
-In most common situations, you'll also want to have:
-
- A web server (untested on windows, but it should work)
- cgi-bin or mod-perl access
- Perl: Perl 5.00503 or later must be installed on the web server.
- GD.pm (with PNG support)
-
-=head1 INSTALLATION
-
-Download the zipped tar file from:
-
- http://search.cpan.org/search?dist=Authen-Captcha
-
-Unzip the module as follows or use winzip:
-
- tar -zxvf Authen-Captcha-1.xxx.tar.gz
-
-The module can be installed using the standard Perl procedure:
-
- perl Makefile.PL
- make
- make test
- make install # you need to be root
-
-Windows users without a working "make" can get nmake from:
-
- ftp://ftp.microsoft.com/Softlib/MSLFILES/nmake15.exe
-
-=head1 METHODS
-
-=head2 MAIN METHODS
-
-=over
-
-=item C<$captcha = Authen::Captcha-E<gt>new();>
-
-This creates a new Captcha object.
-Optionally, you can pass in a hash with configuration information.
-See the method descriptions for more detail on what they mean.
-
-=over 2
-
- data_folder => '/some/folder', # required
- output_folder => '/some/http/folder', # required
- expire => 300, # optional. default 300
- width => 25, # optional. default 25
- height => 35, # optional. default 35
- images_folder => '/some/folder', # optional. default to lib dir
- keep_failures => 0, # optional, defaults to 0(false)
- debug => 0, # optional. default 0
-
-=back
-
-=item C<$md5sum = $captcha-E<gt>generate_code( $number_of_characters );>
-
-Creates a captcha. Image filename is "$md5sum.png"
-
-It can also be called in array context to retrieve the string of characters used to generate the captcha (the string the user is expected to respond with). This is useful for debugging.
-ex.
-
-C<($md5sum,$chars) = $captcha-E<gt>generate_code( $number_of_characters );>
-
-=item C<$results = $captcha-E<gt>check_code($code,$md5sum);>
-
-check for a valid submitted captcha
-
-$code is the submitted letter combination guess from the user
-
-$md5sum is the submitted md5sum from the user (that we gave them)
-
-If the $code and $md5sum are correct, the image file and database entry will be removed.
-
-If the $md5sum matches one in the database, and "keep_failures" is false (the default), the image file and database entry will be removed to avoid repeated attempts on the same captcha.
-
-$results will be one of:
-
- 1 : Passed
- 0 : Code not checked (file error)
- -1 : Failed: code expired
- -2 : Failed: invalid code (not in database)
- -3 : Failed: invalid code (code does not match crypt)
-
-=back
-
-=head2 ACCESSOR METHODS
-
-=over
-
-=item C<$captcha-E<gt>data_folder( '/some/folder' );>
-
-Required. Sets the directory to hold the flatfile database that will be used to store the current non-expired valid captcha md5sum's.
-Must be writable by the process running the script (usually the web server user, which is usually either "apache" or "http"), but should not be accessable to the end user.
-
-=item C<$captcha-E<gt>output_folder( '/some/folder' );>
-
-Required. Sets the directory to hold the generated Captcha image files. This is usually a web accessable directory so that the user can view the images in here, but it doesn't have to be web accessable (you could be attaching the images to an e-mail for some verification, or some other Captcha implementation).
-Must be writable by the process running the script (usually the web server user, which is usually either "apache" or "http").
-
-=item C<$captcha-E<gt>images_folder( '/some/folder' );>
-
-Optional, and may greatly affect the results... use with caution. Allows you to override the default character graphic png's and backgrounds with your own set of graphics. These are used in the generation of the final captcha image file. The defaults are held in:
- [lib install dir]/Authen/Captcha/images
-
-=item C<$captcha-E<gt>expire( 300 );>
-
-Optional. Sets the number of seconds this captcha will remain valid. This means that the created captcha's will not remain valid forever, just as long as you want them to be active. Set to an appropriate value for your application. Defaults to 300.
-
-=item C<$captcha-E<gt>width( 25 );>
-
-Optional. Number of pixels high for the character graphics. Defaults to 25.
-
-=item C<$captcha-E<gt>height( 35 );>
-
-Optional. Number of pixels wide for the character graphics. Defaults to 35.
-
-=item C<$captcha-E<gt>keep_failures( [0|1] );>
-
-Optional. Defaults to zero. This option controls whether or not the captcha will remain valid after a failed attempt. By default, we only allow one attempt to solve it. This greatly reduces the possibility that a bot could brute force a correct answer. Change it at your own risk.
-
-=item C<$captcha-E<gt>debug( [0|1|2] );>
-
-Optional.
-Sets the debugging bit. 1 turns it on, 0 turns it off. 2 will print out verbose messages to STDERR.
-
-=back
-
-=head1 TODO
-
-sound file captcha: Incorporating distorted sound file creation.
-
-=head1 SEE ALSO
-
-The Captcha project:
- http://www.captcha.net/
-
-The origonal perl script this came from:
- http://www.firstproductions.com/cgi/
-
-=head1 AUTHORS
-
-Seth T. Jackson, E<lt>sjackson@xxxxxxxxxxxxxxxxx<gt>
-
-Josh I. Miller, E<lt>jmiller@xxxxxxxxxxxxxxxxx<gt>
-
-First Productions, Inc. created the cgi-script distributed under the GPL which was used as the basis for this module. Much work has gone into making this more robust, and suitable for other applications, but much of the origonal code remains.
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2003, First Productions, Inc. (FIRSTPRODUCTIONS HUMAN TEST 1.0)
-
-Copyright 2003 by Seth Jackson
-
-This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. (see license.txt).
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-=cut
Modified: trunk/vhffs-panel/show_code.pl
===================================================================
--- trunk/vhffs-panel/show_code.pl 2009-06-29 21:00:40 UTC (rev 1464)
+++ trunk/vhffs-panel/show_code.pl 2009-06-29 21:12:42 UTC (rev 1465)
@@ -32,9 +32,10 @@
use strict;
use utf8;
use CGI;
+use Authen::Captcha;
+
use lib '%VHFFS_LIB_DIR%';
use Vhffs::Main;
-use Vhffs::Panel::Captcha;
my $cgi = new CGI;
$cgi->charset('utf-8');
@@ -53,7 +54,7 @@
select((select(STDOUT), $| = 1)[0]);
binmode STDOUT;
-my $captcha = Vhffs::Panel::Captcha->new;
+my $captcha = Authen::Captcha->new;
my $png = $captcha->create_image_file( $code );
print STDOUT ${$png};
close STDOUT;
Modified: trunk/vhffs-panel/subscribe.pl
===================================================================
--- trunk/vhffs-panel/subscribe.pl 2009-06-29 21:00:40 UTC (rev 1464)
+++ trunk/vhffs-panel/subscribe.pl 2009-06-29 21:12:42 UTC (rev 1465)
@@ -45,6 +45,7 @@
use Locale::gettext;
use HTML::Template;
use Encode;
+use Authen::Captcha;
use lib '%VHFFS_LIB_DIR%';
use Vhffs::User;
@@ -52,7 +53,6 @@
use Vhffs::Functions;
use Vhffs::Constants;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Captcha;
use Vhffs::Services::Newsletter;
my $panel = new Vhffs::Panel::Main();
@@ -248,7 +248,7 @@
$template->param( USECAPTCHA => $usecaptcha );
if( $usecaptcha ) {
- my $captcha = Vhffs::Panel::Captcha->new;
+ my $captcha = Authen::Captcha->new;
my $code = $captcha->generate_random_string( 6 );
$code ^= pack('H12', $captchakey) if defined $captchakey;
my $hex = unpack('H12', $code);