Changeset 9952 for trunk/admin/include

Timestamp:

Mar 31, 2011, 4:26:16 PM (14 years ago)

Author:

patdenice

Message:

feature:2239
Support GIF format in the upload form (only in GD)

File:

• trunk/admin/include/functions_upload.inc.php (modified) (8 diffs)

trunk/admin/include/functions_upload.inc.php

@@ -239 +239 @@
     {
       $file_path.= 'png';
+    }
+    elseif (IMAGETYPE_GIF == $type)
+    {
+      $file_path.= 'gif';
     }
     else
@@ -479 +483 @@
   $ratio_width  = $width / $max_width;
   $ratio_height = $height / $max_height;
+  $destination_width = $width; 
+  $destination_height = $height;
   
   // maximal size exceeded ?
@@ -514 +520 @@
   }
 
-  if (is_imagick())
+  $extension = strtolower(get_extension($source_filepath));
+
+  if (is_imagick() and $extension != 'gif')
   {
     return pwg_image_resize_im($source_filepath, $destination_filepath, $max_width, $max_height, $quality, $strip_metadata);
@@ -530 +538 @@
     return false;
   }
+
+  $gd_info = gd_info();
 
   // extension of the picture filename
@@ -543 +553 @@
     $source_image = imagecreatefrompng($source_filepath);
   }
+  elseif ($extension == 'gif' and $gd_info['GIF Read Support'] and $gd_info['GIF Create Support'])
+  {
+    $source_image = imagecreatefromgif($source_filepath);
+  }
   else
   {
-    die('unsupported file extension');
+    die('[GD] unsupported file extension');
   }
 
@@ -595 +609 @@
     imagepng($destination_image, $destination_filepath);
   }
+  elseif ($extension == 'gif')
+  {
+    imagegif($destination_image, $destination_filepath);
+  }
   else
   {
@@ -665 +683 @@
 
   if (!$conf['upload_form_automatic_rotation'])
+  {
+    return null;
+  }
+
+  list($width, $height, $type) = getimagesize($source_filepath);
+  if (IMAGETYPE_JPEG != $type)
   {
     return null;
@@ -712 +736 @@
 function is_valid_image_extension($extension)
 {
-  return in_array(strtolower($extension), array('jpg', 'jpeg', 'png'));
+  return in_array(strtolower($extension), array('jpg', 'jpeg', 'png', 'gif'));
 }