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

Introduction of e_navigation class to handle all links site-wide. Large-scale cleanup of global admin links, plugin links etc.

Browse Source
This commit is contained in:
Cameron
2012-12-03 01:40:47 -08:00
parent 872cd7901b
commit d20af73bc5
39 changed files with 623 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,7 +498,7 @@ class admin_shortcodes
if($tmp)
{
ob_start();
// FIXME - renderMenu(), respectively e_admin_menu() should return, not output content!
// FIXME - renderMenu(), respectively e_adm/in_menu() should return, not output content!
$tmp->renderMenu();
$ret = ob_get_contents();
ob_end_clean();
@@ -1248,7 +1248,13 @@ class admin_shortcodes
{
if (!ADMIN) return '';
global $admin_cat, $array_functions, $array_sub_functions, $pref;
// global $admin_cat, $array_functions, $array_sub_functions, $pref;
$pref = e107::getPref();
$admin_cat = e107::getNav()->adminCats();
$array_functions = e107::getNav()->adminLinks();
$array_sub_functions = e107::getNav()->adminLinks('sub');
$tp = e107::getParser();
$e107 = e107::getInstance();
@@ -1264,7 +1270,7 @@ class admin_shortcodes
if($parm == 'home' || $parm == 'logout' || $parm == 'language' || $parm == 'pm')
{
$menu_vars = $this->getOtherNav($parm);
return e_admin_menu('', '', $menu_vars, $$tmpl, FALSE, FALSE);
return e107::getNav()->admin('', '', $menu_vars, $$tmpl, FALSE, FALSE);
}
// MAIN LINK
@@ -1454,7 +1460,8 @@ class admin_shortcodes
}
// print_a($menu_vars);
return e_admin_menu('', e_PAGE, $menu_vars, $$tmpl, FALSE, FALSE);
return e107::getNav()->admin('', e_PAGE, $menu_vars, $$tmpl, FALSE, FALSE);
//return e_admin_men/u('', e_PAGE, $menu_vars, $$tmpl, FALSE, FALSE);
}
@@ -1614,7 +1621,8 @@ class admin_shortcodes
// $keys = array_keys($var);
// $action = (in_array($this->action,$keys)) ? $this->action : "installed";
e_admin_menu(ADLAN_6,$action, $var);
e107::getNav()->admin(ADLAN_6,$action, $var);
// e_admin/_menu(ADLAN_6,$action, $var);
}