Changeset 3032

Timestamp:

07/10/2008 11:31:35 AM (5 months ago)

Author:

Geert

Message:

Pulling riddles from i18n file now. Inverted basic style to generate dark text on a light background. Clear difference from alpha style now.

Location:

trunk/system

Files:

• config/captcha.php (modified) (1 diff)
• i18n/en_US/captcha.php (modified) (1 diff)
• libraries/drivers/Captcha/Basic.php (modified) (3 diffs)
• libraries/drivers/Captcha/Riddle.php (modified) (3 diffs)

trunk/system/config/captcha.php

@@ -19 +19 @@
 $config['default'] = array
 (
-        'style'           => 'alpha',
+        'style'           => 'basic',
         'width'           => 150,
         'height'          => 50,

trunk/system/i18n/en_US/captcha.php

@@ -19 +19 @@
                 'architect', 'president', 'cockroach', 'encounter', 'terrorism', 'cylinders',
         ),
+
+        // Riddles for the Captcha_Riddle_Driver to pick from
+        // Note: use only alphanumeric characters
+        'riddles' => array
+        (
+                array('Do you hate spam? (yes or no)', 'yes'),
+                array('Are you a robot? (yes or no)', 'no'),
+                array('Fire is... (hot or cold)', 'hot'),
+                array('The season after fall is...', 'winter'),
+                array('Which day of the week is it today?', strftime('%A')),
+                array('Which month of the year are we in?', strftime('%B')),
+        ),
 );

trunk/system/libraries/drivers/Captcha/Basic.php

@@ -35 +35 @@
 
                 // Add a random gradient
-                $color1 = imagecolorallocate($this->image, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
-                $color2 = imagecolorallocate($this->image, mt_rand(0, 100), mt_rand(0, 100), mt_rand(0, 100));
+                $color1 = imagecolorallocate($this->image, mt_rand(200, 255), mt_rand(200, 255), mt_rand(200, 255));
+                $color2 = imagecolorallocate($this->image, mt_rand(200, 255), mt_rand(200, 255), mt_rand(200, 255));
                 $this->image_gradient($color1, $color2);
 
@@ -42 +42 @@
                 for ($i = 0, $count = mt_rand(5, Captcha::$config['complexity'] * 3); $i < $count; $i++)
                 {
-                        $color = imagecolorallocatealpha($this->image, mt_rand(100, 255), mt_rand(100, 255), mt_rand(100, 255), mt_rand(50, 120));
-                        imageline($this->image, mt_rand(0, Captcha::$config['width']), mt_rand(0, Captcha::$config['height']), mt_rand(0, Captcha::$config['width']), mt_rand(0, Captcha::$config['height']), $color);
+                        $color = imagecolorallocatealpha($this->image, mt_rand(0, 255), mt_rand(0, 255), mt_rand(100, 255), mt_rand(50, 120));
+                        imageline($this->image, mt_rand(0, Captcha::$config['width']), 0, mt_rand(0, Captcha::$config['width']), Captcha::$config['height'], $color);
                 }
 
@@ -54 +54 @@
                 {
                         // Allocate random color, size and rotation attributes to text
-                        $color = imagecolorallocate($this->image, mt_rand(150, 255), mt_rand(200, 255), mt_rand(0, 255));
+                        $color = imagecolorallocate($this->image, mt_rand(0, 150), mt_rand(0, 150), mt_rand(0, 150));
                         $angle = mt_rand(-40, 20);
 

trunk/system/libraries/drivers/Captcha/Riddle.php

@@ -12 +12 @@
 class Captcha_Riddle_Driver extends Captcha_Driver {
 
-        private $question;
+        private $riddle;
 
         /**
@@ -21 +21 @@
         public function generate_challenge()
         {
-                // TODO: pull random riddle from i18n file
-                //       make a selection based on complexity setting?
-                $riddles = array
-                (
-                        array
-                        (
-                                'Do you hate spam? (yes or no)',
-                                'yes'
-                        ),
-                        array
-                        (
-                                'Fire is... (hot or cold)',
-                                'hot'
-                        ),
-                        array
-                        (
-                                'Which day of the week is it today?',
-                                strftime('%A')
-                        ),
-                );
+                // Load riddles from the current language
+                $riddles = Kohana::lang('captcha.riddles');
 
-                // Pick a riddle
+                // Pick a random riddle
                 $riddle = $riddles[array_rand($riddles)];
 
                 // Store the question for output
-                $this->question = $riddle[0];
+                $this->riddle = $riddle[0];
 
                 // Return the answer
@@ -60 +42 @@
         public function render($html)
         {
-                return $this->question;
+                return $this->riddle;
         }