Changeset 9860

Timestamp:

Mar 26, 2011, 1:42:34 PM (13 years ago)

Author:

patdenice

Message:

Do not use temp file

Location:

extensions/external_ImageMagick

Files:

• branch/2.1/imagick.class.php (modified) (3 diffs)
• branch/2.1/main.inc.php (modified) (1 diff)
• trunk/imagick.class.php (modified) (3 diffs)
• trunk/main.inc.php (modified) (1 diff)

extensions/external_ImageMagick/branch/2.1/imagick.class.php

@@ -4 +4 @@
 {
   var $source_path = '';
-  var $tmp_path = '';
   var $image_data = array();
   var $imagemagickdir = '';
@@ -49 +48 @@
 
     if (isset($conf['imagick_dir']))
-      $this->imagemagickdir = rtrim($conf['imagick_dir'], ' /\\').(PHP_OS == 'WINNT' ? '\\' : '/');
-
-    $this->tmp_path = @tempnam($conf['local_data_dir'], get_extension($this->source_path));
+      $this->imagemagickdir = rtrim($conf['imagick_dir'], ' /\\').'/';
 
     $command = $this->imagemagickdir."identify -verbose ".realpath($this->source_path);
@@ -142 +139 @@
     }
 
-    $exec .= ' '.realpath($this->tmp_path);
+    $dest = pathinfo($destination_filepath);
+    $exec .= ' '.realpath($dest['dirname']).'/'.$dest['basename'];
     @exec($exec, $returnarray, $returnvalue);
-    @rename($this->tmp_path, $destination_filepath);
-    @chmod($destination_filepath, 0644);
-    
   }
 

extensions/external_ImageMagick/branch/2.1/main.inc.php

@@ -46 +46 @@
   global $conf;
 
-  $imagick_dir = isset($conf['imagick_dir']) ? rtrim($conf['imagick_dir'], ' /\\').(PHP_OS == 'WINNT' ? '\\' : '/') : '';
+  $imagick_dir = isset($conf['imagick_dir']) ? rtrim($conf['imagick_dir'], ' /\\').'/' : '';
   @exec($imagick_dir.'convert', $returnarray, $returnvalue);
   return (!$returnvalue and !empty($returnarray[0]) and preg_match('/ImageMagick/', $returnarray[0]));

extensions/external_ImageMagick/trunk/imagick.class.php

@@ -4 +4 @@
 {
   var $source_path = '';
-  var $tmp_path = '';
   var $image_data = array();
   var $imagemagickdir = '';
@@ -49 +48 @@
 
     if (isset($conf['imagick_dir']))
-      $this->imagemagickdir = rtrim($conf['imagick_dir'], ' /\\').(PHP_OS == 'WINNT' ? '\\' : '/');
-
-    $this->tmp_path = @tempnam($conf['local_data_dir'], get_extension($this->source_path));
+      $this->imagemagickdir = rtrim($conf['imagick_dir'], ' /\\').'/';
 
     $command = $this->imagemagickdir."identify -verbose ".realpath($this->source_path);
@@ -142 +139 @@
     }
 
-    $exec .= ' '.realpath($this->tmp_path);
+    $dest = pathinfo($destination_filepath);
+    $exec .= ' '.realpath($dest['dirname']).'/'.$dest['basename'];
     @exec($exec, $returnarray, $returnvalue);
-    @rename($this->tmp_path, $destination_filepath);
-    @chmod($destination_filepath, 0644);
   }
 

extensions/external_ImageMagick/trunk/main.inc.php

@@ -42 +42 @@
   global $conf;
 
-  $imagick_dir = isset($conf['imagick_dir']) ? rtrim($conf['imagick_dir'], ' /\\').(PHP_OS == 'WINNT' ? '\\' : '/') : '';
+  $imagick_dir = isset($conf['imagick_dir']) ? rtrim($conf['imagick_dir'], ' /\\').'/' : '';
   @exec($imagick_dir.'convert', $returnarray, $returnvalue);
   return (!$returnvalue and !empty($returnarray[0]) and preg_match('/ImageMagick/', $returnarray[0]));