mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 17:01:43 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4242 - wrong path checked for ImageMagick

Browse Source
This commit is contained in:
e107steved
2007-12-07 19:53:27 +00:00
parent 833517c2c3
commit 0b6ed873b9
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_admin/image.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
| $Revision: 1.3 $ | $Revision: 1.4 $
| $Date: 2007-05-06 20:52:40 $ | $Date: 2007-12-07 19:53:26 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -76,7 +76,7 @@ if (isset($_POST['avdelete'])) {
if (isset($_POST['update_options'])) { if (isset($_POST['update_options'])) {
$pref['image_post'] = $_POST['image_post']; $pref['image_post'] = $_POST['image_post'];
$pref['resize_method'] = $_POST['resize_method']; $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_class'] = $_POST['image_post_class'];
$pref['image_post_disabled_method'] = $_POST['image_post_disabled_method']; $pref['image_post_disabled_method'] = $_POST['image_post_disabled_method'];
$pref['enable_png_image_fix'] = $_POST['enable_png_image_fix']; $pref['enable_png_image_fix'] = $_POST['enable_png_image_fix'];
@@ -289,13 +289,14 @@ else
$IM_NOTE = ""; $IM_NOTE = "";
if($pref['im_path'] != "") if($pref['im_path'] != "")
{ {
if(!file_exists($pref['im_path'])) $im_file = $pref['im_path'].'convert';
if(!file_exists($im_file))
{ {
$IM_NOTE = "<br /><span style='color:red'>".IMALAN_52."</span>"; $IM_NOTE = "<br /><span style='color:red'>".IMALAN_52."</span>";
} }
else else
{ {
$cmd = "{$pref['im_path']} -version"; $cmd = "{$im_file} -version";
$tmp = `$cmd`; $tmp = `$cmd`;
if(strpos($tmp, "ImageMagick") === FALSE) if(strpos($tmp, "ImageMagick") === FALSE)
{ {

6
e107_files/def_e107_prefs.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $ | $Source: /cvs_backup/e107_0.8/e107_files/def_e107_prefs.php,v $
| $Revision: 1.4 $ | $Revision: 1.5 $
| $Date: 2007-12-06 20:23:07 $ | $Date: 2007-12-07 19:53:27 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -73,7 +73,7 @@ City, State, Country
'user_tracking' => 'cookie', 'user_tracking' => 'cookie',
'cookie_name' => 'e107cookie', 'cookie_name' => 'e107cookie',
'resize_method' => 'gd2', 'resize_method' => 'gd2',
'im_path' => '/usr/X11R6/bin/convert', 'im_path' => '/usr/X11R6/bin/',
'im_quality' => '80', 'im_quality' => '80',
'im_width' => '120', 'im_width' => '120',
'im_height' => '100', 'im_height' => '100',