Changeset 10570 for trunk/admin/include

Timestamp:

Apr 22, 2011, 3:19:36 PM (14 years ago)

Author:

patdenice

Message:

feature:2274
Create thumbnail through ajax.
Remove $conftn_width, $conftn_height and $conftn_compression_level parameters.

File:

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

trunk/admin/include/functions_upload.inc.php

@@ -605 +605 @@
     // the image doesn't need any resize! We just copy it to the destination
     copy($source_filepath, $destination_filepath);
-    return true;
+    return get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'GD');
   }
   
@@ -647 +647 @@
 
   // everything should be OK if we are here!
-  return array(
-    'source'      => $source_filepath,
-    'destination' => $destination_filepath,
-    'width'       => $resize_dimensions['width'],
-    'height'      => $resize_dimensions['height'],
-    'size'        => floor(filesize($destination_filepath) / 1024).' KB',
-    'time'            => number_format((get_moment() - $starttime) * 1000, 2, '.', ' ').' ms',
-    'library'     => 'GD',
-  );
+  return get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'GD');
 }
 
@@ -692 +684 @@
     // the image doesn't need any resize! We just copy it to the destination
     copy($source_filepath, $destination_filepath);
-    return true;
+    get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'ImageMagick');
   }
 
@@ -717 +709 @@
 
   // everything should be OK if we are here!
-  return array(
-    'source'      => $source_filepath,
-    'destination' => $destination_filepath,
-    'width'       => $resize_dimensions['width'],
-    'height'      => $resize_dimensions['height'],
-    'size'        => floor(filesize($destination_filepath) / 1024).' KB',
-    'time'            => number_format((get_moment() - $starttime) * 1000, 2, '.', ' ').' ms',
-    'library'     => 'ImageMagick',
-  );
+  return get_resize_result($source_filepath, $destination_filepath, $resize_dimensions['width'], $resize_dimensions['height'], $starttime, 'ImageMagick');
 }
 
@@ -967 +951 @@
   return $file_path;
 }
+
+function get_resize_result($source_filepath, $destination_filepath, $width, $height, $time, $library)
+{
+  return array(
+    'source'      => $source_filepath,
+    'destination' => $destination_filepath,
+    'width'       => $width,
+    'height'      => $height,
+    'size'        => floor(filesize($destination_filepath) / 1024).' KB',
+    'time'            => number_format((get_moment() - $time) * 1000, 2, '.', ' ').' ms',
+    'library'     => $library,
+  );
+}
 ?>