Changeset 6616

Timestamp:

Jun 28, 2010, 10:57:35 PM (14 years ago)

Author:

plg

Message:

bug 1701 fixed: support for PNG file in browser direct upload.

If the picture is a PNG file, then the "web size" picture is also a PNG file
but the thumbnail is always a JPEG file.

Location:

branches/2.1/admin

Files:

• include/functions_upload.inc.php (modified) (3 diffs)
• themes/default/template/photos_add_direct.tpl (modified) (1 diff)

branches/2.1/admin/include/functions_upload.inc.php

@@ -43 +43 @@
   $random_string = substr($md5sum, 0, 8);
   $filename_wo_ext = $date_string.'-'.$random_string;
-  $file_path = $upload_dir.'/'.$filename_wo_ext.'.jpg';
+  $file_path = $upload_dir.'/'.$filename_wo_ext.'.';
+
+  list($width, $height, $type) = getimagesize($source_filepath);
+  if (IMAGETYPE_PNG == $type)
+  {
+    $file_path.= 'png';
+  }
+  else
+  {
+    $file_path.= 'jpg';
+  }
 
   prepare_directory($upload_dir);
@@ -199 +209 @@
   if (in_array($extension, array('jpg', 'jpeg')))
   {
-    $source_image = @imagecreatefromjpeg($source_filepath);
+    $source_image = imagecreatefromjpeg($source_filepath);
   }
   else if ($extension == 'png')
   {
-    $source_image = @imagecreatefrompng($source_filepath);
+    $source_image = imagecreatefrompng($source_filepath);
   }
   else
@@ -253 +263 @@
     );
   
-  imagejpeg($destination_image, $destination_filepath, $quality);
+  $extension = strtolower(get_extension($destination_filepath));
+  if ($extension == 'png')
+  {
+    imagepng($destination_image, $destination_filepath);
+  }
+  else
+  {
+    imagejpeg($destination_image, $destination_filepath, $quality);
+  }
   // freeing memory ressources
   imagedestroy($source_image);

branches/2.1/admin/themes/default/template/photos_add_direct.tpl

@@ -107 +107 @@
     'buttonText'     : buttonText,
     'multi'          : true,
-    'fileDesc'       : 'Photo files (*.jpg,*.jpeg)',
-    'fileExt'        : '*.jpg;*.JPG;*.jpeg;*.JPEG',
+    'fileDesc'       : 'Photo files (*.jpg,*.jpeg,*.png)',
+    'fileExt'        : '*.jpg;*.JPG;*.jpeg;*.JPEG;*.png;*.PNG',
     'onAllComplete'  : function(event, data) {
       if (data.errors) {