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

Fix remove match string from navigation URL

Browse Source 
Refined submenu match (full URL only)
This commit is contained in:
SecretR
2013-10-25 21:46:01 +03:00
parent c17a88e1a2
commit 337cb70816
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/sitelinks_class.php
View File

@@ -1402,6 +1402,7 @@ class e_navigation
foreach ($data as $_data) foreach ($data as $_data)
{ {
$active = ($this->isActive($_data, $this->activeMainFound)) ? "_active" : ""; $active = ($this->isActive($_data, $this->activeMainFound)) ? "_active" : "";
$sc->setVars($_data); // isActive is allowed to alter data $sc->setVars($_data); // isActive is allowed to alter data
$itemTmpl = count($_data['link_sub']) > 0 ? $template['item_submenu'.$active] : $template['item'.$active]; $itemTmpl = count($_data['link_sub']) > 0 ? $template['item_submenu'.$active] : $template['item'.$active];
$ret .= e107::getParser()->parseTemplate($itemTmpl, TRUE, $sc); $ret .= e107::getParser()->parseTemplate($itemTmpl, TRUE, $sc);
@@ -1485,7 +1486,7 @@ class e_navigation
* TODO Extensive Active Link Detection; * TODO Extensive Active Link Detection;
* *
*/ */
public function isActive(&$data='', $removeOnly = false) public function isActive(&$data='', $removeOnly = false, $exactMatch = false)
{ {
if(empty($data)) return; if(empty($data)) return;
@@ -1501,7 +1502,9 @@ class e_navigation
return; return;
} }
$matches = explode('^', array_pop(explode('#?', $data['link_url'], 2))); $_temp = explode('#?', $data['link_url'], 2);
$data['link_url'] = $_temp[0] ? $_temp[0] : '#';
$matches = explode('^', $_temp[1]);
foreach ($matches as $match) foreach ($matches as $match)
{ {
if(strpos(e_REQUEST_URL, $match) !== false) if(strpos(e_REQUEST_URL, $match) !== false)
@@ -1524,7 +1527,12 @@ class e_navigation
e107::getMessage()->addDebug("db=".$dbLink); e107::getMessage()->addDebug("db=".$dbLink);
} }
if(e_REQUEST_HTTP == $dbLink) if($exactMatch)
{
if(e_REQUEST_URI == $dbLink) return true;
}
// XXX this one should go soon - no cotroll at all
elseif(e_REQUEST_HTTP == $dbLink)
{ {
return true; return true;
} }
@@ -1732,7 +1740,7 @@ class navigation_shortcodes extends e_shortcode
foreach($this->var['link_sub'] as $val) foreach($this->var['link_sub'] as $val)
{ {
$active = (e107::getNav()->isActive($val, $this->activeSubFound)) ? "_active" : ""; $active = (e107::getNav()->isActive($val, $this->activeSubFound, true)) ? "_active" : "";
$this->setVars($val); // isActive is allowed to alter data $this->setVars($val); // isActive is allowed to alter data
$tmpl = vartrue($val['link_sub']) ? varset($this->template['submenu_loweritem'.$active]) : varset($this->template['submenu_item'.$active]); $tmpl = vartrue($val['link_sub']) ? varset($this->template['submenu_loweritem'.$active]) : varset($this->template['submenu_item'.$active]);
$text .= e107::getParser()->parseTemplate($tmpl, TRUE, $this); $text .= e107::getParser()->parseTemplate($tmpl, TRUE, $this);