mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Added checks for ImageMagick path and for GD version, see Bugtracker #3602

Browse Source
This commit is contained in:
mcfly 2007-03-25 03:27:16 +00:00
parent 4291bf047c
commit b374cfd0bc
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
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.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:33:23 $ | $Date: 2007-03-25 03:27:05 $
| $Author: mcfly_e107 $ | $Author: mcfly_e107 $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@ -276,6 +276,33 @@ if (isset($_POST['check_avatar_sizes'])) {
$ns->tablerender(IMALAN_37, $text); $ns->tablerender(IMALAN_37, $text);
} }
if(function_exists('gd_info'))
{
$gd_info = gd_info();
$gd_version = $gd_info['GD Version'];
}
else
{
$gd_version = "<span style='color:red'> Not Installed</span>";
}
$IM_NOTE = "";
if($pref['im_path'] != "")
{
if(!file_exists($pref['im_path']))
{
$IM_NOTE = "<br /><span style='color:red'>".IMALAN_52."</span>";
}
else
{
$cmd = "{$pref['im_path']} -version";
$tmp = `$cmd`;
if(strpos($tmp, "ImageMagick") === FALSE)
{
$IM_NOTE = "<br /><span style='color:red'>".IMALAN_53."</span>";
}
}
}
$text = "<div style='text-align:center'> $text = "<div style='text-align:center'>
<form method='post' action='".e_SELF."'> <form method='post' action='".e_SELF."'>
@ -328,7 +355,7 @@ $text .= "</select>
</tr> </tr>
<tr> <tr>
<td style='width:75%' class='forumheader3'>".IMALAN_3."<br /><span class='smalltext'>".IMALAN_4."</span></td> <td style='width:75%' class='forumheader3'>".IMALAN_3."<br /><span class='smalltext'>".IMALAN_4."</span><br />".IMALAN_54." {$gd_version}</td>
<td style='width:25%;text-align:center' class='forumheader3' > <td style='width:25%;text-align:center' class='forumheader3' >
<select name='resize_method' class='tbox'>". ($pref['resize_method'] == "gd1" ? "<option selected='selected'>gd1</option>" : "<option>gd1</option>"). ($pref['resize_method'] == "gd2" ? "<option selected='selected'>gd2</option>" : "<option>gd2</option>"). ($pref['resize_method'] == "ImageMagick" ? "<option selected='selected'>ImageMagick</option>" : "<option>ImageMagick</option>")." <select name='resize_method' class='tbox'>". ($pref['resize_method'] == "gd1" ? "<option selected='selected'>gd1</option>" : "<option>gd1</option>"). ($pref['resize_method'] == "gd2" ? "<option selected='selected'>gd2</option>" : "<option>gd2</option>"). ($pref['resize_method'] == "ImageMagick" ? "<option selected='selected'>ImageMagick</option>" : "<option>ImageMagick</option>")."
</select> </select>
@ -339,6 +366,7 @@ $text .= "</select>
<td style='width:75%' class='forumheader3'>".IMALAN_5."<br /><span class='smalltext'>".IMALAN_6."</span></td> <td style='width:75%' class='forumheader3'>".IMALAN_5."<br /><span class='smalltext'>".IMALAN_6."</span></td>
<td style='width:25%;text-align:center' class='forumheader3' > <td style='width:25%;text-align:center' class='forumheader3' >
<input class='tbox' type='text' name='im_path' size='40' value=\"".$pref['im_path']."\" maxlength='200' /> <input class='tbox' type='text' name='im_path' size='40' value=\"".$pref['im_path']."\" maxlength='200' />
{$IM_NOTE}
</td></tr> </td></tr>
<tr> <tr>

8
e107_languages/English/admin/lan_image.php
View File

@ -4,8 +4,8 @@
| e107 website system - Language File. | e107 website system - Language File.
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_image.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_image.php,v $
| $Revision: 1.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:34:40 $ | $Date: 2007-03-25 03:27:05 $
| $Author: mcfly_e107 $ | $Author: mcfly_e107 $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@ -61,5 +61,9 @@ define("IMALAN_49", "Users with avatars");
define("IMALAN_50", "Total"); define("IMALAN_50", "Total");
define("IMALAN_51", "Avatar for "); define("IMALAN_51", "Avatar for ");
define("IMALAN_52", "Path to ImageMagick appears to be incorrect");
define("IMALAN_53", "Path to ImageMagick appears to be correct, but convert file may not be valid");
define("IMALAN_54", "GD version installed:");
?> ?>