Item13223: added a placeholder README

... so that the packager ships the img subdir where captchas are stored
foswiki · Jul 17, 2015 · 09cc55e · 09cc55e
1 parent 3c2df3a
commit 09cc55e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 *.swp
 pub/System/CaptchaPlugin/jquery.captcha.js
 pub/System/CaptchaPlugin/jquery.captcha.css
-pub/System/CaptchaPlugin/img/
+pub/System/CaptchaPlugin/img/*.png
 CaptchaPlugin.md5
 CaptchaPlugin.sha1
 CaptchaPlugin.tgz

diff --git a/lib/Foswiki/Plugins/CaptchaPlugin.pm b/lib/Foswiki/Plugins/CaptchaPlugin.pm
@@ -1,7 +1,7 @@
 # Visual Confirmation Plugin for Foswiki Collaboration
 # Platform, http://Foswiki.org/
 #
-# Copyright (C) 2011-2014 Michael Daum, http://michaeldaumconsulting.com
+# Copyright (C) 2011-2015 Michael Daum, http://michaeldaumconsulting.com
 # Copyright (C) 2005-2007 Koen Martens, kmartens@sonologic.nl
 # Copyright (C) 2007 KwangErn Liew, kwangern@musmo.com
 #
@@ -27,8 +27,8 @@ use Foswiki::Func ();
 use Foswiki::Plugins ();
 use Foswiki::OopsException ();
 
-our $VERSION = '2.10';
-our $RELEASE = '2.10';
+our $VERSION = '2.11';
+our $RELEASE = '2.11';
 our $SHORTDESCRIPTION = 'A visual challenge-response test to prevent automated scripts from using the wiki';
 our $NO_PREFS_IN_TOPIC = 1;
 our $core;

diff --git a/lib/Foswiki/Plugins/CaptchaPlugin/Captcha.pm b/lib/Foswiki/Plugins/CaptchaPlugin/Captcha.pm
@@ -1,7 +1,7 @@
 # Visual Confirmation Plugin for Foswiki Collaboration 
 # Platform, http://Foswiki.org/
 #
-# Copyright (C) 2011-2014 Michael Daum, http://michaeldaumconsulting.com
+# Copyright (C) 2011-2015 Michael Daum, http://michaeldaumconsulting.com
 # Copyright (C) 2005-2007 Koen Martens, kmartens@sonologic.nl
 # Copyright (C) 2007 KwangErn Liew, kwangern@musmo.com
 #
@@ -38,7 +38,7 @@ sub new {
 
   my $this = bless({
     store => $store,
-    debug => Foswiki::Func::isTrue($Foswiki::cfg{Plugins}{CaptchaPlugin}{Debug}),
+    debug => $Foswiki::cfg{Plugins}{CaptchaPlugin}{Debug},
     imgDir => $pubDir . "/System/CaptchaPlugin/img",
     fontsDir => $pubDir . "/System/CaptchaPlugin/fonts",
 
@@ -244,9 +244,13 @@ sub isValid {
 
   my $remoteAddress = Foswiki::Func::getRequestObject()->remoteAddress();
 
+  $this->writeDebug("called isValid from $remoteAddress");
+
   # check secret and remote address: the response must come from the same address the challenge was created for 
   my $isValid = ($this->{secret} eq lc($response) && $remoteAddress eq $this->{remoteAddress})?1:0;
 
+  $this->writeDebug("isValid=$isValid");
+
   $this->{counter}--; # tick every check
 
   # log when the captcha was generated via a different remoteAddress
@@ -270,7 +274,10 @@ sub isValid {
   # - the challenge has been checked twice now or
   # - we force deletion now
 
-  $this->{store}->removeCaptcha($this) if !$isValid || $forceDelete || $this->{counter} <= 0;
+  if (!$isValid || $forceDelete || $this->{counter} <= 0) {
+    $this->writeDebug("deleting captcha");
+    $this->{store}->removeCaptcha($this);
+  }
 
   return $isValid;
 }

diff --git a/lib/Foswiki/Plugins/CaptchaPlugin/Core.pm b/lib/Foswiki/Plugins/CaptchaPlugin/Core.pm
@@ -1,7 +1,7 @@
 # Visual Confirmation Plugin for Foswiki Collaboration
 # Platform, http://Foswiki.org/
 #
-# Copyright (C) 2011-2014 Michael Daum, http://michaeldaumconsulting.com
+# Copyright (C) 2011-2015 Michael Daum, http://michaeldaumconsulting.com
 # Copyright (C) 2005-2007 Koen Martens, kmartens@sonologic.nl
 # Copyright (C) 2007 KwangErn Liew, kwangern@musmo.com
 #
@@ -34,7 +34,7 @@ sub new {
 
   my $this = bless({
     session => $session,
-    debug => Foswiki::Func::isTrue($Foswiki::cfg{Plugins}{CaptchaPlugin}{Debug}),
+    debug => $Foswiki::cfg{Plugins}{CaptchaPlugin}{Debug},
     saveForAll => $Foswiki::cfg{Plugins}{CaptchaPlugin}{SaveForAll} || 0,
     @_
   }, $class);

diff --git a/lib/Foswiki/Plugins/CaptchaPlugin/MANIFEST b/lib/Foswiki/Plugins/CaptchaPlugin/MANIFEST
@@ -12,6 +12,7 @@ lib/GD/SecurityImage.pm 0644
 lib/GD/SecurityImage/Styles.pm 0644
 locale/CaptchaPlugin/de.po 0644
 locale/CaptchaPlugin/Foswiki.pot 0644
+pub/System/CaptchaPlugin/img/README 0644
 pub/System/CaptchaPlugin/CaptchaSnap1.png 0644
 pub/System/CaptchaPlugin/fonts/AbscissaBold.ttf 0644
 pub/System/CaptchaPlugin/fonts/AcklinRegular.ttf 0644

diff --git a/lib/Foswiki/Plugins/CaptchaPlugin/Store.pm b/lib/Foswiki/Plugins/CaptchaPlugin/Store.pm
@@ -1,7 +1,7 @@
 # Visual Confirmation Plugin for Foswiki Collaboration 
 # Platform, http://Foswiki.org/
 #
-# Copyright (C) 2011-2014 Michael Daum, http://michaeldaumconsulting.com
+# Copyright (C) 2011-2015 Michael Daum, http://michaeldaumconsulting.com
 # Copyright (C) 2005-2007 Koen Martens, kmartens@sonologic.nl
 # Copyright (C) 2007 KwangErn Liew, kwangern@musmo.com
 #

diff --git a/pub/System/CaptchaPlugin/img/README b/pub/System/CaptchaPlugin/img/README
@@ -0,0 +1 @@
+this directory holds auto-generated captcha images