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

Added HD logo. Fixed logo size on login page (when no logo selected in admin)

Browse Source
This commit is contained in:
Cameron 2016-12-22 13:53:47 -08:00
parent abe3b355d4
commit a4f3fc2886
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/admin.php
View File

@ -134,7 +134,8 @@ class admin_start
e_PLUGIN."online_extended_menu/online_extended_menu.php",
e_PLUGIN."online_extended_menu/images/user.png",
e_PLUGIN."online_extended_menu/languages/English.php",
e_PLUGIN."pm/sendpm.sc"
e_PLUGIN."pm/sendpm.sc",
e_PLUGIN."pm/shortcodes/"
);

6
e107_handlers/e_parse_class.php
View File

@ -3841,11 +3841,11 @@ class e_parser
return null;
}
e107::getDebug()->log($file);
e107::getDebug()->log($parm);
// e107::getDebug()->log($file);
// e107::getDebug()->log($parm);
if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false || strpos($file,'e_PLUGIN')!==false) //v2.x path.
if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false || strpos($file,'e_PLUGIN')!==false || strpos($file,'{e_IMAGE}')!==false) //v2.x path.
{
if(!isset($parm['w']) && !isset($parm['h']))

BIN
e107_images/logoHD.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 202 KiB

27
e107_plugins/siteinfo/e_shortcode.php
View File

@ -98,23 +98,31 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
$logopref = e107::getConfig('core')->get('sitelogo');
$logop = $tp->replaceConstants($logopref);
if($parm == 'login') // Login Page. BC fix.
if($parm == 'login' || isset($parm['login'])) // Login Page. BC fix.
{
if(vartrue($logopref) && is_readable($logop))
if(!empty($logopref) && is_readable($logop))
{
$logo = $tp->replaceConstants($logopref,'abs');
$path = $tp->replaceConstants($logopref);
}
elseif(is_readable(THEME."images/login_logo.png"))
{
$logo = THEME_ABS."images/login_logo.png";
$path = THEME."images/login_logo.png";
}
else
{
$logo = e_IMAGE_ABS."logo.png";
$path = e_IMAGE."logo.png";
$logo = "{e_IMAGE}logoHD.png";
$path = e_IMAGE."logoHD.png";
if(empty($parm['w']))
{
$parm['w'] = 330;
}
}
}
else
@ -141,13 +149,11 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
}
else
{
$logo = e_IMAGE_ABS.'logo.png'; // HTML path
$path = e_IMAGE.'logo.png'; // PHP path
$logo = '{e_IMAGE}logoHD.png'; // HTML path
$path = e_IMAGE.'logoHD.png'; // PHP path
}
}
//TODO Parm for resizing the logo image with thumb.php
$dimensions = array();
@ -183,10 +189,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
// $imageStyle = (empty($dimensions)) ? '' : " style='width: ".$dimensions[0]."px; height: ".$dimensions[1]."px' ";
// $image = "<img class='logo img-responsive' src='".$logo."' ".$imageStyle." alt='".SITENAME."' />\n";
$image = $tp->toImage($logo,$opts);
if (isset($link) && $link)
{