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

Improved getThemeLayout() method.

Browse Source
This commit is contained in:
Cameron
2019-02-28 14:20:33 -08:00
parent 039247097c
commit a2d5b9c31e
2 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
class2.php
View File

@@ -1367,7 +1367,7 @@ if(!defined("THEME_LAYOUT"))
$pref = e107::getPref();
$cusPagePref = (!empty($user_pref['sitetheme_custompages'])) ? $user_pref['sitetheme_custompages'] : varset($pref['sitetheme_custompages'],array());
$cusPageDef = (empty($user_pref['sitetheme_deflayout'])) ? varset($pref['sitetheme_deflayout'],'') : $user_pref['sitetheme_deflayout'];
$deflayout = e107::getTheme()->getThemeLayout($cusPagePref, $cusPageDef);
$deflayout = e107::getTheme()->getThemeLayout($cusPagePref, $cusPageDef, e_REQUEST_URL, defset('e_PAGE',''));
define("THEME_LAYOUT",$deflayout);

49
e107_handlers/theme_handler.php
View File

@@ -118,6 +118,8 @@ class e_theme
{
$library['name'] .= (string) $library['version'];
e107::getParser()->setBootstrap($library['version']);
if(!defined('BOOTSTRAP'))
{
define('BOOTSTRAP', (int) $library['version']);
@@ -127,6 +129,8 @@ class e_theme
{
$library['name'] .= (string) $library['version'];
e107::getParser()->setFontAwesome($library['version']);
if(!defined('FONTAWESOME'))
{
define('FONTAWESOME', (int) $library['version']);
@@ -321,7 +325,7 @@ class e_theme
* @param string $request_url (optional) defaults to e_REQUEST_URL;
* @return int|string
*/
public function getThemeLayout($cusPagePref, $defaultLayout, $request_url = null)
public function getThemeLayout($cusPagePref, $defaultLayout, $request_url = null, $request_script = null)
{
if($request_url === null)
@@ -332,6 +336,7 @@ class e_theme
$def = ""; // no custom pages found yet.
if(is_array($cusPagePref) && count($cusPagePref)>0) // check if we match a page in layout custompages.
{
//e_SELF.(e_QUERY ? '?'.e_QUERY : '');
@@ -341,34 +346,58 @@ class e_theme
$c_url = $this->filterTrackers($c_url);
// First check all layouts for exact matches - possible fix for future issues?.
/*
foreach($cusPagePref as $lyout=>$cusPageArray)
{
if(!is_array($cusPageArray)) { continue; }
$base = basename($request_url);
if(in_array("/".$base, $cusPageArray) || in_array($base, $cusPageArray))
{
return $lyout;
}
}*/
foreach($cusPagePref as $lyout=>$cusPageArray)
{
if(!is_array($cusPageArray)) { continue; }
// NEW - Front page template check - early
if(in_array('FRONTPAGE', $cusPageArray) && ($c_url == SITEURL || rtrim($c_url, '/') == SITEURL.'index.php'))
{
$def = $lyout;
break;
return $lyout;
}
foreach($cusPageArray as $kpage)
{
if(substr($kpage, -1) === '!' )
{
$kpage = rtrim($kpage, '!');
if(substr($c_url, - strlen($kpage)) === $kpage)
if(basename($request_url) === $kpage) // exact match specified by '!'.
{
$def = $lyout;
break 2;
$def = $lyout;
}
elseif(substr($c_url, - strlen($kpage)) === $kpage)
{
$def = $lyout;
}
continue;
}
if ($kpage && ($kpage == defset('e_PAGE') || strpos($c_url, $kpage) !== false))
if (!empty($kpage) && (strpos($c_url, $kpage) !== false)) // partial URL match
{
// $def = ($lyout) ? $lyout : "legacyCustom";
$def = $lyout;
break 2;
$def = $lyout;
}
elseif(!empty($request_script) && $kpage === $request_script) // exact script match
{
$def = $lyout;
}
}
}