Changeset 1827

Timestamp:

01/27/08 02:50:37 (7 months ago)

Author:

Shadowhand

Message:

Updates to Image:

• Moved sanitize_geometry to Image_Driver
  
• Made properties() an abstract method
  
• Updated language files with new and missing messages
  
• Removed exif_imagetype() usage in favor of getimagesize(), which is more common and provides more information
  

Location:

trunk/system

Files:

• i18n/en_US/image.php (modified) (1 diff)
• libraries/Image.php (modified) (3 diffs)
• libraries/drivers/Image.php (modified) (2 diffs)
• libraries/drivers/Image_ImageMagick.php (modified) (4 diffs)

trunk/system/i18n/en_US/image.php

@@ -3 +3 @@
 $lang = array
 (
+        'getimagesize_missing'    => 'The Image library requires the <tt>getimagesize</tt> PHP function, which is not available in your installation.',
         'driver_not_supported'    => 'The requested Image driver, %s, was not found.',
+        'unsupported_method'      => 'Your configured driver does not support the %s image transformation.',
+        'file_not_found'          => 'The specified image, %s was not found. Please verify that images exist by using <tt>file_exists</tt> before manipulating them.',
+        'type_not_allowed'        => 'The specified image, %s, is not an allowed image type.',
+
+        // ImageMagick specific messages
+        'imagemagick' => array
+        (
+                'not_found' => 'The ImageMagick directory specified does not contain a required program, %s.',
+        ),
+
+
+        // GD specific messages
+        'gd' => array
+        (
+                'requires_v2' => 'The Image library requires GD2. Please see http://php.net/gd_info for more information.',
+        ),
 
         // CI's Image_lib stuff below

trunk/system/libraries/Image.php

@@ -51 +51 @@
         public function __construct($image, $config = NULL)
         {
-                // Load configuration
-                $this->config = (array) $config + Config::item('image');
+                static $check;
+
+                // Make the check exactly once
+                ($check === NULL) and $check = function_exists('getimagesize');
+
+                if ($check === FALSE)
+                        throw new Kohana_Exception('image.getimagesize_missing');
 
                 // Check to make sure the image exists
@@ -58 +63 @@
                         throw new Kohana_Exception('image.file_not_found', $image);
 
+                // Disable error reporting, to prevent PHP warnings
+                $ER = error_reporting(0);
+
+                // Fetch the image size and mime type
+                $image_info = getimagesize($image);
+
+                // Turn on error reporting again
+                error_reporting($ER);
+
+                // Make sure that the image is readable and valid
+                if ( ! is_array($image_info) OR count($image_info) < 3)
+                        throw new Kohana_Exception('image.file_unreadable', $image);
+
                 // Check to make sure the image type is allowed
-                if (($type = exif_imagetype($image)) == FALSE OR ! isset(Image::$allowed_types[$type]))
+                if ( ! isset(Image::$allowed_types[$image_info[2]]))
                         throw new Kohana_Exception('image.type_not_allowed', $image);
 
-                $this->image = str_replace('\\', '/', realpath($image));
+                // Image has been validated, load it
+                $this->image = array
+                (
+                        'file' => str_replace('\\', '/', realpath($image)),
+                        'width' => $image_info[0],
+                        'height' => $image_info[1],
+                        'type' => $image_info[2],
+                        'ext' => Image::$allowed_types[$image_info[2]],
+                        'mime' => $image_info['mime']
+                );
+
+                // Load configuration
+                $this->config = (array) $config + Config::item('image');
 
                 try
@@ -247 +277 @@
         {
                 // If no new image is defined, use the current image
-                empty($new_image) and $new_image = $this->image;
+                empty($new_image) and $new_image = $this->image['file'];
 
                 // Separate the directory and filename

trunk/system/libraries/drivers/Image.php

@@ -10 +10 @@
 
         // Processing errors
-        protected $errors;
+        protected $errors = array();
 
         /**
@@ -28 +28 @@
                 return TRUE;
         }
+
+        /**
+         * Sanitize and normalize a geometry array based on the temporary image
+         * width and height. Valid properties are: width, height, top, left.
+         *
+         * @param   array  geometry properties
+         * @return  void
+         */
+        protected function sanitize_geometry( & $geometry)
+        {
+                list($width, $height) = $this->properties();
+
+                // Turn off error reporting
+                $reporting = error_reporting(0);
+
+                // Width and height cannot exceed current image size
+                $geometry['width']  = min($geometry['width'], $width);
+                $geometry['height'] = min($geometry['height'], $height);
+
+                switch($geometry['top'])
+                {
+                        case 'center':
+                                $geometry['top'] = floor(($height / 2) - ($geometry['height'] / 2));
+                        break;
+                        case 'top':
+                                $geometry['top'] = 0;
+                        break;
+                        case 'bottom':
+                                $geometry['top'] = $height - $geometry['height'];
+                        break;
+                }
+
+                switch($geometry['left'])
+                {
+                        case 'center':
+                                $geometry['left'] = floor(($width / 2) - ($geometry['width'] / 2));
+                        break;
+                        case 'left':
+                                $geometry['left'] = 0;
+                        break;
+                        case 'right':
+                                $geometry['left'] = $width - $geometry['height'];
+                        break;
+                }
+
+                // Restore error reporting
+                error_reporting($reporting);
+        }
+
+        /**
+         * Return the current width and height of the temporary image. This is mainly
+         * needed for sanitizing the geometry.
+         *
+         * @return  array  width, height
+         */
+        abstract protected function properties();
 
         /**

trunk/system/libraries/drivers/Image_ImageMagick.php

@@ -11 +11 @@
         // Temporary image filename
         protected $tmp_image;
-
-        // Processing errors
-        protected $errors = array();
 
         /**
@@ -38 +35 @@
                 // Check to make sure the provided path is correct
                 if ( ! file_exists(realpath($config['directory']).'/convert'.$this->ext))
-                        throw new Kohana_Exception('image.imagemagick.not_found');
+                        throw new Kohana_Exception('image.imagemagick.not_found', 'convert'.$this->ext);
 
                 // Set the installation directory
@@ -50 +47 @@
         public function process($image, $actions, $dir, $file)
         {
+                // We only need the filename
+                $image = $image['file'];
+
                 // Unique temporary filename
                 $this->tmp_image = $dir.'k2img--'.sha1($dir.$file).substr($file, strrpos($file, '.'));
@@ -173 +173 @@
         }
 
-        /**
-         * Return the current width and height of the temporary image. This is mainly
-         * needed for sanitizing the geometry.
-         *
-         * @return  array  width, height
-         */
         protected function properties()
         {
-                // Return the width and height as an array. Use with list()
                 return explode(',', exec(escapeshellcmd($this->dir.'identify'.$this->ext).' -format '.escapeshellarg('%w,%h').' '.$this->cmd_image));
         }
 
-        /**
-         * Sanitize and normalize a geometry array based on the temporary image
-         * width and height. Valid properties are: width, height, top, left.
-         *
-         * @param   array  geometry properties
-         * @return  void
-         */
-        protected function sanitize_geometry( & $geometry)
-        {
-                list($width, $height) = $this->properties();
-
-                // Turn off error reporting
-                $reporting = error_reporting(0);
-
-                // Width and height cannot exceed current image size
-                $geometry['width']  = min($geometry['width'], $width);
-                $geometry['height'] = min($geometry['height'], $height);
-
-                switch($geometry['top'])
-                {
-                        case 'center':
-                                $geometry['top'] = floor(($height / 2) - ($geometry['height'] / 2));
-                        break;
-                        case 'top':
-                                $geometry['top'] = 0;
-                        break;
-                        case 'bottom':
-                                $geometry['top'] = $height - $geometry['height'];
-                        break;
-                }
-
-                switch($geometry['left'])
-                {
-                        case 'center':
-                                $geometry['left'] = floor(($width / 2) - ($geometry['width'] / 2));
-                        break;
-                        case 'left':
-                                $geometry['left'] = 0;
-                        break;
-                        case 'right':
-                                $geometry['left'] = $width - $geometry['height'];
-                        break;
-                }
-
-                // Restore error reporting
-                error_reporting($reporting);
-        }
-
 } // End Image ImageMagick Driver