Changeset 3102

Timestamp:

07/13/2008 05:26:17 AM (5 months ago)

Author:

OscarB

Message:

Captcha, updates to allow using multiple fonts

Location:

trunk/system

Files:

• config/captcha.php (modified) (2 diffs)
• libraries/Captcha.php (modified) (2 diffs)
• libraries/drivers/Captcha/Alpha.php (modified) (2 diffs)
• libraries/drivers/Captcha/Basic.php (modified) (3 diffs)
• libraries/drivers/Captcha/Black.php (modified) (2 diffs)

trunk/system/config/captcha.php

@@ -13 +13 @@
  *  complexity - Difficulty level (0-10), usage depends on chosen style
  *  background - Path to background image file
- *  font       - Path to font file
+ *  fontpath   - Path to font folder
+ *  fonts      - Font files
  *  promote    - Valid response count threshold to promote user (FALSE to disable)
  */
@@ -23 +24 @@
         'complexity' => 4,
         'background' => '',
-        'font'       => SYSPATH.'fonts/DejaVuSerif.ttf',
+        'fontpath'   => SYSPATH.'fonts/',
+        'fonts'      => array('DejaVuSerif.ttf'),
         'promote'    => FALSE,
 );

trunk/system/libraries/Captcha.php

@@ -26 +26 @@
                 'complexity' => 4,
                 'background' => '',
-                'font'       => '',
+                'fontpath'   => '',
+                'fonts'      => array(),
                 'promote'    => FALSE,
         );
@@ -109 +110 @@
                 }
 
-                // If using a font, check if it exists
-                if ( ! empty($config['font']))
-                {
-                        self::$config['font'] = str_replace('\\', '/', realpath($config['font']));
-
-                        if ( ! file_exists(self::$config['font']))
-                                throw new Kohana_Exception('captcha.file_not_found', self::$config['font']);
+                // If using any fonts, check if they exist
+                if ( ! empty($config['fonts']))
+                {
+                        if (count($config['fonts']) === 1)
+                        {
+                                if ( ! file_exists(self::$config['fontpath'].self::$config['fonts'][0]))
+                                        throw new Kohana_Exception('captcha.file_not_found', self::$config['fontpath'].self::$config['fonts'][0]);
+                        }
+                        else
+                        {
+                                for ($i = 0; $i < count($config['fonts']); $i++)
+                                {
+                                        if ( ! file_exists(self::$config['fontpath'].self::$config['fonts'][$i]))
+                                                throw new Kohana_Exception('captcha.file_not_found', self::$config['fontpath'].self::$config['fonts'][$i]);
+                                }
+                        }
                 }
 

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

@@ -61 +61 @@
                 for ($i = 0, $strlen = strlen($this->response); $i < $strlen; $i++)
                 {
+                        // Use different fonts if available
+                        $font = Captcha::$config['fontpath'].Captcha::$config['fonts'][(mt_rand(0, (count(Captcha::$config['fonts']) - 1)))];
+                        
                         $angle = mt_rand(-40, 20);
                         // Scale the character size on image height
                         $size = $default_size / 10 * mt_rand(8, 12);
-                        $box = imageftbbox($size, $angle, Captcha::$config['font'], $this->response[$i]);
+                        $box = imageftbbox($size, $angle, $font, $this->response[$i]);
 
                         // Calculate character starting coordinates
@@ -75 +78 @@
 
                         // Write text character to image
-                        imagefttext($this->image, $size, $angle, $x, $y, $color, Captcha::$config['font'], $this->response[$i]);
+                        imagefttext($this->image, $size, $angle, $x, $y, $color, $font, $this->response[$i]);
 
                         // Draw "ghost" alphabetic character
                         $text_color = imagecolorallocatealpha($this->image, mt_rand($color_limit + 8, 255), mt_rand($color_limit + 8, 255), mt_rand($color_limit + 8, 255), mt_rand(70, 120));
                         $char = substr($chars, mt_rand(0, 14), 1);
-                        imagettftext($this->image, $size * 2, mt_rand(-45, 45), ($x - (mt_rand(5, 10))), ($y + (mt_rand(5, 10))), $text_color, Captcha::$config['font'], $char);
+                        imagettftext($this->image, $size * 2, mt_rand(-45, 45), ($x - (mt_rand(5, 10))), ($y + (mt_rand(5, 10))), $text_color, $font, $char);
                 }
 

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

@@ -56 +56 @@
                 for ($i = 0, $strlen = strlen($this->response); $i < $strlen; $i++)
                 {
+                        // Use different fonts if available
+                        $font = Captcha::$config['fontpath'].Captcha::$config['fonts'][(mt_rand(0, (count(Captcha::$config['fonts']) - 1)))];
+                        
                         // Allocate random color, size and rotation attributes to text
                         $color = imagecolorallocate($this->image, mt_rand(0, 150), mt_rand(0, 150), mt_rand(0, 150));
@@ -62 +65 @@
                         // Scale the character size on image height
                         $size = $default_size / 10 * mt_rand(8, 12);
-                        $box = imageftbbox($size, $angle, Captcha::$config['font'], $this->response[$i]);
+                        $box = imageftbbox($size, $angle, $font, $this->response[$i]);
 
                         // Calculate character starting coordinates
@@ -69 +72 @@
 
                         // Write text character to image
-                        imagefttext($this->image, $size, $angle, $x, $y, $color, Captcha::$config['font'], $this->response[$i]);
+                        imagefttext($this->image, $size, $angle, $x, $y, $color, $font, $this->response[$i]);
                 }
 

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

@@ -44 +44 @@
                 }
 
