Changeset 3076

Timestamp:

07/11/2008 12:53:22 PM (5 months ago)

Author:

Geert

Message:

Captcha fixes:

• When using a background image, we shouldn't add an opaque gradient over it, of course.
  
• The size of the background image does not overrule the width and height settings anymore. Instead it will be resized if needed to fit right into the given dimension.
  

Location:

trunk/system/libraries/drivers

Files:

• Captcha.php (modified) (1 diff)
• Captcha/Alpha.php (modified) (1 diff)
• Captcha/Basic.php (modified) (1 diff)

trunk/system/libraries/drivers/Captcha.php

@@ -76 +76 @@
         public function image_create($background = NULL)
         {
-                // Use background image
+                // Create a new image (black)
+                $this->image = imagecreatetruecolor(Captcha::$config['width'], Captcha::$config['height']);
+
+                // Use a background image
                 if ( ! empty($background))
                 {
-                        $this->image = $this->image_create_from($background);
+                        $this->background_image = $this->image_create_from($background);
 
-                        // Overwrite the dimensions
-                        Captcha::$config['width']  = imagesx($this->image);
-                        Captcha::$config['height'] = imagesy($this->image);
-                }
-                // Default background (black)
-                else
-                {
-                        $this->image = imagecreatetruecolor(Captcha::$config['width'], Captcha::$config['height']);
+                        // Resize the image if needed
+                        if (imagesx($this->background_image) !== Captcha::$config['width']
+                            OR imagesy($this->background_image) !== Captcha::$config['height'])
+                        {
+                                imagecopyresampled
+                                (
+                                        $this->image, $this->background_image, 0, 0, 0, 0,
+                                        Captcha::$config['width'], Captcha::$config['height'],
+                                        imagesx($this->background_image), imagesy($this->background_image)
+                                );
+                        }
+
+                        // Free up resources
+                        imagedestroy($this->background_image);
                 }
         }

trunk/system/libraries/drivers/Captcha/Alpha.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));
-                $this->image_gradient($color1, $color2);
+                if (empty(Captcha::$config['background']))
+                {
+                        $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));
+                        $this->image_gradient($color1, $color2);
+                }
 
                 // Add a few random circles

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

@@ -35 +35 @@
 
                 // Add a random gradient
-                $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);
+                if (empty(Captcha::$config['background']))
+                {
+                        $color1 = imagecolorallocate($this->image, mt_rand(200, 255), mt_rand(200, 255), mt_rand(150, 255));
+                        $color2 = imagecolorallocate($this->image, mt_rand(200, 255), mt_rand(200, 255), mt_rand(150, 255));
+                        $this->image_gradient($color1, $color2);
+                }
 
                 // Add a few random lines