diff --git a/e107_admin/image.php b/e107_admin/image.php index 96ada52a4..378d3223f 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-05-06 20:52:40 $ +| $Revision: 1.4 $ +| $Date: 2007-12-07 19:53:26 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -76,7 +76,7 @@ if (isset($_POST['avdelete'])) { if (isset($_POST['update_options'])) { $pref['image_post'] = $_POST['image_post']; $pref['resize_method'] = $_POST['resize_method']; - $pref['im_path'] = $tp->toDB($_POST['im_path']); + $pref['im_path'] = trim($tp->toDB($_POST['im_path'])); $pref['image_post_class'] = $_POST['image_post_class']; $pref['image_post_disabled_method'] = $_POST['image_post_disabled_method']; $pref['enable_png_image_fix'] = $_POST['enable_png_image_fix']; @@ -289,13 +289,14 @@ else $IM_NOTE = ""; if($pref['im_path'] != "") { - if(!file_exists($pref['im_path'])) + $im_file = $pref['im_path'].'convert'; + if(!file_exists($im_file)) { $IM_NOTE = "
".IMALAN_52.""; } else { - $cmd = "{$pref['im_path']} -version"; + $cmd = "{$im_file} -version"; $tmp = `$cmd`; if(strpos($tmp, "ImageMagick") === FALSE) { diff --git a/e107_files/def_e107_prefs.php b/e107_files/def_e107_prefs.php index 18643947e..506932206 100644 --- a/e107_files/def_e107_prefs.php +++ b/e107_files/def_e107_prefs.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $ -| $Revision: 1.4 $ -| $Date: 2007-12-06 20:23:07 $ +| $Revision: 1.5 $ +| $Date: 2007-12-07 19:53:27 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -73,7 +73,7 @@ City, State, Country 'user_tracking' => 'cookie', 'cookie_name' => 'e107cookie', 'resize_method' => 'gd2', - 'im_path' => '/usr/X11R6/bin/convert', + 'im_path' => '/usr/X11R6/bin/', 'im_quality' => '80', 'im_width' => '120', 'im_height' => '100',