+                // Use different fonts if available
+                $font = Captcha::$config['fontpath'].Captcha::$config['fonts'][(mt_rand(0, (count(Captcha::$config['fonts']) - 1)))];
+
                 // Draw the character's white shadows
                 $size = (int) min(Captcha::$config['height'] / 2, Captcha::$config['width'] * 0.8 / strlen($this->response));
@@ -50 +53 @@
                 $y = ((Captcha::$config['height'] - $size) / 2) + $size;
                 $color = imagecolorallocate($this->image, 255, 255, 255);
-                imagefttext($this->image, $size, $angle, $x + 1, $y + 1, $color, Captcha::$config['font'], $this->response);
+                imagefttext($this->image, $size, $angle, $x + 1, $y + 1, $color, $font, $this->response);
 
                 // Add more shadows for lower complexities
-                (Captcha::$config['complexity'] < 10) and imagefttext($this->image, $size, $angle, $x - 1, $y - 1, $color, Captcha::$config['font'], $this->response);
-                (Captcha::$config['complexity'] < 8)  and imagefttext($this->image, $size, $angle, $x - 2, $y + 2, $color, Captcha::$config['font'], $this->response);
-                (Captcha::$config['complexity'] < 6)  and imagefttext($this->image, $size, $angle, $x + 2, $y - 2, $color, Captcha::$config['font'], $this->response);
-                (Captcha::$config['complexity'] < 4)  and imagefttext($this->image, $size, $angle, $x + 3, $y + 3, $color, Captcha::$config['font'], $this->response);
-                (Captcha::$config['complexity'] < 2)  and imagefttext($this->image, $size, $angle, $x - 3, $y - 3, $color, Captcha::$config['font'], $this->response);
+                (Captcha::$config['complexity'] < 10) and imagefttext($this->image, $size, $angle, $x - 1, $y - 1, $color, $font , $this->response);
+                (Captcha::$config['complexity'] < 8)  and imagefttext($this->image, $size, $angle, $x - 2, $y + 2, $color, $font , $this->response);
+                (Captcha::$config['complexity'] < 6)  and imagefttext($this->image, $size, $angle, $x + 2, $y - 2, $color, $font , $this->response);
+                (Captcha::$config['complexity'] < 4)  and imagefttext($this->image, $size, $angle, $x + 3, $y + 3, $color, $font , $this->response);
+                (Captcha::$config['complexity'] < 2)  and imagefttext($this->image, $size, $angle, $x - 3, $y - 3, $color, $font , $this->response);
 
                 // Finally draw the foreground characters
                 $color = imagecolorallocate($this->image, 0, 0, 0);
-                imagefttext($this->image, $size, $angle, $x, $y, $color, Captcha::$config['font'], $this->response);
+                imagefttext($this->image, $size, $angle, $x, $y, $color, $font, $this->response);
 
                 // Output