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

Issue #1342 toImage() method updated.

Browse Source
This commit is contained in:
Cameron
2016-02-09 11:02:08 -08:00
parent bd57c0109c
commit 2ccb18696a
2 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
e107_handlers/e_parse_class.php
View File

@@ -2159,17 +2159,17 @@ class e_parse extends e_parser
*/ */
public function setThumbSize($w=null,$h=null,$crop=null) public function setThumbSize($w=null,$h=null,$crop=null)
{ {
if($w) if($w !== null)
{ {
$this->thumbWidth = intval($w); $this->thumbWidth = intval($w);
} }
if($h) if($h !== null)
{ {
$this->thumbHeight = intval($h); $this->thumbHeight = intval($h);
} }
if($crop) if($crop !== null)
{ {
$this->thumbCrop = intval($crop); $this->thumbCrop = intval($crop);
} }
@@ -3405,30 +3405,33 @@ class e_parser
/** /**
* @param $file * Render an <img> tag.
* @param array $parm legacy|w|h * @param string $file
* @param array $parm legacy|w|h|alt|class|id|crop
* @return string * @return string
* @example $tp->toImage('welcome.png', array('legacy'=>{e_IMAGE}newspost_images/','w'=>200)); * @example $tp->toImage('welcome.png', array('legacy'=>{e_IMAGE}newspost_images/','w'=>200));
*/ */
public function toImage($file, $parm=array()) public function toImage($file, $parm=array())
{ {
if(!vartrue($file)) if(empty($file))
{ {
return ''; return null;
} }
$file = trim($file); $dimensions = null;
$srcset = null;
$path = null;
$file = trim($file);
$ext = pathinfo($file, PATHINFO_EXTENSION);
$accepted = array('jpg','gif','png','jpeg');
$tp = $this;
$ext = pathinfo($file, PATHINFO_EXTENSION); if(!in_array($ext,$accepted))
if($ext != 'jpg' && $ext !='gif' && $ext != 'png') // Bootstrap or Font-Awesome.
{ {
return ''; return null;
} }
$tp = e107::getParser();
if(!empty($parm['w'])) if(!empty($parm['w']))
{ {
$tp->setThumbSize($parm['w']); $tp->setThumbSize($parm['w']);
@@ -3439,25 +3442,32 @@ class e_parser
$tp->setThumbSize(null, $parm['h']); $tp->setThumbSize(null, $parm['h']);
} }
$dimensions = null; if(!empty($parm['crop']))
{
$tp->setThumbSize(null,null,true);
}
if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false) //v2.x path. if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false) //v2.x path.
{ {
$path = $tp->thumbUrl($file,null,null,true); $path = $tp->thumbUrl($file,null,null);
$dimensions = $this->thumbDimensions();
$width2x = ($parm['w']*2);
$height2x = ($parm['h']*2);
$path2x = $tp->thumbUrl($file,array('w'=> $width2x ,'h'=> $height2x )); $parm['srcset'] = $tp->thumbSrcSet($file, '2x');
print_a($path2x); if(empty($parm['w']))
{
$parm['w'] = $tp->thumbWidth();
}
if(empty($parm['h']))
{
$parm['h'] = $tp->thumbHeight();
}
} }
elseif($file[0] == '{') // Legacy v1.x path. Example: {e_WHEREEVER} elseif($file[0] == '{') // Legacy v1.x path. Example: {e_PLUGIN}myplugin/images/fixedimage.png
{ {
$path = $tp->replaceConstants($file,'full'); $path = $tp->replaceConstants($file,'abs');
} }
elseif(!empty($parm['legacy'])) // Search legacy path for image. elseif(!empty($parm['legacy'])) // Search legacy path for image in a specific folder. No path, only file name provided.
{ {
$legacyPath = $parm['legacy'].$file; $legacyPath = $parm['legacy'].$file;
@@ -3465,12 +3475,12 @@ class e_parser
if(is_readable($filePath)) if(is_readable($filePath))
{ {
$path = $tp->replaceConstants($legacyPath,'full'); $path = $tp->replaceConstants($legacyPath,'abs');
} }
else else
{ {
$log = e107::getAdminLog(); $log = e107::getAdminLog();
$log->addDebug('Broken Icon Path: '.$legacyPath."\n".print_r(debug_backtrace(null,2), true), false)->save('IMALAN_00'); $log->addDebug('Broken Image Path: '.$legacyPath."\n".print_r(debug_backtrace(null,2), true), false)->save('IMALAN_00');
} }
} }
@@ -3479,21 +3489,15 @@ class e_parser
$path = $file; $path = $file;
} }
$id = (!empty($parm['id'])) ? "id=\"".$parm['id']."\" " : "" ;
$class = (!empty($parm['class'])) ? " ".$parm['class'] : "";
$alt = (!empty($parm['alt'])) ? $tp->toAttribute($parm['alt']) : basename($path);
$style = (!empty($parm['style'])) ? "style=\"".$parm['style']."\" " : "" ;
$srcset = (!empty($parm['srcset'])) ? "srcset=\"".$parm['srcset']."\" " : "";
$width = (!empty($parm['w'])) ? "width=\"".intval($parm['w'])."\" " : "";
$height = (!empty($parm['h'])) ? "height=\"".intval($parm['h'])."\" " : "";
if(empty($style)) return "<img {$id}class='img-responsive{$class}' src='".$path."' alt=\"".$alt."\" ".$srcset.$width.$height.$style." />";
{
$insertStyle = '';
}
else
{
$insertStyle = "style='";
}
$alt = (!empty($parm['alt'])) ? $tp->toAttribute($parm['alt']) : basename($path);
return "<img class='img-responsive' src='".$path."' alt=\"".$alt."\" {$insertStyle} {$dimensions} />";
} }

2
e107_plugins/news/e_rss.php
View File

@@ -143,7 +143,7 @@ class news_rss // plugin-folder + '_rss'
{ {
$text .= "<br />\n"; $text .= "<br />\n";
$text .= $tp->toImage($img, array('alt'=>basename($img), 'w'=>800,'h'=>600, 'legacy'=> "{e_IMAGE}newspost_images/")); $text .= $tp->toImage($img, array('w'=>800,'h'=>600, 'legacy'=> "{e_IMAGE}newspost_images/"));
} }
} }