Index: image.imagemagick.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.imagemagick.inc,v
retrieving revision 1.24
diff -u -p -r1.24 image.imagemagick.inc
--- image.imagemagick.inc	6 Mar 2009 01:40:09 -0000	1.24
+++ image.imagemagick.inc	25 Oct 2009 01:07:09 -0000
@@ -25,7 +25,7 @@ function image_imagemagick_settings() {
     '#title' => t('Path to the "convert" binary'),
     '#default_value' => variable_get('image_imagemagick_convert', '/usr/bin/convert'),
     '#required' => TRUE,
-    '#description' => t('Specify the complete path to the ImageMagic <kbd>convert</kbd> binary. For example: <kbd>/usr/bin/convert</kbd> or <kbd>C:\Program Files\ImageMagick-6.3.4-Q16\convert.exe</kbd>.'),
+    '#description' => t('Specify the path to the ImageMagic <kbd>convert</kbd> binary. For example: <kbd>/usr/bin/convert</kbd> or <kbd>C:\Program Files\ImageMagick-6.3.4-Q16\convert.exe</kbd> or simply <kbd>convert</kbd> if ImageMagic is in the path.'),
   );
   $form['imagemagick_binary']['image_imagemagick_debugging'] = array(
     '#type' => 'checkbox',
@@ -39,7 +39,7 @@ function image_imagemagick_settings() {
 function _image_imagemagick_build_version($form, $form_element) {
   // Don't check the path when another toolkit is being selected.  
   if (!isset($form['#post']['image_toolkit']) || $form['#post']['image_toolkit'] == 'imagemagick') {
-    $valid = _image_imagemagick_check_path($form_element['values']['image_imagemagick_convert'], 'image_imagemagick_convert');
+    $valid = image_imagemagick_check_path($form_element['values']['image_imagemagick_convert'], 'image_imagemagick_convert');
     if ($valid) {
       _image_imagemagick_convert_exec('-version', $output, $errors);
       $form['imagemagick_binary']['version'] = array(
@@ -51,10 +51,21 @@ function _image_imagemagick_build_versio
   return $form;
 }
 
-function _image_imagemagick_check_path($path, $attach_error_to = FALSE) {
-  if (file_exists($path)) {
-    return TRUE;
+/**
+ * Check the convert path
+ */
+function image_imagemagick_check_path($path, $attach_error_to = FALSE) {
+  if (strcmp(dirname($path), ".") == 0) {
+    if (exec($path . " -version") !== FALSE) {
+      return TRUE;
+    }
   }
+  else {
+    if (file_exists($path)) {
+      return TRUE;
+    }
+  }
+
   if ($attach_error_to) {
     if ($open_basedir = ini_get('open_basedir')) {
       form_set_error($attach_error_to, t("No file %file could be found. PHP's <a href='@open_basedir'>open_basedir</a> security restriction is set to %open_basedir, which may be interfering with the attempts to locate ImageMagick.", array('%file' => $path, '%open_basedir' => $open_basedir, '@open_basedir' => 'http://php.net/features.safe-mode#ini.open-basedir')));
@@ -137,7 +148,7 @@ function _image_imagemagick_convert($sou
 
 function _image_imagemagick_convert_exec($command_args, &$output, &$errors) {
   $convert_path = variable_get('image_imagemagick_convert', '/usr/bin/convert');
-  if (!_image_imagemagick_check_path($convert_path)) {
+  if (!image_imagemagick_check_path($convert_path)) {
     drupal_set_message(t("ImageMagick could not be found. The admin will need to set the path on the <a href='@image-toolkit-settings'>image toolkit page</a>.", array('@image-toolkit-settings' => url('admin/settings/image-toolkit'))), 'error');
     return FALSE;
   }
Index: contrib/image_im_advanced/image_im_advanced.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_im_advanced/image_im_advanced.install,v
retrieving revision 1.4
diff -u -p -r1.4 image_im_advanced.install
--- contrib/image_im_advanced/image_im_advanced.install	6 Mar 2009 01:40:10 -0000	1.4
+++ contrib/image_im_advanced/image_im_advanced.install	25 Oct 2009 01:07:09 -0000
@@ -28,7 +28,7 @@ function image_im_advanced_requirements(
     }
     // If the imagemagick convert utility does not exist, indicate an error.
     $convert_path = variable_get('image_imagemagick_convert', '/usr/bin/convert');
-    if (!file_exists($convert_path)) {
+    if (!image_toolkit_invoke("check_path", array($convert_path))) {
       $requirements['imagemagick']['value'] = t('ImageMagick convert utility not found.');
       $requirements['imagemagick']['description'] = t('The ImageMagick image convert utility (@convert) does not exist. If you have ImageMagick installed, click <a href="@toolkit">here</a> to provide the path to the convert utility.', array('@convert' => $convert_path, '@toolkit' => url('admin/settings/image-toolkit')));
       $requirements['imagemagick']['severity'] = REQUIREMENT_ERROR;