Changeset 25929 for trunk/admin/include

Timestamp:

Dec 12, 2013, 11:34:55 AM (11 years ago)

Author:

plg

Message:

feature 2869 added: support TIFF files on web upload (requires ext_imagick)

Location:

trunk/admin/include

Files:

• functions_upload.inc.php (modified) (4 diffs)
• photos_add_direct_prepare.inc.php (modified) (1 diff)

trunk/admin/include/functions_upload.inc.php

@@ -172 +172 @@
 
   $file_path = null;
+  $is_tiff = false;
 
   if (isset($image_id))
@@ -227 +228 @@
       $file_path.= 'gif';
     }
+    elseif (IMAGETYPE_TIFF_MM == $type or IMAGETYPE_TIFF_II == $type)
+    {
+      $is_tiff = true;
+      $file_path.= 'tif';
+    }
     else
     {
@@ -244 +250 @@
   }
   @chmod($file_path, 0644);
+
+  if ($is_tiff and pwg_image::get_library() == 'ext_imagick')
+  {
+    // move the uploaded file to pwg_representative sub-directory
+    $representative_file_path = dirname($file_path).'/pwg_representative/';
+    $representative_file_path.= get_filename_wo_extension(basename($file_path)).'.';
+
+    $representative_ext = $conf['tiff_representative_ext'];
+    $representative_file_path.= $representative_ext;
+
+    prepare_directory(dirname($representative_file_path));
+    
+    $exec = $conf['ext_imagick_dir'].'convert';
+
+    if ('jpg' == $conf['tiff_representative_ext'])
+    {
+      $exec .= ' -quality 98';
+    }
+    
+    $exec .= ' "'.realpath($file_path).'"';
+
+    $dest = pathinfo($representative_file_path);
+    $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
+    
+    $exec .= ' 2>&1';
+    @exec($exec, $returnarray);
+
+    // sometimes ImageMagick creates file-0.jpg (full size) + file-1.jpg
+    // (thumbnail). I don't know how to avoid it.
+    $representative_file_abspath = realpath($dest['dirname']).'/'.$dest['basename'];
+    if (!file_exists($representative_file_abspath))
+    {
+      $first_file_abspath = preg_replace(
+        '/\.'.$representative_ext.'$/',
+        '-0.'.$representative_ext,
+        $representative_file_abspath
+        );
+      
+      if (file_exists($first_file_abspath))
+      {
+        rename($first_file_abspath, $representative_file_abspath);
+      }
+    }
+  }
 
   if (pwg_image::get_library() != 'gd')
@@ -319 +369 @@
     {
       $insert['level'] = $level;
+    }
+
+    if (isset($representative_ext))
+    {
+      $insert['representative_ext'] = $representative_ext;
     }
 

trunk/admin/include/photos_add_direct_prepare.inc.php

@@ -145 +145 @@
 
 $upload_file_types = 'jpeg, png, gif';
+
+if (pwg_image::get_library() == 'ext_imagick')
+{
+  $upload_file_types.= ', tiff';
+  $template->assign('tif_enabled', true);
+}
+
 if ('html' == $upload_mode)
 {