diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php index 1ebd56c2b..6f6c0f29d 100644 --- a/e107_admin/ad_links.php +++ b/e107_admin/ad_links.php @@ -503,6 +503,8 @@ if(varsettrue($pref['admin_separate_plugins'])) $admin_cat['img'][6] = E_16_CAT_PLUG; $admin_cat['lrg_img'][6] = E_32_CAT_PLUG; $admin_cat['sort'][6] = false; + + } else { @@ -532,11 +534,11 @@ attribute 5 = category 2 - users 3 - content 4 - tools (maintenance) - 5 - plugins/misc - 6 - manage + 5 - manage + 6 - plugins/misc - 7 - user-category - 8 - user-category etc. + 7 - user-category ? + 8 - user-category etc. ? 20 - help @@ -549,40 +551,40 @@ attribute 7 = 32 x 32 image $array_functions = array( - 0 => array(e_ADMIN.'administrator.php', ADLAN_8, ADLAN_9, '3', 2, E_16_ADMIN, E_32_ADMIN), - 1 => array(e_ADMIN.'updateadmin.php', ADLAN_10, ADLAN_11, '', 2, E_16_ADPASS, E_32_ADPASS), - 2 => array(e_ADMIN.'banlist.php', ADLAN_34, ADLAN_35, '4', 2, E_16_BANLIST, E_32_BANLIST), - 4 => array(e_ADMIN.'cache.php', ADLAN_74, ADLAN_75, 'C', 1, E_16_CACHE, E_32_CACHE), - 5 => array(e_ADMIN.'cpage.php', ADLAN_42, ADLAN_43, '5|J', 3, E_16_CUST, E_32_CUST), - 6 => array(e_ADMIN.'db.php', ADLAN_44, ADLAN_45, '0', 4, E_16_DATAB, E_32_DATAB), + 0 => array(e_ADMIN.'administrator.php', ADLAN_8, ADLAN_9, '3', 2, E_16_ADMIN, E_32_ADMIN), + 1 => array(e_ADMIN.'updateadmin.php', ADLAN_10, ADLAN_11, '', 2, E_16_ADPASS, E_32_ADPASS), + 2 => array(e_ADMIN.'banlist.php', ADLAN_34, ADLAN_35, '4', 2, E_16_BANLIST, E_32_BANLIST), + 4 => array(e_ADMIN.'cache.php', ADLAN_74, ADLAN_75, 'C', 1, E_16_CACHE, E_32_CACHE), + 5 => array(e_ADMIN.'cpage.php', ADLAN_42, ADLAN_43, '5|J', 3, E_16_CUST, E_32_CUST), + 6 => array(e_ADMIN.'db.php', ADLAN_44, ADLAN_45, '0', 4, E_16_DATAB, E_32_DATAB), // 7 => array(e_ADMIN.'download.php', ADLAN_24, ADLAN_25, 'R', 3, E_16_DOWNL, E_32_DOWNL), - 8 => array(e_ADMIN.'emoticon.php', ADLAN_58, ADLAN_59, 'F', 1, E_16_EMOTE, E_32_EMOTE), - 9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 5, E_16_FILE, E_32_FILE), - 10 => array(e_ADMIN.'frontpage.php', ADLAN_60, ADLAN_61, 'G', 1, E_16_FRONT, E_32_FRONT), - 11 => array(e_ADMIN.'image.php', LAN_MEDIAMANAGER, ADLAN_106, 'A', 5, E_16_IMAGES, E_32_IMAGES), - 12 => array(e_ADMIN.'links.php', ADLAN_138, ADLAN_139, 'I', 1, E_16_LINKS, E_32_LINKS), - 13 => array(e_ADMIN.'wmessage.php', ADLAN_28, ADLAN_29, 'M', 3, E_16_WELCOME, E_32_WELCOME), - 14 => array(e_ADMIN.'ugflag.php', ADLAN_40, ADLAN_41, '9', 4, E_16_MAINTAIN, E_32_MAINTAIN), - 15 => array(e_ADMIN.'menus.php', ADLAN_6, ADLAN_7, '2', 5, E_16_MENUS, E_32_MENUS), - 16 => array(e_ADMIN.'meta.php', ADLAN_66, ADLAN_67, 'T', 1, E_16_META, E_32_META), - 17 => array(e_ADMIN.'newspost.php', ADLAN_0, ADLAN_1, 'H|N|7', 3, E_16_NEWS, E_32_NEWS), - 18 => array(e_ADMIN.'phpinfo.php', ADLAN_68, ADLAN_69, '0', 20, E_16_PHP, E_32_PHP), - 19 => array(e_ADMIN.'prefs.php', ADLAN_4, ADLAN_5, '1', 1, E_16_PREFS, E_32_PREFS), - 20 => array(e_ADMIN.'search.php', ADLAN_142, ADLAN_143, 'X', 1, E_16_SEARCH, E_32_SEARCH), - 21 => array(e_ADMIN.'admin_log.php', ADLAN_155, ADLAN_156, 'S', 4, E_16_ADMINLOG, E_32_ADMINLOG), - 22 => array(e_ADMIN.'theme.php', ADLAN_140, ADLAN_141, '1', 5, E_16_THEMEMANAGER, E_32_THEMEMANAGER), - 23 => array(e_ADMIN.'upload.php', ADLAN_72, ADLAN_73, 'V', 3, E_16_UPLOADS, E_32_UPLOADS), - 24 => array(e_ADMIN.'users.php', ADLAN_36, ADLAN_37, '4', 2, E_16_USER, E_32_USER), - 25 => array(e_ADMIN.'userclass2.php', ADLAN_38, ADLAN_39, '4', 2, E_16_USERCLASS, E_32_USERCLASS), - 26 => array(e_ADMIN.'language.php', ADLAN_132, ADLAN_133, '0', 1, E_16_LANGUAGE, E_32_LANGUAGE), - 27 => array(e_ADMIN.'mailout.php', ADLAN_136, ADLAN_137, 'W', 2, E_16_MAIL, E_32_MAIL), - 28 => array(e_ADMIN.'users_extended.php', ADLAN_78, ADLAN_79, '4', 2, E_16_USER_EXTENDED, E_32_USER_EXTENDED), - 29 => array(e_ADMIN.'fileinspector.php', ADLAN_147, ADLAN_148, 'Y', 4, E_16_INSPECT, E_32_INSPECT), - 30 => array(e_ADMIN.'notify.php', ADLAN_149, ADLAN_150, 'O', 4, E_16_NOTIFY, E_32_NOTIFY), - 31 => array(e_ADMIN.'cron.php', ADLAN_157, ADLAN_158, 'U', 4, E_16_CRON, E_32_CRON), - 32 => array(e_ADMIN.'eurl.php', ADLAN_159, ADLAN_160, 'L', 1, E_16_EURL, E_32_EURL), - 33 => array(e_ADMIN.'plugin.php', ADLAN_98, ADLAN_99, 'Z', 5 , E_16_PLUGMANAGER, E_32_PLUGMANAGER), - 34 => array(e_ADMIN.'docs.php', ADLAN_12, ADLAN_13, '', 20, E_16_DOCS, E_32_DOCS), + 8 => array(e_ADMIN.'emoticon.php', ADLAN_58, ADLAN_59, 'F', 1, E_16_EMOTE, E_32_EMOTE), + 9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 5, E_16_FILE, E_32_FILE), + 10 => array(e_ADMIN.'frontpage.php', ADLAN_60, ADLAN_61, 'G', 1, E_16_FRONT, E_32_FRONT), + 11 => array(e_ADMIN.'image.php', LAN_MEDIAMANAGER, ADLAN_106, 'A', 5, E_16_IMAGES, E_32_IMAGES), + 12 => array(e_ADMIN.'links.php', ADLAN_138, ADLAN_139, 'I', 1, E_16_LINKS, E_32_LINKS), + 13 => array(e_ADMIN.'wmessage.php', ADLAN_28, ADLAN_29, 'M', 3, E_16_WELCOME, E_32_WELCOME), + 14 => array(e_ADMIN.'ugflag.php', ADLAN_40, ADLAN_41, '9', 4, E_16_MAINTAIN, E_32_MAINTAIN), + 15 => array(e_ADMIN.'menus.php', ADLAN_6, ADLAN_7, '2', 5, E_16_MENUS, E_32_MENUS), + 16 => array(e_ADMIN.'meta.php', ADLAN_66, ADLAN_67, 'T', 1, E_16_META, E_32_META), + 17 => array(e_ADMIN.'newspost.php', ADLAN_0, ADLAN_1, 'H|N|7', 3, E_16_NEWS, E_32_NEWS), + 18 => array(e_ADMIN.'phpinfo.php', ADLAN_68, ADLAN_69, '0', 20, E_16_PHP, E_32_PHP), + 19 => array(e_ADMIN.'prefs.php', ADLAN_4, ADLAN_5, '1', 1, E_16_PREFS, E_32_PREFS), + 20 => array(e_ADMIN.'search.php', ADLAN_142, ADLAN_143, 'X', 1, E_16_SEARCH, E_32_SEARCH), + 21 => array(e_ADMIN.'admin_log.php', ADLAN_155, ADLAN_156, 'S', 4, E_16_ADMINLOG, E_32_ADMINLOG), + 22 => array(e_ADMIN.'theme.php', ADLAN_140, ADLAN_141, '1', 5, E_16_THEMEMANAGER, E_32_THEMEMANAGER), + 23 => array(e_ADMIN.'upload.php', ADLAN_72, ADLAN_73, 'V', 3, E_16_UPLOADS, E_32_UPLOADS), + 24 => array(e_ADMIN.'users.php', ADLAN_36, ADLAN_37, '4', 2, E_16_USER, E_32_USER), + 25 => array(e_ADMIN.'userclass2.php', ADLAN_38, ADLAN_39, '4', 2, E_16_USERCLASS, E_32_USERCLASS), + 26 => array(e_ADMIN.'language.php', ADLAN_132, ADLAN_133, '0', 1, E_16_LANGUAGE, E_32_LANGUAGE), + 27 => array(e_ADMIN.'mailout.php', ADLAN_136, ADLAN_137, 'W', 2, E_16_MAIL, E_32_MAIL), + 28 => array(e_ADMIN.'users_extended.php', ADLAN_78, ADLAN_79, '4', 2, E_16_USER_EXTENDED, E_32_USER_EXTENDED), + 29 => array(e_ADMIN.'fileinspector.php', ADLAN_147, ADLAN_148, 'Y', 4, E_16_INSPECT, E_32_INSPECT), + 30 => array(e_ADMIN.'notify.php', ADLAN_149, ADLAN_150, 'O', 4, E_16_NOTIFY, E_32_NOTIFY), + 31 => array(e_ADMIN.'cron.php', ADLAN_157, ADLAN_158, 'U', 4, E_16_CRON, E_32_CRON), + 32 => array(e_ADMIN.'eurl.php', ADLAN_159, ADLAN_160, 'L', 1, E_16_EURL, E_32_EURL), + 33 => array(e_ADMIN.'plugin.php', ADLAN_98, ADLAN_99, 'Z', 5 , E_16_PLUGMANAGER, E_32_PLUGMANAGER), + 34 => array(e_ADMIN.'docs.php', ADLAN_12, ADLAN_13, '', 20, E_16_DOCS, E_32_DOCS), // TODO System Info. // 35 => array('#TODO', 'System Info', 'System Information', '', 20, '', ''), 36 => array(e_ADMIN.'credits.php', LAN_CREDITS, LAN_CREDITS, '', 20, E_16_CREDITS, E_32_CREDITS), diff --git a/e107_admin/header.php b/e107_admin/header.php index 24da581f2..8d64b6394 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -439,7 +439,7 @@ if ($e107_popup != 1) */ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_link = false, $sortlist = false) { - global $E_ADMIN_MENU,$e107; + global $E_ADMIN_MENU; if (!$tmpl) $tmpl = $E_ADMIN_MENU; @@ -555,7 +555,8 @@ if ($e107_popup != 1) if ($sub_link || empty($title)) return $text; - $e107->ns->tablerender($title, $text, array('id'=>$id, 'style'=>'button_menu')); + $ns = e107::getRender(); + $ns->tablerender($title, $text, array('id'=>$id, 'style'=>'button_menu')); return ''; } diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 9001b8678..6e858532a 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -982,14 +982,21 @@ class admin_shortcodes */ } + /** + * Legacy Admin Menu Routine. + * Currently Used by Jayya admin. + */ function sc_admin_alt_nav($parm) { + if (ADMIN) { global $sql, $pref, $tp; parse_str($parm); require(e_ADMIN.'ad_links.php'); require_once(e_HANDLER.'admin_handler.php'); + + function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE) { $cat_link = ($cat_link ? $cat_link : "javascript:void(0);"); @@ -1001,6 +1008,8 @@ class admin_shortcodes $text .= ">".$cat_title.""; return $text; } + + function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') { @@ -1019,6 +1028,8 @@ class admin_shortcodes $text .= ""; return $text; } + + if (file_exists(THEME.'nav_menu.js')) { $text = ""; @@ -1032,9 +1043,10 @@ class admin_shortcodes
"; - $text .= adnav_cat(ADLAN_151, e_ADMIN.'admin.php', E_16_NAV_MAIN); + $text .= adnav_cat(ADLAN_151, e_ADMIN.'admin.php', E_16_NAV_MAIN); // Main Link. - for ($i = 1; $i < 6; $i++) + // Render Settings, Users, Content, Tools, Manage. + for ($i = 1; $i < 7; $i++) { $ad_tmpi = 0; @@ -1108,27 +1120,35 @@ class admin_shortcodes $text .= varset($plugin_text).varset($plugs_text); $text .= "
"; } + - $text .= adnav_cat(ADLAN_CL_8, '', E_16_CAT_ABOUT, 'docsMenu'); //E_16_NAV_DOCS - $text .= "'; $text .= ' @@ -1154,14 +1174,18 @@ class admin_shortcodes } } + /** + * New Admin Navigation Routine. + */ function sc_admin_navigation($parm) { - + if (!ADMIN) return ''; global $admin_cat, $array_functions, $array_sub_functions, $pref; - $e107 = &e107::getInstance(); - $sql = &$e107->sql; + $tp = e107::getParser(); + $e107 = e107::getInstance(); + $sql = e107::getDb(); parse_str($parm, $parms); $tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION')); @@ -1233,6 +1257,7 @@ class admin_shortcodes if($tmp) $menu_vars[$catid]['sub'][$key] = $tmp; } + //PLUGINS require_once(e_HANDLER.'plugin_class.php'); $plug = new e107plugin; @@ -1340,7 +1365,35 @@ class admin_shortcodes $menu_vars['home']['image'] = "".ADLAN_151.""; $menu_vars['home']['image_src'] = ADLAN_151; $menu_vars['home']['perm'] = ''; + $menu_vars['home']['sort'] = 1; + $menu_vars['home']['sub_class'] = 'sub'; + + // Sub Links for 'home'. + 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; + $subid = $c; + $link = (substr($lk['link_url'],0,1)!="/" && substr($lk['link_url'],0,3)!="{e_" && substr($lk['link_url'],0,4)!='http') ? "{e_BASE}".$lk['link_url'] : $lk['link_url']; + + $tmp[$c]['text'] = $tp->toHtml($lk['link_name'],'','defs'); + $tmp[$c]['description'] = $tp->toHtml($lk['link_description'],'','defs'); + $tmp[$c]['link'] = $tp->replaceConstants($link,'full'); + $tmp[$c]['image'] = ""; ; + $tmp[$c]['image_large'] = ''; + $tmp[$c]['image_src'] = ''; + $tmp[$c]['image_large_src'] = ''; + $tmp[$c]['perm'] = ''; + $c++; + } + $menu_vars['home']['sub'] = $tmp; + // -------------------- + $menu_vars['logout']['text'] = ADLAN_46; $menu_vars['logout']['link'] = e_ADMIN_ABS.'admin.php?logout'; $menu_vars['logout']['image'] = "".ADLAN_151.""; @@ -1348,9 +1401,12 @@ class admin_shortcodes $menu_vars['logout']['perm'] = ''; } - return e_admin_menu('', '', $menu_vars, $$tmpl, false, false); + // print_a($menu_vars); + return e_admin_menu('', '', $menu_vars, $$tmpl, FALSE, FALSE); } + + function sc_admin_menumanager() // List all menu-configs for easy-navigation { global $pref;