upgrade to codeigniter 1.7.2 for f12
[www-register-wizard.git] / libraries / Image_lib.php
index c5ebc8f..169c6e4 100644 (file)
@@ -6,7 +6,7 @@
  *
  * @package            CodeIgniter
  * @author             ExpressionEngine Dev Team
- * @copyright  Copyright (c) 2008, EllisLab, Inc.
+ * @copyright  Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license            http://codeigniter.com/user_guide/license.html
  * @link               http://codeigniter.com
  * @since              Version 1.0
  * @link               http://codeigniter.com/user_guide/libraries/image_lib.html
  */
 class CI_Image_lib {
-       
+
        var $image_library              = 'gd2';        // Can be:  imagemagick, netpbm, gd, gd2
        var $library_path               = '';
        var $dynamic_output             = FALSE;        // Whether to send to browser or write to disk
-       var $source_image               = '';   
+       var $source_image               = '';
        var $new_image                  = '';
        var $width                              = '';
        var $height                             = '';
@@ -41,7 +41,7 @@ class CI_Image_lib {
        var $rotation_angle             = '';
        var $x_axis                             = '';
        var     $y_axis                         = '';
-       
+
        // Watermark Vars
        var $wm_text                    = '';                   // Watermark text if graphic is not used
        var $wm_type                    = 'text';               // Type of watermarking.  Options:  text/overlay
@@ -59,7 +59,7 @@ class CI_Image_lib {
        var $wm_shadow_color    = '';                   // Dropshadow color
        var $wm_shadow_distance = 2;                    // Dropshadow distance
        var $wm_opacity                 = 50;                   // Image opacity: 1 - 100  Only works with image
-       
+
        // Private Vars
        var $source_folder              = '';
        var $dest_folder                = '';
@@ -74,27 +74,27 @@ class CI_Image_lib {
        var $copy_fnc                   = 'imagecopyresampled';
        var $error_msg                  = array();
        var $wm_use_drop_shadow = FALSE;
-       var $wm_use_truetype    = FALSE;                
-       
+       var $wm_use_truetype    = FALSE;
+
        /**
         * Constructor
         *
         * @access      public
         * @param       string
         * @return      void
-        */     
+        */
        function CI_Image_lib($props = array())
        {
                if (count($props) > 0)
                {
                        $this->initialize($props);
                }
-               
+
                log_message('debug', "Image Lib Class Initialized");
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Initialize image properties
         *
@@ -102,11 +102,11 @@ class CI_Image_lib {
         *
         * @access      public
         * @return      void
-        */     
+        */
        function clear()
        {
                $props = array('source_folder', 'dest_folder', 'source_image', 'full_src_path', 'full_dst_path', 'new_image', 'image_type', 'size_str', 'quality', 'orig_width', 'orig_height', 'rotation_angle', 'x_axis', 'y_axis', 'create_fnc', 'copy_fnc', 'wm_overlay_path', 'wm_use_truetype', 'dynamic_output', 'wm_font_size', 'wm_text', 'wm_vrt_alignment', 'wm_hor_alignment', 'wm_padding', 'wm_hor_offset', 'wm_vrt_offset', 'wm_font_color', 'wm_use_drop_shadow', 'wm_shadow_color', 'wm_shadow_distance', 'wm_opacity');
-       
+
                foreach ($props as $val)
                {
                        $this->$val = '';
@@ -115,16 +115,16 @@ class CI_Image_lib {
                // special consideration for master_dim
                $this->master_dim = 'auto';
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * initialize image preferences
         *
         * @access      public
         * @param       array
-        * @return      void
-        */     
+        * @return      bool
+        */
        function initialize($props = array())
        {
                /*
@@ -147,9 +147,9 @@ class CI_Image_lib {
                if ($this->source_image == '')
                {
                        $this->set_error('imglib_source_image_required');
-                       return FALSE;           
+                       return FALSE;      
                }
-               
+
                /*
                 * Is getimagesize() Available?
                 *
@@ -157,15 +157,15 @@ class CI_Image_lib {
                 * Note:  We need to figure out how to determine image
                 * properties using ImageMagick and NetPBM
                 *
-                */             
+                */
                if ( ! function_exists('getimagesize'))
                {
                        $this->set_error('imglib_gd_required_for_props');
-                       return FALSE;           
+                       return FALSE;
                }
-               
+
                $this->image_library = strtolower($this->image_library);
-               
+
                /*
                 * Set the full server path
                 *
@@ -173,7 +173,7 @@ class CI_Image_lib {
                 * Either way, we'll try use realpath to generate the
                 * full server path in order to more reliably read it.
                 *
-                */     
+                */
                if (function_exists('realpath') AND @realpath($this->source_image) !== FALSE)
                {
                        $full_source_path = str_replace("\\", "/", realpath($this->source_image));
@@ -182,16 +182,16 @@ class CI_Image_lib {
                {
                        $full_source_path = $this->source_image;
                }
-               
+
                $x = explode('/', $full_source_path);
                $this->source_image = end($x);
                $this->source_folder = str_replace($this->source_image, '', $full_source_path);
-                                                               
+
                // Set the Image Properties
                if ( ! $this->get_image_properties($this->source_folder.$this->source_image))
                {
-                       return FALSE;           
-               }                               
+                       return FALSE;      
+               }
 
                /*
                 * Assign the "new" image name/path
@@ -201,7 +201,7 @@ class CI_Image_lib {
                 * it means we are altering the original.  We'll
                 * set the destination filename and path accordingly.
                 *
-                */                     
+                */
                if ($this->new_image == '')
                {
                        $this->dest_image = $this->source_image;
@@ -224,7 +224,7 @@ class CI_Image_lib {
                                {
                                        $full_dest_path = $this->new_image;
                                }
-                               
+
                                // Is there a file name?
                                if ( ! preg_match("#\.(jpg|jpeg|gif|png)$#i", $full_dest_path))
                                {
@@ -249,18 +249,18 @@ class CI_Image_lib {
                 * We'll also split the destination image name
                 * so we can insert the thumbnail marker if needed.
                 *
-                */     
+                */
                if ($this->create_thumb === FALSE OR $this->thumb_marker == '')
                {
                        $this->thumb_marker = '';
                }
 
                $xp     = $this->explode_name($this->dest_image);
-       
+
                $filename = $xp['name'];
                $file_ext = $xp['ext'];
-                               
-               $this->full_src_path = $this->source_folder.$this->source_image;                
+
+               $this->full_src_path = $this->source_folder.$this->source_image;
                $this->full_dst_path = $this->dest_folder.$filename.$this->thumb_marker.$file_ext;
 
                /*
@@ -270,7 +270,7 @@ class CI_Image_lib {
                 * might not be in correct proportion with the source
                 * image's width/height.  We'll recalculate it here.
                 *
-                */     
+                */
                if ($this->maintain_ratio === TRUE && ($this->width != '' AND $this->height != ''))
                {
                        $this->image_reproportion();
@@ -283,23 +283,23 @@ class CI_Image_lib {
                 * not submitted we will use the values
                 * from the actual file
                 *
-                */     
+                */
                if ($this->width == '')
                        $this->width = $this->orig_width;
-       
+
                if ($this->height == '')
                        $this->height = $this->orig_height;
-       
+
                // Set the quality
                $this->quality = trim(str_replace("%", "", $this->quality));
-               
+
                if ($this->quality == '' OR $this->quality == 0 OR ! is_numeric($this->quality))
                        $this->quality = 90;
-       
+
                // Set the x/y coordinates
                $this->x_axis = ($this->x_axis == '' OR ! is_numeric($this->x_axis)) ? 0 : $this->x_axis;
                $this->y_axis = ($this->y_axis == '' OR ! is_numeric($this->y_axis)) ? 0 : $this->y_axis;
-       
+
                // Watermark-related Stuff...
                if ($this->wm_font_color != '')
                {
@@ -308,7 +308,7 @@ class CI_Image_lib {
                                $this->wm_font_color = '#'.$this->wm_font_color;
                        }
                }
-               
+
                if ($this->wm_shadow_color != '')
                {
                        if (strlen($this->wm_shadow_color) == 6)
@@ -316,12 +316,12 @@ class CI_Image_lib {
                                $this->wm_shadow_color = '#'.$this->wm_shadow_color;
                        }
                }
-       
+
                if ($this->wm_overlay_path != '')
                {
                        $this->wm_overlay_path = str_replace("\\", "/", realpath($this->wm_overlay_path));
                }
-       
+
                if ($this->wm_shadow_color != '')
                {
                        $this->wm_use_drop_shadow = TRUE;
@@ -334,9 +334,9 @@ class CI_Image_lib {
 
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Resize
         *
@@ -345,21 +345,21 @@ class CI_Image_lib {
         *
         * @access      public
         * @return      bool
-        */     
+        */
        function resize()
        {
                $protocol = 'image_process_'.$this->image_library;
-               
-               if (eregi("gd2$", $protocol))
+
+               if (preg_match('/gd2$/i', $protocol))
                {
                        $protocol = 'image_process_gd';
                }
-               
+
                return $this->$protocol('resize');
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Crop
         *
@@ -368,21 +368,21 @@ class CI_Image_lib {
         *
         * @access      public
         * @return      bool
-        */     
+        */
        function crop()
        {
                $protocol = 'image_process_'.$this->image_library;
-               
-               if (eregi("gd2$", $protocol))
+
+               if (preg_match('/gd2$/i', $protocol))
                {
                        $protocol = 'image_process_gd';
                }
-               
+
                return $this->$protocol('crop');
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Rotate
         *
@@ -391,18 +391,18 @@ class CI_Image_lib {
         *
         * @access      public
         * @return      bool
-        */     
+        */
        function rotate()
        {
-               // Allowed rotation values              
-               $degs = array(90, 180, 270, 'vrt', 'hor');      
-       
-               if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs, TRUE))
+               // Allowed rotation values
+               $degs = array(90, 180, 270, 'vrt', 'hor');
+
+               if ($this->rotation_angle == '' OR ! in_array($this->rotation_angle, $degs))
                {
                        $this->set_error('imglib_rotation_angle_required');
-                       return FALSE;           
+                       return FALSE;      
                }
-       
+
                // Reassign the width and height
                if ($this->rotation_angle == 90 OR $this->rotation_angle == 270)
                {
@@ -414,28 +414,28 @@ class CI_Image_lib {
                        $this->width    = $this->orig_width;
                        $this->height   = $this->orig_height;
                }
-       
+
 
                // Choose resizing function
                if ($this->image_library == 'imagemagick' OR $this->image_library == 'netpbm')
                {
                        $protocol = 'image_process_'.$this->image_library;
-               
+
                        return $this->$protocol('rotate');
                }
-               
+
                if ($this->rotation_angle == 'hor' OR $this->rotation_angle == 'vrt')
                {
                        return $this->image_mirror_gd();
                }
                else
-               {               
+               {
                        return $this->image_rotate_gd();
                }
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Process Using GD/GD2
         *
@@ -444,16 +444,16 @@ class CI_Image_lib {
         * @access      public
         * @param       string
         * @return      bool
-        */             
+        */
        function image_process_gd($action = 'resize')
-       {       
+       {
                $v2_override = FALSE;
 
                // If the target width/height match the source, AND if the new file name is not equal to the old file name
                // we'll simply make a copy of the original with the new name... assuming dynamic rendering is off.
                if ($this->dynamic_output === FALSE)
                {
-                       if ($this->orig_width == $this->width AND $this->orig_height == $this->height)                  
+                       if ($this->orig_width == $this->width AND $this->orig_height == $this->height)
                        {
                                if ($this->source_image != $this->new_image)
                                {
@@ -462,35 +462,35 @@ class CI_Image_lib {
                                                @chmod($this->full_dst_path, DIR_WRITE_MODE);
                                        }
                                }
-                               
+
                                return TRUE;
                        }
                }
-               
+
                // Let's set up our values based on the action
                if ($action == 'crop')
                {
                        //  Reassign the source width/height if cropping
                        $this->orig_width  = $this->width;
-                       $this->orig_height = $this->height;     
-                               
+                       $this->orig_height = $this->height;
+
                        // GD 2.0 has a cropping bug so we'll test for it
                        if ($this->gd_version() !== FALSE)
                        {
-                               $gd_version = str_replace('0', '', $this->gd_version());                        
+                               $gd_version = str_replace('0', '', $this->gd_version());
                                $v2_override = ($gd_version == 2) ? TRUE : FALSE;
                        }
                }
                else
-               {                       
+               {
                        // If resizing the x/y axis must be zero
                        $this->x_axis = 0;
                        $this->y_axis = 0;
                }
-               
+
                //  Create the image handle
                if ( ! ($src_img = $this->image_create_gd()))
-               {               
+               {
                        return FALSE;
                }
 
@@ -501,21 +501,21 @@ class CI_Image_lib {
                //  below should that ever prove inaccurate.
                //
                //  if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor') AND $v2_override == FALSE)
-               if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor'))          
+               if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor'))
                {
                        $create = 'imagecreatetruecolor';
                        $copy   = 'imagecopyresampled';
                }
                else
                {
-                       $create = 'imagecreate';        
+                       $create = 'imagecreate';
                        $copy   = 'imagecopyresized';
                }
-                       
+
                $dst_img = $create($this->width, $this->height);
                $copy($dst_img, $src_img, 0, 0, $this->x_axis, $this->y_axis, $this->width, $this->height, $this->orig_width, $this->orig_height);
 
-               //  Show the image      
+               //  Show the image
                if ($this->dynamic_output == TRUE)
                {
                        $this->image_display_gd($dst_img);
@@ -532,15 +532,15 @@ class CI_Image_lib {
                //  Kill the file handles
                imagedestroy($dst_img);
                imagedestroy($src_img);
-               
+
                // Set the file to 777
                @chmod($this->full_dst_path, DIR_WRITE_MODE);
-               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Process Using ImageMagick
         *
@@ -549,7 +549,7 @@ class CI_Image_lib {
         * @access      public
         * @param       string
         * @return      bool
-        */             
+        */
        function image_process_imagemagick($action = 'resize')
        {
                //  Do we have a vaild library path?
@@ -558,17 +558,17 @@ class CI_Image_lib {
                        $this->set_error('imglib_libpath_invalid');
                        return FALSE;
                }
-                               
-               if ( ! eregi("convert$", $this->library_path))
+
+               if ( ! preg_match("/convert$/i", $this->library_path))
                {
-                       if ( ! eregi("/$", $this->library_path)) $this->library_path .= "/";
-               
+                       $this->library_path = rtrim($this->library_path, '/').'/';
+
                        $this->library_path .= 'convert';
                }
-               
+
                // Execute the command
                $cmd = $this->library_path." -quality ".$this->quality;
-       
+
                if ($action == 'crop')
                {
                        $cmd .= " -crop ".$this->width."x".$this->height."+".$this->x_axis."+".$this->y_axis." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
@@ -583,34 +583,34 @@ class CI_Image_lib {
                                        break;
                                default         : $angle = '-rotate '.$this->rotation_angle;
                                        break;
-                       }                       
-               
+                       }
+
                        $cmd .= " ".$angle." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
                }
                else  // Resize
                {
                        $cmd .= " -resize ".$this->width."x".$this->height." \"$this->full_src_path\" \"$this->full_dst_path\" 2>&1";
                }
-       
+
                $retval = 1;
-       
+
                @exec($cmd, $output, $retval);
 
-               //      Did it work?    
+               //      Did it work?
                if ($retval > 0)
                {
                        $this->set_error('imglib_image_process_failed');
                        return FALSE;
                }
-               
+
                // Set the file to 777
                @chmod($this->full_dst_path, DIR_WRITE_MODE);
-               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Process Using NetPBM
         *
@@ -619,7 +619,7 @@ class CI_Image_lib {
         * @access      public
         * @param       string
         * @return      bool
-        */             
+        */
        function image_process_netpbm($action = 'resize')
        {
                if ($this->library_path == '')
@@ -627,7 +627,7 @@ class CI_Image_lib {
                        $this->set_error('imglib_libpath_invalid');
                        return FALSE;
                }
-                       
+
                //  Build the resizing command
                switch ($this->image_type)
                {
@@ -637,14 +637,14 @@ class CI_Image_lib {
                                break;
                        case 2 :
                                                $cmd_in         = 'jpegtopnm';
-                                               $cmd_out        = 'ppmtojpeg';                  
+                                               $cmd_out        = 'ppmtojpeg';
                                break;
                        case 3 :
                                                $cmd_in         = 'pngtopnm';
                                                $cmd_out        = 'ppmtopng';
                                break;
                }
-               
+
                if ($action == 'crop')
                {
                        $cmd_inner = 'pnmcut -left '.$this->x_axis.' -top '.$this->y_axis.' -width '.$this->width.' -height '.$this->height;
@@ -664,47 +664,47 @@ class CI_Image_lib {
                                case 'hor'      :       $angle = 'lr';
                                        break;
                        }
-               
+
                        $cmd_inner = 'pnmflip -'.$angle.' ';
                }
                else // Resize
                {
                        $cmd_inner = 'pnmscale -xysize '.$this->width.' '.$this->height;
                }
-                                               
+
                $cmd = $this->library_path.$cmd_in.' '.$this->full_src_path.' | '.$cmd_inner.' | '.$cmd_out.' > '.$this->dest_folder.'netpbm.tmp';
-               
+
                $retval = 1;
-               
+
                @exec($cmd, $output, $retval);
-               
+
                //  Did it work?
                if ($retval > 0)
                {
                        $this->set_error('imglib_image_process_failed');
                        return FALSE;
                }
-               
+
                // With NetPBM we have to create a temporary image.
                // If you try manipulating the original it fails so
                // we have to rename the temp file.
                copy ($this->dest_folder.'netpbm.tmp', $this->full_dst_path);
                unlink ($this->dest_folder.'netpbm.tmp');
                @chmod($this->full_dst_path, DIR_WRITE_MODE);
-               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Rotate Using GD
         *
         * @access      public
         * @return      bool
-        */             
+        */
        function image_rotate_gd()
-       {       
+       {
                // Is Image Rotation Supported?
                // this function is only supported as of PHP 4.3
                if ( ! function_exists('imagerotate'))
@@ -712,23 +712,23 @@ class CI_Image_lib {
                        $this->set_error('imglib_rotate_unsupported');
                        return FALSE;
                }
-               
+
                //  Create the image handle
                if ( ! ($src_img = $this->image_create_gd()))
-               {               
+               {
                        return FALSE;
                }
 
-               // Set the background color             
+               // Set the background color
                // This won't work with transparent PNG files so we are
                // going to have to figure out how to determine the color
                // of the alpha channel in a future release.
-       
+
                $white  = imagecolorallocate($src_img, 255, 255, 255);
 
                //  Rotate it!
                $dst_img = imagerotate($src_img, $this->rotation_angle, $white);
-       
+
                //  Save the Image
                if ($this->dynamic_output == TRUE)
                {
@@ -746,16 +746,16 @@ class CI_Image_lib {
                //  Kill the file handles
                imagedestroy($dst_img);
                imagedestroy($src_img);
-               
+
                // Set the file to 777
-               
+
                @chmod($this->full_dst_path, DIR_WRITE_MODE);
-               
+
                return true;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Create Mirror Image using GD
         *
@@ -763,32 +763,32 @@ class CI_Image_lib {
         *
         * @access      public
         * @return      bool
-        */                     
+        */
        function image_mirror_gd()
-       {               
+       {
                if ( ! $src_img = $this->image_create_gd())
                {
                        return FALSE;
                }
-               
+
                $width  = $this->orig_width;
                $height = $this->orig_height;
-       
+
                if ($this->rotation_angle == 'hor')
                {
                        for ($i = 0; $i < $height; $i++)
                        {
                                $left  = 0;
                                $right = $width-1;
-       
+
                                while ($left < $right)
                                {
                                        $cl = imagecolorat($src_img, $left, $i);
                                        $cr = imagecolorat($src_img, $right, $i);
-                                       
+
                                        imagesetpixel($src_img, $left, $i, $cr);
                                        imagesetpixel($src_img, $right, $i, $cl);
-                                       
+
                                        $left++;
                                        $right--;
                                }
@@ -800,20 +800,20 @@ class CI_Image_lib {
                        {
                                $top = 0;
                                $bot = $height-1;
-       
+
                                while ($top < $bot)
                                {
                                        $ct = imagecolorat($src_img, $i, $top);
                                        $cb = imagecolorat($src_img, $i, $bot);
-                                       
+
                                        imagesetpixel($src_img, $i, $top, $cb);
                                        imagesetpixel($src_img, $i, $bot, $ct);
-                                       
+
                                        $top++;
                                        $bot--;
                                }
-                       }               
-               }               
+                       }
+               }
 
                //  Show the image
                if ($this->dynamic_output == TRUE)
@@ -828,18 +828,18 @@ class CI_Image_lib {
                                return FALSE;
                        }
                }
-               
+
                //  Kill the file handles
                imagedestroy($src_img);
-               
+
                // Set the file to 777
                @chmod($this->full_dst_path, DIR_WRITE_MODE);
-               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Image Watermark
         *
@@ -849,7 +849,7 @@ class CI_Image_lib {
         * @access      public
         * @param       string
         * @return      bool
-        */     
+        */
        function watermark()
        {
                if ($this->wm_type == 'overlay')
@@ -861,49 +861,49 @@ class CI_Image_lib {
                        return $this->text_watermark();
                }
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Watermark - Graphic Version
         *
         * @access      public
         * @return      bool
-        */                     
+        */
        function overlay_watermark()
        {
                if ( ! function_exists('imagecolortransparent'))
                {
                        $this->set_error('imglib_gd_required');
-                       return FALSE;           
+                       return FALSE;
                }
-       
+
                //  Fetch source image properties
                $this->get_image_properties();
 
                //  Fetch watermark image properties
-               $props                  = $this->get_image_properties($this->wm_overlay_path, TRUE);    
+               $props                  = $this->get_image_properties($this->wm_overlay_path, TRUE);
                $wm_img_type    = $props['image_type'];
                $wm_width               = $props['width'];
                $wm_height              = $props['height'];
-       
-               //  Create two image resources  
+
+               //  Create two image resources
                $wm_img  = $this->image_create_gd($this->wm_overlay_path, $wm_img_type);
                $src_img = $this->image_create_gd($this->full_src_path);
-               
-               // Reverse the offset if necessary              
+
+               // Reverse the offset if necessary
                // When the image is positioned at the bottom
                // we don't want the vertical offset to push it
                // further down.  We want the reverse, so we'll
                // invert the offset.  Same with the horizontal
                // offset when the image is at the right
-               
+
                $this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1));
                $this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1));
-       
+
                if ($this->wm_vrt_alignment == 'B')
                        $this->wm_vrt_offset = $this->wm_vrt_offset * -1;
-       
+
                if ($this->wm_hor_alignment == 'R')
                        $this->wm_hor_offset = $this->wm_hor_offset * -1;
 
@@ -926,23 +926,23 @@ class CI_Image_lib {
                switch ($this->wm_hor_alignment)
                {
                        case 'L':
-                               break;  
+                               break;
                        case 'C':       $x_axis += ($this->orig_width / 2) - ($wm_width / 2);
                                break;
                        case 'R':       $x_axis += $this->orig_width - $wm_width;
                                break;
                }
-       
-               //  Build the finalized image                   
+
+               //  Build the finalized image
                if ($wm_img_type == 3 AND function_exists('imagealphablending'))
                {
                        @imagealphablending($src_img, TRUE);
-               }               
+               } 
 
                // Set RGB values for text and shadow
                $rgba = imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp);
                $alpha = ($rgba & 0x7F000000) >> 24;
-               
+
                // make a best guess as to whether we're dealing with an image with alpha transparency or no/binary transparency
                if ($alpha > 0)
                {
@@ -953,9 +953,9 @@ class CI_Image_lib {
                {
                        // set our RGB value from above to be transparent and merge the images with the specified opacity
                        imagecolortransparent($wm_img, imagecolorat($wm_img, $this->wm_x_transp, $this->wm_y_transp));
-                       imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity);                    
+                       imagecopymerge($src_img, $wm_img, $x_axis, $y_axis, 0, 0, $wm_width, $wm_height, $this->wm_opacity);
                }
-                               
+
                //  Output the image
                if ($this->dynamic_output == TRUE)
                {
@@ -968,49 +968,49 @@ class CI_Image_lib {
                                return FALSE;
                        }
                }
-               
+
                imagedestroy($src_img);
                imagedestroy($wm_img);
-                               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Watermark - Text Version
         *
         * @access      public
         * @return      bool
-        */                     
+        */
        function text_watermark()
        {
                if ( ! ($src_img = $this->image_create_gd()))
-               {               
+               {
                        return FALSE;
                }
-                               
+
                if ($this->wm_use_truetype == TRUE AND ! file_exists($this->wm_font_path))
                {
                        $this->set_error('imglib_missing_font');
                        return FALSE;
                }
-               
-               //  Fetch source image properties               
-               $this->get_image_properties();                          
-               
-               // Set RGB values for text and shadow           
+
+               //  Fetch source image properties
+               $this->get_image_properties();
+
+               // Set RGB values for text and shadow
                $this->wm_font_color    = str_replace('#', '', $this->wm_font_color);
                $this->wm_shadow_color  = str_replace('#', '', $this->wm_shadow_color);
-               
+
                $R1 = hexdec(substr($this->wm_font_color, 0, 2));
                $G1 = hexdec(substr($this->wm_font_color, 2, 2));
                $B1 = hexdec(substr($this->wm_font_color, 4, 2));
-       
+
                $R2 = hexdec(substr($this->wm_shadow_color, 0, 2));
                $G2 = hexdec(substr($this->wm_shadow_color, 2, 2));
                $B2 = hexdec(substr($this->wm_shadow_color, 4, 2));
-               
+
                $txt_color      = imagecolorclosest($src_img, $R1, $G1, $B1);
                $drp_color      = imagecolorclosest($src_img, $R2, $G2, $B2);
 
@@ -1020,10 +1020,10 @@ class CI_Image_lib {
                // further down.  We want the reverse, so we'll
                // invert the offset.  Note: The horizontal
                // offset flips itself automatically
-       
+
                if ($this->wm_vrt_alignment == 'B')
                        $this->wm_vrt_offset = $this->wm_vrt_offset * -1;
-                       
+
                if ($this->wm_hor_alignment == 'R')
                        $this->wm_hor_offset = $this->wm_hor_offset * -1;
 
@@ -1034,7 +1034,7 @@ class CI_Image_lib {
                {
                        if ($this->wm_font_size == '')
                                $this->wm_font_size = '17';
-               
+
                        $fontwidth  = $this->wm_font_size-($this->wm_font_size/4);
                        $fontheight = $this->wm_font_size;
                        $this->wm_vrt_offset += $this->wm_font_size;
@@ -1052,10 +1052,10 @@ class CI_Image_lib {
                // Set verticle alignment
                if ($this->wm_use_drop_shadow == FALSE)
                        $this->wm_shadow_distance = 0;
-                       
+
                $this->wm_vrt_alignment = strtoupper(substr($this->wm_vrt_alignment, 0, 1));
                $this->wm_hor_alignment = strtoupper(substr($this->wm_hor_alignment, 0, 1));
-       
+
                switch ($this->wm_vrt_alignment)
                {
                        case     "T" :
@@ -1065,10 +1065,10 @@ class CI_Image_lib {
                        case "B":       $y_axis += ($this->orig_height - $fontheight - $this->wm_shadow_distance - ($fontheight/2));
                                break;
                }
-       
+
                $x_shad = $x_axis + $this->wm_shadow_distance;
                $y_shad = $y_axis + $this->wm_shadow_distance;
-               
+
                // Set horizontal alignment
                switch ($this->wm_hor_alignment)
                {
@@ -1085,10 +1085,10 @@ class CI_Image_lib {
                                                        $x_axis += floor(($this->orig_width  -$fontwidth*strlen($this->wm_text))/2);
                                break;
                }
-               
+
                //  Add the text to the source image
                if ($this->wm_use_truetype)
-               {       
+               {
                        if ($this->wm_use_drop_shadow)
                                imagettftext($src_img, $this->wm_font_size, 0, $x_shad, $y_shad, $drp_color, $this->wm_font_path, $this->wm_text);
                                imagettftext($src_img, $this->wm_font_size, 0, $x_axis, $y_axis, $txt_color, $this->wm_font_path, $this->wm_text);
@@ -1099,7 +1099,7 @@ class CI_Image_lib {
                                imagestring($src_img, $this->wm_font_size, $x_shad, $y_shad, $this->wm_text, $drp_color);
                                imagestring($src_img, $this->wm_font_size, $x_axis, $y_axis, $this->wm_text, $txt_color);
                }
-       
+
                //  Output the final image
                if ($this->dynamic_output == TRUE)
                {
@@ -1109,14 +1109,14 @@ class CI_Image_lib {
                {
                        $this->image_save_gd($src_img);
                }
-               
+
                imagedestroy($src_img);
-       
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Create Image - GD
         *
@@ -1126,16 +1126,16 @@ class CI_Image_lib {
         * @access      public
         * @param       string
         * @return      resource
-        */                     
+        */
        function image_create_gd($path = '', $image_type = '')
        {
                if ($path == '')
                        $path = $this->full_src_path;
-                       
+
                if ($image_type == '')
                        $image_type = $this->image_type;
-       
-               
+
+
                switch ($image_type)
                {
                        case     1 :
@@ -1144,7 +1144,7 @@ class CI_Image_lib {
                                                        $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported'));
                                                        return FALSE;
                                                }
-                                       
+
                                                return imagecreatefromgif($path);
                                break;
                        case 2 :
@@ -1153,27 +1153,27 @@ class CI_Image_lib {
                                                        $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported'));
                                                        return FALSE;
                                                }
-                                       
+
                                                return imagecreatefromjpeg($path);
                                break;
                        case 3 :
                                                if ( ! function_exists('imagecreatefrompng'))
                                                {
-                                                       $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported'));                          
+                                                       $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported'));
                                                        return FALSE;
                                                }
-                                       
+
                                                return imagecreatefrompng($path);
-                               break;                  
-               
+                               break;
+
                }
-               
+
                $this->set_error(array('imglib_unsupported_imagecreate'));
                return FALSE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Write image file to disk - GD
         *
@@ -1183,68 +1183,80 @@ class CI_Image_lib {
         * @access      public
         * @param       resource
         * @return      bool
-        */                     
+        */
        function image_save_gd($resource)
-       {       
+       {
                switch ($this->image_type)
                {
                        case 1 :
                                                if ( ! function_exists('imagegif'))
                                                {
                                                        $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_gif_not_supported'));
-                                                       return FALSE;           
+                                                       return FALSE;
+                                               }
+
+                                               if ( ! @imagegif($resource, $this->full_dst_path))
+                                               {
+                                                       $this->set_error('imglib_save_failed');
+                                                       return FALSE;
                                                }
-                                               
-                                               @imagegif($resource, $this->full_dst_path);
                                break;
                        case 2  :
                                                if ( ! function_exists('imagejpeg'))
                                                {
                                                        $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_jpg_not_supported'));
-                                                       return FALSE;           
+                                                       return FALSE;
                                                }
-                                               
+
                                                if (phpversion() == '4.4.1')
                                                {
                                                        @touch($this->full_dst_path); // PHP 4.4.1 bug #35060 - workaround
                                                }
-                                               
-                                               @imagejpeg($resource, $this->full_dst_path, $this->quality);
+
+                                               if ( ! @imagejpeg($resource, $this->full_dst_path, $this->quality))
+                                               {
+                                                       $this->set_error('imglib_save_failed');
+                                                       return FALSE;
+                                               }
                                break;
                        case 3  :
                                                if ( ! function_exists('imagepng'))
                                                {
                                                        $this->set_error(array('imglib_unsupported_imagecreate', 'imglib_png_not_supported'));
-                                                       return FALSE;           
+                                                       return FALSE;
+                                               }
+
+                                               if ( ! @imagepng($resource, $this->full_dst_path))
+                                               {
+                                                       $this->set_error('imglib_save_failed');
+                                                       return FALSE;
                                                }
-                                       
-                                               @imagepng($resource, $this->full_dst_path);
                                break;
                        default         :
                                                        $this->set_error(array('imglib_unsupported_imagecreate'));
-                                                       return FALSE;           
-                               break;          
+                                                       return FALSE;
+                               break;
                }
-       
+
                return TRUE;
-       }       
-       
+       }
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Dynamically outputs an image
         *
         * @access      public
         * @param       resource
         * @return      void
-        */                     
+        */
        function image_display_gd($resource)
-       {               
+       {
                header("Content-Disposition: filename={$this->source_image};");
                header("Content-Type: {$this->mime_type}");
                header('Content-Transfer-Encoding: binary');
                header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT');
-       
+
                switch ($this->image_type)
                {
                        case 1          :       imagegif($resource);
@@ -1254,12 +1266,12 @@ class CI_Image_lib {
                        case 3          :       imagepng($resource);
                                break;
                        default         :       echo 'Unable to display the image';
-                               break;          
-               }                       
+                               break;
+               }
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Re-proportion Image Width/Height
         *
@@ -1272,25 +1284,25 @@ class CI_Image_lib {
         *
         * @access      public
         * @return      void
-        */                     
+        */
        function image_reproportion()
        {
                if ( ! is_numeric($this->width) OR ! is_numeric($this->height) OR $this->width == 0 OR $this->height == 0)
                        return;
-               
+
                if ( ! is_numeric($this->orig_width) OR ! is_numeric($this->orig_height) OR $this->orig_width == 0 OR $this->orig_height == 0)
                        return;
-               
-               $new_width      = ceil($this->orig_width*$this->height/$this->orig_height);             
+
+               $new_width      = ceil($this->orig_width*$this->height/$this->orig_height);
                $new_height     = ceil($this->width*$this->orig_height/$this->orig_width);
-               
+
                $ratio = (($this->orig_height/$this->orig_width) - ($this->height/$this->width));
-       
+
                if ($this->master_dim != 'width' AND $this->master_dim != 'height')
                {
                        $this->master_dim = ($ratio < 0) ? 'width' : 'height';
                }
-               
+
                if (($this->width != $new_width) AND ($this->height != $new_height))
                {
                        if ($this->master_dim == 'height')
@@ -1302,10 +1314,10 @@ class CI_Image_lib {
                                $this->height = $new_height;
                        }
                }
-       }       
-       
+       }
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Get image properties
         *
@@ -1314,27 +1326,27 @@ class CI_Image_lib {
         * @access      public
         * @param       string
         * @return      mixed
-        */                     
+        */
        function get_image_properties($path = '', $return = FALSE)
        {
                // For now we require GD but we should
                // find a way to determine this using IM or NetPBM
-               
+
                if ($path == '')
                        $path = $this->full_src_path;
-                               
+
                if ( ! file_exists($path))
                {
-                       $this->set_error('imglib_invalid_path');                
-                       return FALSE;                           
+                       $this->set_error('imglib_invalid_path');
+                       return FALSE;
                }
-               
+
                $vals = @getimagesize($path);
-               
+
                $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
-               
+
                $mime = (isset($types[$vals['2']])) ? 'image/'.$types[$vals['2']] : 'image/jpg';
-                               
+
                if ($return == TRUE)
                {
                        $v['width']                     = $vals['0'];
@@ -1342,21 +1354,21 @@ class CI_Image_lib {
                        $v['image_type']        = $vals['2'];
                        $v['size_str']          = $vals['3'];
                        $v['mime_type']         = $mime;
-                       
+
                        return $v;
                }
-               
+
                $this->orig_width       = $vals['0'];
                $this->orig_height      = $vals['1'];
                $this->image_type       = $vals['2'];
                $this->size_str         = $vals['3'];
                $this->mime_type        = $mime;
-               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Size calculator
         *
@@ -1374,25 +1386,27 @@ class CI_Image_lib {
         * @access      public
         * @param       array
         * @return      array
-        */                     
+        */
        function size_calculator($vals)
        {
                if ( ! is_array($vals))
+               {
                        return;
-                       
+               }
+
                $allowed = array('new_width', 'new_height', 'width', 'height');
-       
+
                foreach ($allowed as $item)
                {
                        if ( ! isset($vals[$item]) OR $vals[$item] == '')
                                $vals[$item] = 0;
                }
-               
+
                if ($vals['width'] == 0 OR $vals['height'] == 0)
                {
                        return $vals;
                }
-                       
+
                if ($vals['new_width'] == 0)
                {
                        $vals['new_width'] = ceil($vals['width']*$vals['new_height']/$vals['height']);
@@ -1401,12 +1415,12 @@ class CI_Image_lib {
                {
                        $vals['new_height'] = ceil($vals['new_width']*$vals['height']/$vals['width']);
                }
-       
+
                return $vals;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Explode source_image
         *
@@ -1420,39 +1434,23 @@ class CI_Image_lib {
         * @access      public
         * @param       array
         * @return      array
-        */     
+        */
        function explode_name($source_image)
        {
-               $x = explode('.', $source_image);
-               $ret['ext'] = '.'.end($x);
-               
-               $name = '';
-               
-               $ct = count($x)-1;
-               
-               for ($i = 0; $i < $ct; $i++)
-               {
-                       $name .= $x[$i];
-                       
-                       if ($i < ($ct - 1))
-                       {
-                               $name .= '.';
-                       }
-               }
+               $ext = strrchr($source_image, '.');
+               $name = ($ext === FALSE) ? $source_image : substr($source_image, 0, -strlen($ext));
                
-               $ret['name'] = $name;
-               
-               return $ret;
-       }       
-       
+               return array('ext' => $ext, 'name' => $name);
+       }
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Is GD Installed?
         *
         * @access      public
         * @return      bool
-        */     
+        */
        function gd_loaded()
        {
                if ( ! extension_loaded('gd'))
@@ -1462,54 +1460,54 @@ class CI_Image_lib {
                                return FALSE;
                        }
                }
-               
+
                return TRUE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Get GD version
         *
         * @access      public
         * @return      mixed
-        */     
+        */
        function gd_version()
        {
                if (function_exists('gd_info'))
                {
                        $gd_version = @gd_info();
                        $gd_version = preg_replace("/\D/", "", $gd_version['GD Version']);
-                       
+
                        return $gd_version;
                }
-               
+
                return FALSE;
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Set error message
         *
         * @access      public
         * @param       string
         * @return      void
-        */     
+        */
        function set_error($msg)
        {
                $CI =& get_instance();
                $CI->lang->load('imglib');
-               
+
                if (is_array($msg))
                {
                        foreach ($msg as $val)
                        {
-                               
+
                                $msg = ($CI->lang->line($val) == FALSE) ? $val : $CI->lang->line($val);
                                $this->error_msg[] = $msg;
                                log_message('error', $msg);
-                       }               
+                       }
                }
                else
                {
@@ -1518,24 +1516,24 @@ class CI_Image_lib {
                        log_message('error', $msg);
                }
        }
-       
+
        // --------------------------------------------------------------------
-       
+
        /**
         * Show error messages
         *
         * @access      public
         * @param       string
         * @return      string
-        */     
+        */
        function display_errors($open = '<p>', $close = '</p>')
-       {       
+       {
                $str = '';
                foreach ($this->error_msg as $val)
                {
                        $str .= $open.$val.$close;
                }
-       
+
                return $str;
        }