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

Issue #4270 On-the-fly conversion to WebP format with fallback for older browsers when using toImage().

Browse Source
This commit is contained in:
Cameron
2020-12-09 10:54:15 -08:00
parent eb94769e1c
commit fb575c257c
5 changed files with 55 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
e107_handlers/e_parse_class.php
View File

@@ -3843,9 +3843,9 @@ class e_parser
public $isHtml = false;
protected $bootstrap = null;
protected $fontawesome = null;
protected $convertToWebp = false;
protected $bootstrap = null;
protected $fontawesome = null;
protected $convertToWebP = false;
protected $removedList = array();
protected $nodesToDelete = array();
@@ -3955,10 +3955,6 @@ class e_parser
$this->staticUrl = e_HTTP_STATIC;
}
// if(e107::pref('core', 'thumb_to_webp', false))
{
$this->convertToWebp = true;
}
}
@@ -4059,9 +4055,9 @@ class e_parser
/**
* @param bool $bool
*/
public function setConvertToWebp($bool)
public function setConvertToWebP($bool)
{
$this->convertToWebp = (bool) $bool;
$this->convertToWebP = (bool) $bool;
}
@@ -4772,7 +4768,31 @@ class e_parser
$height = "height=\"".$parm['height']."\" " ;
}
return "<img {$id}class='{$class}' src='".$path."' alt=\"".$alt."\" ".$srcset.$width.$height.$style.$loading.$title." />";
$html = '';
if($this->convertToWebP)
{
$parm['type'] = 'webp';
$source = $tp->thumbUrl($file,$parm);
$html = "<picture>\n";
$html .= '<source type="image/webp" srcset="'.$source.'">';
$html .= "\n";
if(!empty($parm['srcset']))
{
list($webPSourceSet,$webPSize) = explode(' ', $parm['srcset']);
$html .= '<source type="image/webp" srcset="'.$webPSourceSet.'&amp;type=webp '.$webPSize.'">';
$html .= "\n";
$html .= '<source type="image/'.str_replace('jpg', 'jpeg',$ext).'" srcset="'.$parm['srcset'].'">';
$html .= "\n";
$srcset = ''; // remove it from the img tag below.
}
}
$html .= "<img {$id}class=\"{$class}\" src=\"".$path."\" alt=\"".$alt."\" ".$srcset.$width.$height.$style.$loading.$title." />";
$html .= ($this->convertToWebP) ? "\n</picture>" : '';
return $html;
}