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

Closes #5062 - common favicon method for frontend and backend.

Browse Source
This commit is contained in:
camer0n
2023-10-17 10:22:11 -07:00
parent 322eaa972f
commit 64cf23a06e
3 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_admin/header.php
View File

@@ -384,17 +384,8 @@ e107::getJs()->renderJs('header', 4);
e107::getJs()->renderJs('header_inline', 4); e107::getJs()->renderJs('header_inline', 4);
// ---------- Favicon --------- // ---------- Favicon ---------
echo e107::getJs()->renderFavicon();
$sitetheme = e107::getPref('sitetheme');
if(file_exists(e_THEME . $sitetheme . "/favicon.ico"))
{
echo "<link rel='icon' href='" . e_THEME_ABS . $sitetheme . "/favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='" . e_THEME_ABS . $sitetheme . "/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";
}
unset($sitetheme);
// //
// G: Send Theme Headers // G: Send Theme Headers
// //

26
e107_core/templates/header_default.php
View File

@@ -253,9 +253,8 @@ if (is_array($pref['e_meta_list']))
unset($ret); unset($ret);
} }
// -------- Generate Apple Touch Icon ---------
echo renderFavicon();
echo $e_js->renderFavicon();
// Register Plugin specific CSS // Register Plugin specific CSS
@@ -500,30 +499,7 @@ function renderMeta($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();

49
e107_handlers/js_manager.php
View File

@@ -1075,7 +1075,7 @@ class e_jsmanager
$plugfile_path = $runtime_location.$this->_sep.'{e_PLUGIN}'.$pfile_path[0].'/'.trim($pfile_path[1], '/').$this->_sep.$pre.$this->_sep.$post; $plugfile_path = $runtime_location.$this->_sep.'{e_PLUGIN}'.$pfile_path[0].'/'.trim($pfile_path[1], '/').$this->_sep.$pre.$this->_sep.$post;
// allow for URLs to be attributed to plugins. (loads after theme css in admin area header) // allow for URLs to be attributed to plugins. (loads after theme css in admin area header)
$file_path = ((strpos($pfile_path[1], 'http') !== 0 && strpos($pfile_path[1], '//') !== 0)) ? $plugfile_path : 'all'.$this->_sep.$pfile_path[1].$this->_sep.$pre.$this->_sep.$post;; $file_path = ((strpos($pfile_path[1], 'http') !== 0 && strpos($pfile_path[1], '//') !== 0)) ? $plugfile_path : 'all'.$this->_sep.$pfile_path[1].$this->_sep.$pre.$this->_sep.$post;
if(!isset($this->_e_css['plugin'])) $this->_e_css['plugin'] = array(); if(!isset($this->_e_css['plugin'])) $this->_e_css['plugin'] = array();
$registry = &$this->_e_css['plugin']; $registry = &$this->_e_css['plugin'];
$runtime = true; $runtime = true;
@@ -1383,9 +1383,7 @@ class e_jsmanager
if($return) if($return)
{ {
$ret = ob_get_clean(); return ob_get_clean();
return $ret;
} }
} }
@@ -1475,9 +1473,9 @@ class e_jsmanager
if(strpos($path, 'http') === 0 || strpos($path, '//') === 0) continue; // not allowed if(strpos($path, 'http') === 0 || strpos($path, '//') === 0) continue; // not allowed
$path = explode($this->_sep, $path, 3); $path = explode($this->_sep, $path, 3);
$pre = varset($path[1], ''); $pre = varset($path[1]);
if($pre) $pre .= "\n"; if($pre) $pre .= "\n";
$post = varset($path[2], ''); $post = varset($path[2]);
if($post) $post = "\n".$post; if($post) $post = "\n".$post;
$path = $path[0]; $path = $path[0];
@@ -2248,4 +2246,43 @@ class e_jsmanager
return $this; return $this;
} }
/**
* Render favicon HTML code - used in header.php and header_default.php
* @return string
*/
public function renderFavicon()
{
$sitetheme = $this->getCurrentTheme();
$ret = '';
if(file_exists(e_THEME . $sitetheme . "/favicon.ico"))
{
$ret = "<link rel='icon' href='" . e_THEME_ABS . $sitetheme . "/favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='" . e_THEME_ABS . $sitetheme . "/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'];
foreach($iconSizes as $size => $rel)
{
$sizes = $size.'x'.$size;
$ret .= "<link rel='$rel' type='image/png' sizes='$sizes' href='".e_MEDIA_ICON_ABS.$sizes."_favicon.png'>\n";
}
}
elseif (file_exists(e_BASE."favicon.ico"))
{
$ret = "<link rel='icon' href='".SITEURL."favicon.ico' type='image/x-icon' />\n<link rel='shortcut icon' href='".SITEURL."favicon.ico' type='image/xicon' />\n";
}
return $ret;
}
} }