mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 10:36:20 +02:00
Code Issues Releases Wiki Activity

Closes #4276 - auto-generate all popular favicon formats from site icon pref.

Browse Source
This commit is contained in:
Cameron
2022-06-29 11:55:51 -07:00
parent 89cf872bb5
commit 149a2686ad
3 changed files with 90 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/prefs.php
View File

@ -200,10 +200,15 @@ if(isset($_POST['updateprefs']))
$core_pref->update($key, $newValue); $core_pref->update($key, $newValue);
} }
if($core_pref->dataHasChanged())
$hasChanged = $core_pref->dataHasChanged();
if($hasChanged)
{ {
// Need to clear cache in order to refresh library information. // Need to clear cache in order to refresh library information.
e107::getCache()->clearAll('system'); e107::getCache()->clearAll('system');
} }
$core_pref->save(false); $core_pref->save(false);
@ -221,6 +226,22 @@ if(isset($_POST['updateprefs']))
$session = new e_core_session(array('name' => $core_pref->get('cookie_name'))); $session = new e_core_session(array('name' => $core_pref->get('cookie_name')));
$_SESSION = $s; $_SESSION = $s;
} }
// build favicon files.
if(!empty($pref['sitebutton']) && $hasChanged)
{
$iconSizes = [32,16,48,192,167,180];
$media = e107::getMedia();
foreach($iconSizes as $size)
{
if($result = $media->resizeImage($pref['sitebutton'],'{e_MEDIA_ICON}/favicon.png', ['w'=>$size, 'h'=>$size, 'crop'=>true, 'overwrite'=>true]))
{
e107::getMessage()->addDebug("Created ".$result); // NO LAN.
}
}
}
} }
if (e107::isInstalled('alt_auth')) if (e107::isInstalled('alt_auth'))

73
e107_core/templates/header_default.php
View File

