Changeset 3010

Timestamp:

07/08/2008 04:09:39 PM (3 months ago)

Author:

Geert

Message:

Cleaning up Captcha_Controller. Using in built in text::random() function. No more special characters, like $ or %, in captcha's anymore. Just a-z0-9.

Location:

trunk/system

Files:

• controllers/captcha.php (modified) (5 diffs)
• libraries/Captcha.php (modified) (2 diffs)

trunk/system/controllers/captcha.php

@@ -16 +16 @@
  */
 class Captcha_Controller extends Controller {
+
+        public $session;
         public $captcha;
-        public $session;
 
         protected $captcha_code;
@@ -24 +25 @@
         {
                 $this->session = Session::instance();
-
                 $this->captcha = new Captcha;
 
-                // Create a random text string for captcha code.
+                // Create and store a random captcha string
                 $this->captcha_code = $this->create_code();
-                $this->captcha->set_code($this->captcha_code) ;
+                $this->captcha->set_code($this->captcha_code);
+                $this->session->set('captcha_code', $this->captcha_code);
 
-                // Set the session to store the security code
-                $this->session->set('captcha_code', $this->captcha_code);
-                // Call the library to output the image
+                // Output the image
                 $this->captcha->render();
         }
@@ -39 +38 @@
         private function create_code()
         {
-                $num_chars = Config::item('captcha.num_chars');
-
-                if (Config::item('captcha.style') == 'math')
+                if (Config::item('captcha.style') === 'math')
                 {
                         $code = (string) mt_rand(101, 991);
@@ -47 +44 @@
                 else
                 {
-                        // Character set to use, similar characters removed.
-                        $charset = '@2345#6BCDF$GH789KMNPQRT%VWXYZ';
-                        $code = '';
-                        for ($i = 0; $i < $num_chars; $i++)
-                        {
-                        $code .= substr($charset, mt_rand(0, strlen($charset)-1), 1);
-                        }
+                        $code = text::random('distinct', Config::item('captcha.num_chars'));
                 }
 
@@ -59 +50 @@
         }
 
-}
+} // End Captcha_Controller

trunk/system/libraries/Captcha.php

@@ -255 +255 @@
                 {
                         $text_color = imageColorAllocate($this->image, mt_rand($color_limit + 8, 255), mt_rand($color_limit + 8, 255), mt_rand($color_limit + 8, 255));
-                        $char = substr($chars, mt_rand(0,15), 1);
-                        imageTTFtext($this->image, mt_rand(23, 27), mt_rand(160, 200), mt_rand(-10, $this->width+10), mt_rand(-10, 60), $text_color, $font, $char);
+                        $char = substr($chars, mt_rand(0, 15), 1);
+                        imageTTFtext($this->image, mt_rand(23, 27), mt_rand(160, 200), mt_rand(-10, $this->width + 10), mt_rand(-10, 60), $text_color, $font, $char);
                 }
 
@@ -353 +353 @@
                 for ($i = 0; $i <= $width; $i++)
                 {
-                        $red   = $left_color[0] -floor($i*$color0);
-                        $green = $left_color[1] -floor($i*$color1);
-                        $blue  = $left_color[2] -floor($i*$color2);
+                        $red   = $left_color[0] - floor($i * $color0);
+                        $green = $left_color[1] - floor($i * $color1);
+                        $blue  = $left_color[2] - floor($i * $color2);
                         $col   = imagecolorallocate($this->image, $red, $green, $blue);