mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Issue #4049 - media_sef (URL) returned for media type 'file' was incorrect.

Browse Source
This commit is contained in:
Cameron
2020-05-25 12:34:18 -07:00
parent 7f0b2134ab
commit 2009549a4e
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_admin/image.php
View File

@@ -485,11 +485,11 @@ class media_form_ui extends e_admin_form_ui
return FALSE; return FALSE;
// return $this; // return $this;
} }
if($WM) // TODO Add watermark prefs for alpha and position. /* if($WM) // TODO Add watermark prefs for alpha and position.
{ {
$thumb->resize($img_import_w,$img_import_h)->addWatermark($watermark, 'rightBottom', 30, 0, 0)->save($oldpath); $thumb->resize($img_import_w,$img_import_h)->addWatermark($watermark, 'rightBottom', 30, 0, 0)->save($oldpath);
} }
else else*/
{ {
if($thumb->resize($img_import_w,$img_import_h)->save($oldpath)) if($thumb->resize($img_import_w,$img_import_h)->save($oldpath))
{ {
@@ -762,16 +762,13 @@ class media_form_ui extends e_admin_form_ui
$val = $this->getController()->getFieldVar('media_url'); $val = $this->getController()->getFieldVar('media_url');
$type = $this->getMediaType(); $type = $this->getMediaType();
switch($type) switch($type)
{ {
case "label1": case "application":
// code
break;
case "audio": case "audio":
case "icon": case "icon":
case "file":
case "video":
$path = e107::getParser()->replaceConstants($val, 'abs'); $path = e107::getParser()->replaceConstants($val, 'abs');
break; break;
@@ -781,8 +778,8 @@ class media_form_ui extends e_admin_form_ui
// code to be executed if n is different from all labels; // code to be executed if n is different from all labels;
} }
$url = SITEURLBASE.$path; $url = SITEURLBASE.$path;
return "<a href='".$url."' rel='external' title='".LAN_EFORM_010."'><small>".$url."</small></a>"; return "<a href='".$url."' rel='external' title='".LAN_EFORM_010."'><small>".$url."</small></a>";
} }
@@ -1869,7 +1866,7 @@ class media_admin_ui extends e_admin_ui
e107::getBB()->setClass($category); e107::getBB()->setClass($category);
$parms['width'] = (int) e107::getBB()->resizeWidth(); // resize the image according to prefs. $parms['width'] = (int) e107::getBB()->resizeWidth(); // resize the image according to prefs.
$parms['height'] = (int) e107::getBB()->resizeHeight(); $parms['height'] = (int) e107::getBB()->resizeHeight();
e107::getBB()->clearclass(); e107::getBB()->clearClass();
} }
@@ -2472,8 +2469,9 @@ class media_admin_ui extends e_admin_ui
{ {
$gd_version = "<span class='error'> ".IMALAN_55."</span>"; $gd_version = "<span class='error'> ".IMALAN_55."</span>";
} }
if($pref['resize_method'] == "ImageMagick" && (!vartrue(e107::getFolder('imagemagick')))) $folder1 = e107::getFolder('imagemagick');
if($pref['resize_method'] == "ImageMagick" && (!vartrue($folder1)))
{ {
$mes->addWarning('Please add: <b>$IMAGEMAGICK_DIRECTORY="'.$pref['im_path'].'";</b> to your e107_config.php file'); $mes->addWarning('Please add: <b>$IMAGEMAGICK_DIRECTORY="'.$pref['im_path'].'";</b> to your e107_config.php file');
@@ -2481,7 +2479,8 @@ class media_admin_ui extends e_admin_ui
//$IM_NOTE = ""; //$IM_NOTE = "";
$im_path = vartrue(e107::getFolder('imagemagick')); $folder = e107::getFolder('imagemagick');
$im_path = vartrue($folder);
if($im_path != "") if($im_path != "")
{ {
$im_file = $im_path.'convert'; $im_file = $im_path.'convert';
@@ -3879,4 +3878,3 @@ if (isset($_POST['check_avatar_sizes']))
//Just in case... //Just in case...
if(!e_AJAX_REQUEST) require_once("footer.php"); if(!e_AJAX_REQUEST) require_once("footer.php");
?>