@ -102,7 +102,7 @@ $js_body_onload = array(); // Legacy array of code to load with page.
//else //else
function render_title() function renderTitle()
{ {
if(!defined('e_PAGETITLE') && ($_PAGE_TITLE = e107::getSingleton('eResponse')->getMetaTitle())) // use e107::title() to set. if(!defined('e_PAGETITLE') && ($_PAGE_TITLE = e107::getSingleton('eResponse')->getMetaTitle())) // use e107::title() to set.
{ {
@ -155,7 +155,7 @@ echo "<!doctype html>\n";
$htmlTag = "<html".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " lang=\"".CORE_LC."\"" : "").">"; $htmlTag = "<html".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " lang=\"".CORE_LC."\"" : "").">";
echo (defined('HTMLTAG') ? str_replace('THEME_LAYOUT', THEME_LAYOUT, HTMLTAG) : $htmlTag)."\n"; echo (defined('HTMLTAG') ? str_replace('THEME_LAYOUT', THEME_LAYOUT, HTMLTAG) : $htmlTag)."\n";
echo "<head> echo "<head>
<title>".render_title()."</title> <title>".renderTitle()."</title>
<meta charset='utf-8' />\n"; <meta charset='utf-8' />\n";
if(!empty($pref['meta_copyright'][e_LANGUAGE])) e107::meta('dcterms.rights',$pref['meta_copyright'][e_LANGUAGE]); if(!empty($pref['meta_copyright'][e_LANGUAGE])) e107::meta('dcterms.rights',$pref['meta_copyright'][e_LANGUAGE]);
if(!empty($pref['meta_author'][e_LANGUAGE])) e107::meta('author',$pref['meta_author'][e_LANGUAGE]); if(!empty($pref['meta_author'][e_LANGUAGE])) e107::meta('author',$pref['meta_author'][e_LANGUAGE]);
@ -245,13 +245,7 @@ if (is_array($pref['e_meta_list']))
} }
// -------- Generate Apple Touch Icon --------- // -------- Generate Apple Touch Icon ---------
echo renderFavicon();
if(isset($pref['sitebutton']))
{
$appleIcon = e107::getParser()->thumbUrl($pref['sitebutton'],'w=144&h=144&crop=1',null, true);
echo "<link rel='apple-touch-icon' href='".$appleIcon."' />\n";
unset($appleIcon);
}
@ -403,12 +397,12 @@ if (isset($eplug_js) && $eplug_js)
$eplug_js_unique = array_unique($eplug_js); $eplug_js_unique = array_unique($eplug_js);
foreach($eplug_js_unique as $kjs) foreach($eplug_js_unique as $kjs)
{ {
echo ($kjs[0] == "<") ? $kjs : "<script type='text/javascript' src='{$kjs}'></script>\n"; // could be a .php file so leave the 'type'. echo ($kjs[0] == "<") ? $kjs : "<script type='text/javascript' src='$kjs'></script>\n"; // could be a .php file so leave the 'type'.
} }
} }
else else
{ {
echo "<script type='text/javascript' src='{$eplug_js}'></script>\n"; // could be a .php file so leave the 'type'. echo "<script type='text/javascript' src='$eplug_js'></script>\n"; // could be a .php file so leave the 'type'.
} }
} }
@ -458,11 +452,17 @@ if(function_exists('theme_head'))
$diz_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_description'][e_LANGUAGE]) ? $pref['meta_description'][e_LANGUAGE]." " : ""; $diz_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_description'][e_LANGUAGE]) ? $pref['meta_description'][e_LANGUAGE]." " : "";
$key_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_keywords'][e_LANGUAGE]) ? $pref['meta_keywords'][e_LANGUAGE]."," : ""; $key_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_keywords'][e_LANGUAGE]) ? $pref['meta_keywords'][e_LANGUAGE]."," : "";
/** /**
* @param $type * @param $type
* @return string * @return string
*/ */
function render_meta($type) function renderMeta($type)
{ {
$tp = e107::getParser(); $tp = e107::getParser();
$pref = e107::getPref(); $pref = e107::getPref();
@ -491,6 +491,30 @@ function render_meta($type)
return $ret; return $ret;
} }
function renderFavicon()
{
// ---------- Favicon ---------
if (file_exists(THEME."favicon.ico"))
{
return "<link rel='icon' href='".THEME_ABS."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='".THEME_ABS."favicon.ico' type='image/xicon' />\n";
}
elseif(file_exists(e_MEDIA_ICON.'16x16_favicon.png'))
{
$iconSizes = [16 => 'icon',32 => 'icon',48 => 'icon',192 => 'icon',167 => 'apple-touch-icon',180 => 'apple-touch-icon'];
$text = '';
foreach($iconSizes as $size => $rel)
{
$sizes = $size.'x'.$size;
$text .= "<link rel='$rel' type='image/png' sizes='$sizes' href='".e_MEDIA_ICON_ABS.$sizes."_favicon.png'>\n";
}
return $text;
}
elseif (file_exists(e_BASE."favicon.ico"))
{
return "<link rel='icon' href='".SITEURL."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='".SITEURL."favicon.ico' type='image/xicon' />\n";
}
}
// legay meta-tag checks. // legay meta-tag checks.
/* /*
$isKeywords = e107::getUrl()->response()->getMetaKeywords(); $isKeywords = e107::getUrl()->response()->getMetaKeywords();
@ -503,28 +527,22 @@ $isDescription = e107::getSingleton('eResponse')->getMetaDescription();
if(empty($isKeywords)) if(empty($isKeywords))
{ {
echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords'); echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : renderMeta('keywords');
} }
if(empty($isDescription)) if(empty($isDescription))
{ {
echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description'); echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : renderMeta('description');
} }
//echo render_meta('copyright'); //echo render_meta('copyright');
//echo render_meta('author'); //echo render_meta('author');
echo render_meta('tag'); echo renderMeta('tag');
unset($key_merge,$diz_merge,$isKeywords,$isDescription); unset($key_merge,$diz_merge,$isKeywords,$isDescription);
// ---------- Favicon ---------
if (file_exists(THEME."favicon.ico"))
{
echo "<link rel='icon' href='".THEME_ABS."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='".THEME_ABS."favicon.ico' type='image/xicon' />\n";
}
elseif (file_exists(e_BASE."favicon.ico"))
{
echo "<link rel='icon' href='".SITEURL."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='".SITEURL."favicon.ico' type='image/xicon' />\n";
}
// Theme JS // Theme JS
/** const THEME_ONLOAD @deprecated */ /** const THEME_ONLOAD @deprecated */
@ -645,8 +663,8 @@ echo "</head>\n";
elseif($def && $def != "legacyCustom" && (isset($CUSTOMHEADER[$def]) || isset($CUSTOMFOOTER[$def]))) // 0.7/1.x themes elseif($def && $def != "legacyCustom" && (isset($CUSTOMHEADER[$def]) || isset($CUSTOMFOOTER[$def]))) // 0.7/1.x themes
{ {
// echo " MODE 0.7"; // echo " MODE 0.7";
$HEADER = ($CUSTOMHEADER[$def]) ? $CUSTOMHEADER[$def] : $HEADER; $HEADER = isset($CUSTOMHEADER[$def]) ? $CUSTOMHEADER[$def] : $HEADER;
$FOOTER = ($CUSTOMFOOTER[$def]) ? $CUSTOMFOOTER[$def] : $FOOTER; $FOOTER = isset($CUSTOMFOOTER[$def]) ? $CUSTOMFOOTER[$def] : $FOOTER;
} }
elseif(!empty($def) && is_array($HEADER)) // 2.0 themes - we use only $HEADER and $FOOTER arrays. elseif(!empty($def) && is_array($HEADER)) // 2.0 themes - we use only $HEADER and $FOOTER arrays.
{ {
@ -669,7 +687,10 @@ echo "</head>\n";
$body_onload .= " class='e-iframe'"; $body_onload .= " class='e-iframe'";
} }
if(!empty($HEADER))
{
$HEADER = str_replace("{e_PAGETITLE}",deftrue('e_PAGETITLE'),$HEADER); $HEADER = str_replace("{e_PAGETITLE}",deftrue('e_PAGETITLE'),$HEADER);
}
//$body_onload .= " id='layout-".e107::getForm()->name2id(THEME_LAYOUT)."' "; //$body_onload .= " id='layout-".e107::getForm()->name2id(THEME_LAYOUT)."' ";

