Fixed issue #12372: unsuitable and potentially derogatory CAPTCHA

Dev: changed captcha to use mathematical quations again
LimeSurvey · Jun 6, 2017 · f762a94 · f762a94
1 parent 6e56319
commit f762a94
Show file tree

Hide file tree

Showing 17 changed files with 916 additions and 6 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -50,6 +50,8 @@
         // yiiwheels configuration
         'yiiwheels' => realpath(__DIR__ . '/../extensions/yiiwheels'),
         'vendor.twbs.bootstrap.dist',
+        // 'CaptchaExtendedAction' => realpath(__DIR__ . '/../extensions/captchaExtended/CaptchaExtendedAction.php'),
+        // 'CaptchaExtendedValidator' => realpath(__DIR__ . '/../extensions/captchaExtended/CaptchaExtendedValidator.php')
     ),
 
     'modules'=>array(
@@ -81,6 +83,8 @@
         'bootstrap.widgets.*',
         'bootstrap.behaviors.*',
         'yiiwheels.widgets.select2.WhSelect2',
+        'ext.captchaExtended.CaptchaExtendedAction',
+        'ext.captchaExtended.CaptchaExtendedValidator'
 
     ),
     'preload' => array ('log'),

diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -40,8 +40,8 @@ public function actions()
     {
         return array(
             'captcha' => array(
-                'class' => 'CCaptchaAction',
-                'backColor'=>0xf6f6f6
+                'class' => 'CaptchaExtendedAction',
+                'mode'=>CaptchaExtendedAction::MODE_LOGICAL
             )
         );
     }

diff --git a/application/controllers/SurveyController.php b/application/controllers/SurveyController.php
@@ -71,8 +71,9 @@ public function actions()
             'uploader' => 'application.controllers.uploader',
             'verification' => 'application.controllers.verification',
             'captcha' => array(
-                'class' => 'CCaptchaAction', 
-                'backColor'=>0xf6f6f6
+              'class'=>'CaptchaExtendedAction',
+              // if needed, modify settings
+              'mode'=>CaptchaExtendedAction::MODE_LOGICAL,
             )
         );
     }

diff --git a/application/extensions/captchaExtended/CHANGELOG b/application/extensions/captchaExtended/CHANGELOG
@@ -0,0 +1,16 @@
+Captcha Extended Change Log
+===========================
+
+Version 1.0.2 Sept 19, 2013
+---------------------------
+- bugfix: skip captcha counter incrementation if clientajax validation is turned on. Otherwise captcha code would be silently invalidated after entering as many form fields as the number of allowed captcha attempts.
+
+Version 1.0.1 July 01, 2012
+---------------------------
+- fixed client-side validation that generated incorrect validation hash
+
+Version 1.0.0 August 29, 2011
+----------------------------
+Initial release
+
+Please report bugs to lubosdz AT hotmail DOT com.