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

better THEME_LAYOUT auto-detection (supports '!' at the end of the rule - similar to menu visbility rules)

Browse Source
This commit is contained in:
secretr
2009-09-25 20:21:30 +00:00
parent c32d6cc02e
commit 5c34e89f0a
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
class2.php
View File

@@ -9,8 +9,8 @@
* General purpose file * General purpose file
* *
* $Source: /cvs_backup/e107_0.8/class2.php,v $ * $Source: /cvs_backup/e107_0.8/class2.php,v $
* $Revision: 1.145 $ * $Revision: 1.146 $
* $Date: 2009-09-19 15:27:26 $ * $Date: 2009-09-25 20:21:30 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -1105,13 +1105,25 @@ if(!defined("THEME_LAYOUT"))
if(is_array($cusPagePref) && count($cusPagePref)>0) // check if we match a page in layout custompages. if(is_array($cusPagePref) && count($cusPagePref)>0) // check if we match a page in layout custompages.
{ {
$c_url = e_SELF.(e_QUERY ? '?'.e_QUERY : ''); //TODO rewritten URLs?
foreach($cusPagePref as $lyout=>$cusPageArray) foreach($cusPagePref as $lyout=>$cusPageArray)
{ {
if(!is_array($cusPageArray)) { break; } if(!is_array($cusPageArray)) { continue; }
foreach($cusPageArray as $kpage) foreach($cusPageArray as $kpage)
{ {
if ($kpage && (strstr(e_SELF, $kpage) || strstr(e_SELF."?".e_QUERY,$kpage))) if(substr($kpage, -1) === '!' )
{
$kpage = rtrim($kpage, '!');
if(substr($c_url, - strlen($kpage)) === $kpage)
{
$def = $lyout;
break 2;
}
continue;
}
if ($kpage && ($kpage == e_PAGE || strpos($c_url, $kpage) !== false))
{ {
// $def = ($lyout) ? $lyout : "legacyCustom"; // $def = ($lyout) ? $lyout : "legacyCustom";
$def = $lyout; $def = $lyout;