21
e107_handlers/media_class.php
View File

@ -1940,12 +1940,12 @@ class e_media
/** /**
* Resize an image. * Resize an image.
* @param $src * @param string $src
* @param $dest * @param string $dest
* @param string $opts * @param string|array $opts
* @return bool * @return bool
*/ */
function resizeImage($src='',$dest='',$opts=null) public function resizeImage($src='',$dest='',$opts=null)
{ {
$pref = e107::getPref(); $pref = e107::getPref();
$tp = e107::getParser(); $tp = e107::getParser();
@ -1978,7 +1978,7 @@ class e_media
$destFilePath = $destDir."/".varset($opts['prefix'],$maxWidth.'x'.$maxHeight).'_'.$destFile; $destFilePath = $destDir."/".varset($opts['prefix'],$maxWidth.'x'.$maxHeight).'_'.$destFile;
if(file_exists($destFilePath)) if(empty($opts['overwrite']) && file_exists($destFilePath))
{ {
return $destFilePath; return $destFilePath;
} }
@ -1986,11 +1986,21 @@ class e_media
try try
{ {
$thumb = Intervension::make($src); $thumb = Intervension::make($src);
if(!empty($opts['crop']))
{
$thumb->fit($maxWidth, $maxHeight, function ($constraint) {
$constraint->upsize();
});
}
else
{
$thumb->resize(vartrue($maxWidth, null), vartrue($maxHeight, null), function ($constraint) $thumb->resize(vartrue($maxWidth, null), vartrue($maxHeight, null), function ($constraint)
{ {
$constraint->aspectRatio(); $constraint->aspectRatio();
$constraint->upsize(); $constraint->upsize();
}); });
}
$thumb->save($destFilePath, $quality); $thumb->save($destFilePath, $quality);
return $destFilePath; return $destFilePath;
@ -2009,6 +2019,7 @@ class e_media
} }
/** /**
* Convert an image to jpeg format. * Convert an image to jpeg format.
* @param string $oldFile path to png or gif file. * @param string $oldFile path to png or gif file.