mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Fixes #4365 Navigation URLs to frontend now use the same shortcode.

Browse Source
This commit is contained in:
Cameron
2021-02-27 07:42:02 -08:00
parent 138b9568e6
commit 782f4903ac
1 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -2280,7 +2280,15 @@ Inverse 10 <span class="badge badge-inverse">10</span>
if($type === self::ADMIN_NAV_HOME) if($type === self::ADMIN_NAV_HOME)
{ {
$data = e107::getNav()->initData();
/** @var navigation_shortcodes $sc */
$sc = e107::getScBatch('navigation');
$tmp = array();
$c = 0;
$menu_vars = [];
$menu_vars[$type]['text'] = ''; // ADLAN_53; $menu_vars[$type]['text'] = ''; // ADLAN_53;
$menu_vars[$type]['link'] = e_HTTP.'index.php'; $menu_vars[$type]['link'] = e_HTTP.'index.php';
$menu_vars[$type]['image'] = $tp->toGlyph('fa-home'); // "<i class='fa fa-home'></i>" ; // "<img src='".E_16_NAV_LEAV."' alt='".ADLAN_151."' class='icon S16' />"; $menu_vars[$type]['image'] = $tp->toGlyph('fa-home'); // "<i class='fa fa-home'></i>" ; // "<img src='".E_16_NAV_LEAV."' alt='".ADLAN_151."' class='icon S16' />";
@@ -2289,22 +2297,14 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$menu_vars[$type]['sub_class'] = 'sub'; $menu_vars[$type]['sub_class'] = 'sub';
$menu_vars[$type]['template'] = $type; $menu_vars[$type]['template'] = $type;
// Sub Links for 'home'. foreach($data as $k=>$lk)
require_once(e_HANDLER. 'sitelinks_class.php');
$slinks = new sitelinks;
$slinks->getlinks(1);
$tmp = array();
$c= 0;
foreach($slinks->eLinkList['head_menu'] as $k=>$lk)
{ {
$subid = 'home_'.$k; $sc->setVars($lk);
$subid = $c;
$link = (strpos($lk['link_url'], "/") !== 0 && strpos($lk['link_url'], "{e_") !== 0 && strpos($lk['link_url'], 'http') !== 0) ? '{e_BASE}' .$lk['link_url'] : $lk['link_url'];
$tmp[$c]['text'] = $tp->toHTML($lk['link_name'],'','defs'); $tmp[$c]['text'] = $sc->sc_nav_link_name();;
$tmp[$c]['description'] = $tp->toHTML($lk['link_description'], '', 'defs'); $tmp[$c]['description'] = $tp->toHTML($lk['link_description'], '', 'defs');
$tmp[$c]['link'] = $tp->replaceConstants($link,'full'); $tmp[$c]['link'] = $sc->sc_nav_link_url(); // $tp->replaceConstants($link,'full');
$tmp[$c]['image'] = vartrue($lk['link_button']) ? "<img class='icon S16' src='".$tp->replaceConstants($lk['link_button'])."' alt='".$tp->toAttribute($lk['link_description'],'','defs')."' />": ''; $tmp[$c]['image'] = $sc->sc_nav_link_icon(); // vartrue($lk['link_button']) ? "<img class='icon S16' src='".$tp->replaceConstants($lk['link_button'])."' alt='".$tp->toAttribute($lk['link_description'],'','defs')."' />": '';
$tmp[$c]['image_large'] = ''; $tmp[$c]['image_large'] = '';
$tmp[$c]['image_src'] = vartrue($lk['link_button']); $tmp[$c]['image_src'] = vartrue($lk['link_button']);
$tmp[$c]['image_large_src'] = ''; $tmp[$c]['image_large_src'] = '';
@@ -2313,7 +2313,6 @@ Inverse 10 <span class="badge badge-inverse">10</span>
} }
$menu_vars[$type]['sub'] = $tmp; $menu_vars[$type]['sub'] = $tmp;
// --------------------
} }
elseif($type == self::ADMIN_NAV_LOGOUT) elseif($type == self::ADMIN_NAV_LOGOUT)
{ {
@@ -2353,8 +2352,6 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$tmp[3]['image_large_src'] = ''; $tmp[3]['image_large_src'] = '';
$tmp[4]['text'] = LAN_LOGOUT; $tmp[4]['text'] = LAN_LOGOUT;
$tmp[4]['description'] = ADLAN_151; $tmp[4]['description'] = ADLAN_151;
$tmp[4]['link'] = e_ADMIN_ABS.'admin.php?logout'; $tmp[4]['link'] = e_ADMIN_ABS.'admin.php?logout';
@@ -2365,6 +2362,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$tmp[4]['link_class'] = 'divider'; $tmp[4]['link_class'] = 'divider';
$tmp[5]['text'] = 'e107 Website'; $tmp[5]['text'] = 'e107 Website';
$tmp[5]['description'] = ''; $tmp[5]['description'] = '';
$tmp[5]['link'] = 'http://e107.org'; $tmp[5]['link'] = 'http://e107.org';