Changeset 420547

Timestamp:

08/08/2011 11:31:53 AM (15 years ago)

Author:

orangelab

Message:

1.3.1-beta1, escape ^{on windows}

Location:

imagemagick-engine/trunk

Files:

• imagemagick-engine.php (modified) (7 diffs)
• readme.txt (modified) (2 diffs)

imagemagick-engine/trunk/imagemagick-engine.php

@@ -6 +6 @@
   Author: Orangelab
   Author URI: http://www.orangelab.se
-  Version: 1.3.0
+  Version: 1.3.1-beta1
   Text Domain: imagemagick-engine
 
@@ -425 +425 @@
 }
 
+// Escape cli executable
+function ime_im_cli_escape_cmd($cmd) {
+    return '"' . $cmd . '"';
+}
+
 // Test if we are allowed to exec executable!
 function ime_im_cli_check_executable($fullpath) {
@@ -430 +435 @@
         return false;
 
-    @exec($fullpath . ' --version', $output);
+    @exec(ime_im_cli_escape_cmd($fullpath) . ' --version', $output);
 
     return count($output) > 0;
@@ -452 +457 @@
     $path = ime_try_realpath($path);
 
-    $cmd = $path . '/' . $executable;
+    $cmd = escapeshellcmd($path . '/' . $executable);
     if (ime_im_cli_check_executable($cmd))
         return $cmd;
@@ -488 +493 @@
 }
 
+// Check if we are running under Windows (which differs for character escape)
+function ime_is_windows() {
+    return (constant('PHP_SHLIB_SUFFIX') == 'dll');
+}
+
 // Resize using ImageMagick executable
 function ime_im_cli_resize($old_file, $new_file, $width, $height, $crop) {
@@ -493 +503 @@
     if (empty($cmd))
         return false;
+    $cmd = ime_im_cli_escape_cmd($cmd);
 
     $old_file = addslashes($old_file);
     $new_file = addslashes($new_file);
 
+    $geometry = $width . 'x' . $height;
+
     // limits are 150mb and 128mb
-    $cmd = "\"$cmd\" -limit memory 157286400 -limit map 134217728 -size {$width}x{$height} \"{$old_file}\" -resize {$width}x{$height}";
-    if ($crop)
-        $cmd .= "^ -gravity center -extent {$width}x{$height}";
-    else
+    $cmd = "$cmd \"$old_file\" -limit memory 157286400 -limit map 134217728 -resize $geometry";
+    if ($crop) {
+        // '^' is an escape character on Windows
+        $cmd .= (ime_is_windows() ? '^^' : '^') . " -gravity center -extent $geometry";
+    } else
         $cmd .= "!"; // force these dimensions
 
@@ -508 +522 @@
         $cmd .= " -quality " . intval($quality);
 
-    $cmd .= " \"{$new_file}\"";
+    $cmd .= ' "' .  $new_file . '"';
     exec($cmd);
 

imagemagick-engine/trunk/readme.txt

@@ -3 +3 @@
 Tags: image, images, picture, imagemagick, gd
 Requires at least: 2.9
-Tested up to: 3.2
+Tested up to: 3.2.1
 Stable tag: 1.3.0
 
@@ -75 +75 @@
 == Changelog ==
 
+= 1.3.1 =
+* Tested with WP 3.2.1
+* Bugfix: escape '^' character on Windows (thanks to alx359)
+* clean up IM command line argument handling a bit
+
 = 1.3.0 =
 * Tested agains WP 3.2