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

Issue #1257 More work on SEF Thumb URLs.

Browse Source
This commit is contained in:
Cameron
2016-02-04 11:40:15 -08:00
parent 27c2a07d25
commit 0c3125a11e
3 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_core/bbcodes/bb_img.php
View File

@@ -42,8 +42,8 @@ class bb_img extends e_bb_base
// Replace the bbcode path with a real one.
$code_text = str_replace('{e_MEDIA}images/','{e_MEDIA_IMAGE}',$code_text); //BC 0.8 fix.
$code_text = str_replace('{e_MEDIA_IMAGE}', e_HTTP."thumb.php?src=e_MEDIA_IMAGE/", $code_text);
$code_text = str_replace('{e_THEME}', e_HTTP."thumb.php?src=e_THEME/", $code_text);
// $code_text = str_replace('{e_MEDIA_IMAGE}', e_HTTP."thumb.php?src=e_MEDIA_IMAGE/", $code_text);
// $code_text = str_replace('{e_THEME}', e_HTTP."thumb.php?src=e_THEME/", $code_text);
$imgParms = $this->processParm($code_text, $parm);
$figcaption = false;
@@ -60,25 +60,22 @@ class bb_img extends e_bb_base
// $parmStr .= " ".$k.'="'.$v.'"';
$p[] = $tp->toAttribute($k).'="'.$tp->toAttribute($v).'"';
}
// $w = e107::getBB()->resizeWidth(); // varies depending on the class set by external script. see admin->media-manager->prefs
$w = vartrue($imgParms['width']) ? intval($imgParms['width']) : vartrue(e107::getBB()->resizeWidth(),0);
// $h = vartrue($imgParms['height']) ? intval($imgParms['height']) : e107::getBB()->resizeHeight();
$resize = "&w=".$w; // Always resize - otherwise the thumbnailer returns nothing.
$parmStr = implode(" ",$p);
// print_a($imgParms);
// print_a($parmStr);
$url = e107::getParser()->thumbUrl($code_text, $resize);
if(!empty($figcaption))
{
$html = "<figure>\n";
$html .= "<img src=\"".$code_text.$resize."\" {$parmStr} />\n";
$html .= "<img src=\"".$url."\" {$parmStr} />";
$html .= "<figcaption>".e107::getParser()->filter($figcaption,'str')."</figcaption>\n";
$html .= "</figure>";
@@ -86,7 +83,7 @@ class bb_img extends e_bb_base
}
else
{
return "<img src=\"".$code_text.$resize."\" {$parmStr} />";
return "<img src=\"".$url."\" {$parmStr} />";
}
}