diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php deleted file mode 100644 index 655cd34b3..000000000 --- a/e107_admin/ad_links.php +++ /dev/null @@ -1,618 +0,0 @@ -"); -} -if (!defined('E_32_CAT_USER')) { - define('E_32_CAT_USER', ""); -} -if (!defined('E_32_CAT_CONT')) { - define('E_32_CAT_CONT', ""); -} -if (!defined('E_32_CAT_FILE')) { - define('E_32_CAT_FILE', ""); -} -if (!defined('E_32_CAT_TOOL')) { - define('E_32_CAT_TOOL', ""); -} -if (!defined('E_32_CAT_PLUG')) { - define('E_32_CAT_PLUG', ""); -} -if (!defined('E_32_CAT_MANAGE')) { - define('E_32_CAT_MANAGE', ""); -} -if (!defined('E_32_CAT_MISC')) { - define('E_32_CAT_MISC', ""); -} -if (!defined('E_32_CAT_ABOUT')) { - define('E_32_CAT_ABOUT', ""); -} - -// Small Nav Images -if (!defined('E_16_NAV_MAIN')) { - define('E_16_NAV_MAIN', e_IMAGE.'admin_images/main_16.png'); -} - * */ -/* -if (!defined('E_16_NAV_DOCS')) { - define('E_16_NAV_DOCS', e_IMAGE.'admin_images/docs_16.png'); -} -*/ - -/* -if (!defined('E_16_NAV_LEAV')) { - define('E_16_NAV_LEAV', e_IMAGE.'admin_images/leave_16.png'); -} -if (!defined('E_16_NAV_LGOT')) { - define('E_16_NAV_LGOT', e_IMAGE.'admin_images/logout_16.png'); -} -if (!defined('E_16_NAV_ARROW')) { - define('E_16_NAV_ARROW', e_IMAGE.'admin_images/arrow_16.png'); -} -if (!defined('E_16_NAV_ARROW_OVER')) { - define('E_16_NAV_ARROW_OVER', e_IMAGE.'admin_images/arrow_over_16.png'); -} - -// Large Nav Images -if (!defined('E_32_NAV_MAIN')) { - define('E_32_NAV_MAIN', ""); -} -if (!defined('E_32_NAV_DOCS')) { - define('E_32_NAV_DOCS', ""); -} -if (!defined('E_32_NAV_LEAV')) { - define('E_32_NAV_LEAV', ""); -} -if (!defined('E_32_NAV_LGOT')) { - define('E_32_NAV_LGOT', ""); -} -if (!defined('E_32_NAV_ARROW')) { - define('E_32_NAV_ARROW', ""); -} -if (!defined('E_32_NAV_ARROW_OVER')) { - define('E_32_NAV_ARROW_OVER', ""); -} - -// Small Admin Main Link Images -if (!defined('E_16_ADMIN')) { - define('E_16_ADMIN', ""); -} -if (!defined('E_16_ADPASS')) { - define('E_16_ADPASS', ""); -} -if (!defined('E_16_BANLIST')) { - define('E_16_BANLIST', ""); -} - -if (!defined('E_16_CACHE')) { - define('E_16_CACHE', ""); -} -if (!defined('E_16_COMMENT')) { - define('E_16_COMMENT', ""); -} -if (!defined('E_16_CREDITS')) { - define('E_16_CREDITS', ""); -} -if (!defined('E_16_CRON')) { - define('E_16_CRON', ""); -} -if (!defined('E_16_CUST')) { - define('E_16_CUST', ""); -} -if (!defined('E_16_CUSTOMFIELD')) { - define('E_16_CUSTOMFIELD', ""); -} -if (!defined('E_16_DATAB')) { - define('E_16_DATAB', ""); -} -if (!defined('E_16_DOCS')) { - define('E_16_DOCS', ""); -} - -if (!defined('E_16_EMOTE')) { - define('E_16_EMOTE', ""); -} -if (!defined('E_16_FILE')) { - define('E_16_FILE', ""); -} -if (!defined('E_16_FORUM')) { - define('E_16_FORUM', ""); -} -if (!defined('E_16_FRONT')) { - define('E_16_FRONT', ""); -} -if (!defined('E_16_IMAGES')) { - define('E_16_IMAGES', ""); -} -if (!defined('E_16_INSPECT')) { - define('E_16_INSPECT', ""); -} -if (!defined('E_16_LINKS')) { - define('E_16_LINKS', ""); -} -if (!defined('E_16_LINKSPAGE')) { - define('E_16_LINKSPAGE', ""); -} -if (!defined('E_16_WELCOME')) { - define('E_16_WELCOME', ""); -} -if (!defined('E_16_MAIL')) { - define('E_16_MAIL', ""); -} -if (!defined('E_16_MAINTAIN')) { - define('E_16_MAINTAIN', ""); -} -if (!defined('E_16_MENUS')) { - define('E_16_MENUS', ""); -} -if (!defined('E_16_META')) { - define('E_16_META', ""); -} -if (!defined('E_16_NEWS')) { - define('E_16_NEWS', ""); -} -if (!defined('E_16_NEWSFEED')) { - define('E_16_NEWSFEED', ""); -} -if (!defined('E_16_NOTIFY')) { - define('E_16_NOTIFY', ""); -} -if (!defined('E_16_PHP')) { - define('E_16_PHP', ""); -} -if (!defined('E_16_POLLS')) { - define('E_16_POLLS', ""); -} -if (!defined('E_16_PREFS')) { - define('E_16_PREFS', ""); -} -if (!defined('E_16_SEARCH')) { - define('E_16_SEARCH', ""); -} -if (!defined('E_16_UPLOADS')) { - define('E_16_UPLOADS', ""); -} -if (!defined('E_16_EURL')) { - define('E_16_EURL', ""); -} -if (!defined('E_16_USER')) { - define('E_16_USER', ""); -} -if (!defined('E_16_USER_EXTENDED')) { - define('E_16_USER_EXTENDED', ""); -} -if (!defined('E_16_USERCLASS')) { - define('E_16_USERCLASS', ""); -} -if (!defined('E_16_LANGUAGE')) { - define('E_16_LANGUAGE', ""); -} - -// Small Admin Other Link Images -if (!defined('E_16_PLUGIN')) { - define('E_16_PLUGIN', ""); -} -if (!defined('E_16_PLUGMANAGER')) { - define('E_16_PLUGMANAGER', ""); -} -if (!defined('E_16_DOCS')) { - define('E_16_DOCS', ""); -} -if (!defined('E_16_THEMEMANAGER')) { - define('E_16_THEMEMANAGER', ""); -} - -// Small Admin Other Images -if (!defined('E_16_COMMENT')) { - define('E_16_COMMENT', ""); -} -if (!defined('E_16_ADMINLOG')) { - define('E_16_ADMINLOG', ""); -} - -if (!defined('E_16_MANAGE')) { - define('E_16_MANAGE', ""); -} - -if (!defined('E_16_CREATE')) { - define('E_16_CREATE', ""); -} - -if (!defined('E_16_SETTINGS')) { - define('E_16_SETTINGS', ""); -} - -if (!defined('E_16_SYSINFO')) { - define('E_16_SYSINFO', ""); -} - - -if (!defined('E_16_FAILEDLOGIN')) { - define('E_16_FAILEDLOGIN', ""); -} - - -if (!defined('E_16_FACEBOOK')) { - define('E_16_FACEBOOK', ""); -} - -if (!defined('E_16_TWITTER')) { - define('E_16_TWITTER', ""); -} - -if (!defined('E_16_GITHUB')) { - define('E_16_GITHUB', ""); -} - - - -// Large Admin Main Link Images -if (!defined('E_32_ADMIN')) { - define('E_32_ADMIN', ""); -} -if (!defined('E_32_ADPASS')) { - define('E_32_ADPASS', ""); -} -if (!defined('E_32_BANLIST')) { - define('E_32_BANLIST', ""); -} - -if (!defined('E_32_CACHE')) { - define('E_32_CACHE', ""); -} -if (!defined('E_32_CREDITS')) { - define('E_32_CREDITS', ""); -} -if (!defined('E_32_CRON')) { - define('E_32_CRON', ""); -} -if (!defined('E_32_CUST')) { - define('E_32_CUST', ""); -} - * */ -/*if (!defined('E_32_CUSTOMFIELD')) { - define('E_32_CUSTOMFIELD', ""); -}*/ - -/* -if (!defined('E_32_DATAB')) { - define('E_32_DATAB', ""); -} -if (!defined('E_32_DOCS')) { - define('E_32_DOCS', ""); -} - -if (!defined('E_32_EMOTE')) { - define('E_32_EMOTE', ""); -} -if (!defined('E_32_FILE')) { - define('E_32_FILE', ""); -} -if (!defined('E_32_FORUM')) { - define('E_32_FORUM', ""); -} -if (!defined('E_32_FRONT')) { - define('E_32_FRONT', ""); -} -if (!defined('E_32_IMAGES')) { - define('E_32_IMAGES', ""); -} -if (!defined('E_32_INSPECT')) { - define('E_32_INSPECT', ""); -} -if (!defined('E_32_LINKS')) { - define('E_32_LINKS', ""); -} -if (!defined('E_32_LINKSPAGE')) { - define('E_32_LINKSPAGE', ""); -} -if (!defined('E_32_WELCOME')) { - define('E_32_WELCOME', ""); -} -if (!defined('E_32_MAIL')) { - define('E_32_MAIL', ""); -} -if (!defined('E_32_MAINTAIN')) { - define('E_32_MAINTAIN', ""); -} -if (!defined('E_32_MENUS')) { - define('E_32_MENUS', ""); -} -if (!defined('E_32_META')) { - define('E_32_META', ""); -} -if (!defined('E_32_NEWS')) { - define('E_32_NEWS', ""); -} -if (!defined('E_32_NEWSFEED')) { - define('E_32_NEWSFEED', ""); -} -if (!defined('E_32_NOTIFY')) { - define('E_32_NOTIFY', ""); -} -if (!defined('E_32_PHP')) { - define('E_32_PHP', ""); -} -if (!defined('E_32_POLLS')) { - define('E_32_POLLS', ""); -} -if (!defined('E_32_PREFS')) { - define('E_32_PREFS', ""); -} -if (!defined('E_32_SEARCH')) { - define('E_32_SEARCH', ""); -} -if (!defined('E_32_UPLOADS')) { - define('E_32_UPLOADS', ""); -} -if (!defined('E_32_EURL')) { - define('E_32_EURL', ""); -} -if (!defined('E_32_USER')) { - define('E_32_USER', ""); -} -if (!defined('E_32_USER_EXTENDED')) { - define('E_32_USER_EXTENDED', ""); -} -if (!defined('E_32_USERCLASS')) { - define('E_32_USERCLASS', ""); -} -if (!defined('E_32_LANGUAGE')) { - define('E_32_LANGUAGE', ""); -} - -// Large Admin Other Link Images -if (!defined('E_32_PLUGIN')) { - define('E_32_PLUGIN', ""); -} -if (!defined('E_32_PLUGMANAGER')) { - define('E_32_PLUGMANAGER', ""); -} -if (!defined('E_32_DOCS')) { - define('E_32_DOCS', ""); -} -if (!defined('E_32_MAIN')) { - define('E_32_MAIN', ""); -} - -if (!defined('E_32_THEMEMANAGER')) { - define('E_32_THEMEMANAGER', ""); -} - -// Large Admin Other Images -if (!defined('E_32_COMMENT')) { - define('E_32_COMMENT', ""); -} -if (!defined('E_32_ADMINLOG')) { - define('E_32_ADMINLOG', ""); -} -if (!defined('E_32_LOGOUT')) { - define('E_32_LOGOUT', ""); -} -if (!defined('E_32_MANAGE')) { - define('E_32_MANAGE', ""); -} -if (!defined('E_32_CREATE')) { - define('E_32_CREATE', ""); -} -if (!defined('E_32_SETTINGS')) { - define('E_32_SETTINGS', ""); -} -if (!defined('E_32_SYSINFO')) { - define('E_32_SYSINFO', ""); -} - -define("E_16_E107", ""); -define("E_32_E107", ""); -*/ -//XXX Move to e_navigation ? - - - -//FIXME array structure - see shortcodes/admin_navigation.php -// Moved to sitelinks_class.php - e_navigation; -/* -$admin_cat['title'][1] = ADLAN_CL_1; -$admin_cat['id'][1] = 'setMenu'; -$admin_cat['img'][1] = E_16_CAT_SETT; -$admin_cat['lrg_img'][1] = E_32_CAT_SETT; -$admin_cat['sort'][1] = true; - -$admin_cat['title'][2] = ADLAN_CL_2; -$admin_cat['id'][2] = 'userMenu'; -$admin_cat['img'][2] = E_16_CAT_USER; -$admin_cat['lrg_img'][2] = E_32_CAT_USER; -$admin_cat['sort'][2] = true; - -$admin_cat['title'][3] = ADLAN_CL_3; -$admin_cat['id'][3] = 'contMenu'; -$admin_cat['img'][3] = E_16_CAT_CONT; -$admin_cat['lrg_img'][3] = E_32_CAT_CONT; -$admin_cat['sort'][3] = true; - -$admin_cat['title'][4] = ADLAN_CL_6; -$admin_cat['id'][4] = 'toolMenu'; -$admin_cat['img'][4] = E_16_CAT_TOOL; -$admin_cat['lrg_img'][4] = E_32_CAT_TOOL; -$admin_cat['sort'][4] = true; - -// Manage -$admin_cat['title'][5] = LAN_MANAGE; -$admin_cat['id'][5] = 'managMenu'; -$admin_cat['img'][5] = E_16_CAT_MANAGE; -$admin_cat['lrg_img'][5] = E_32_CAT_MANAGE; -$admin_cat['sort'][5] = TRUE; - -if(varsettrue($pref['admin_separate_plugins'])) -{ - $admin_cat['title'][6] = ADLAN_CL_7; - $admin_cat['id'][6] = 'plugMenu'; - $admin_cat['img'][6] = E_16_CAT_PLUG; - $admin_cat['lrg_img'][6] = E_32_CAT_PLUG; - $admin_cat['sort'][6] = false; - - -} -else -{ - // Misc. - $admin_cat['title'][6] = ADLAN_CL_8; - $admin_cat['id'][6] = 'miscMenu'; - $admin_cat['img'][6] = E_16_CAT_MISC; - $admin_cat['lrg_img'][6] = E_32_CAT_MISC; - $admin_cat['sort'][6] = TRUE; -} - -//About menu - No 20 - leave space for user-categories. -$admin_cat['title'][20] = ADLAN_CL_20; -$admin_cat['id'][20] = 'aboutMenu'; -$admin_cat['img'][20] = E_16_CAT_ABOUT;//E_16_NAV_DOCS -$admin_cat['lrg_img'][20] = E_32_CAT_ABOUT; -$admin_cat['sort'][20] = false; -*/ - - -//XXX $admin_cat = e107::getNav()->adminCats(); // see e107_handlers/sitelinks.php - - - - -// Info about attributes -/* -attribute 1 = link -attribute 2 = title -attribute 3 = description -attribute 4 = perms -attribute 5 = category - 1 - settings - 2 - users - 3 - content - 4 - tools (maintenance) - 5 - manage - 6 - plugins/misc - - 7 - user-category ? - 8 - user-category etc. ? - - 20 - help - -attribute 6 = 16 x 16 image -attribute 7 = 32 x 32 image -*/ - -//FIXME array structure suitable for e107::getNav()->admin - see shortcodes/admin_navigation.php -//TODO find out where is used $array_functions elsewhere, refactor it - - -// DO NOT EDIT without first checking user_handler.php -/* -$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), -// 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), // replaced by media-manager - 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, LAN_MEDIAMANAGER, '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|U0|U1|U2|U3', 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), -// 37 => array(e_ADMIN.'custom_field.php', ADLAN_161, ADLAN_162, 'U', 4, E_16_CUSTOMFIELD, E_32_CUSTOMFIELD), - 38 => array(e_ADMIN.'comment.php', LAN_COMMENTMAN, LAN_COMMENTMAN, 'B', 5, E_16_COMMENT, E_32_COMMENT) -); -*/ - -/* -$array_functions = e107::getNav()->adminLinks('legacy'); // replacement see e107_handlers/sitelinks.php -// SecretR - BC only, obsolete meta title auto detection - //XXX Moved to boot.php -if(!defset('e_ADMIN_UI') && !defset('e_PAGETITLE')) -{ - foreach($array_functions as $val) - { - $link = str_replace("../","",$val[0]); - if(strpos(e_SELF,$link)!==FALSE) - { - define('e_PAGETITLE',$val[1]); - } - } -} -*/ \ No newline at end of file diff --git a/e107_admin/boot.php b/e107_admin/boot.php index 3021b7eae..e5a8d5657 100644 --- a/e107_admin/boot.php +++ b/e107_admin/boot.php @@ -62,7 +62,6 @@ if(!defset('e_ADMIN_UI') && !defset('e_PAGETITLE')) } } -require_once (e_ADMIN.'ad_links.php'); //FIXME - remove?? if (!defined('ADMIN_WIDTH')) //BC Only { diff --git a/e107_admin/header.php b/e107_admin/header.php index 095cd34ad..c21c3df00 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -190,7 +190,7 @@ meridiem: ["am", "pm"] // // A: Admin Defines and Links // -//require_once (e_ADMIN.'ad_links.php'); Moved to boot.php + // FIXME - remove ASAP if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2) { diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 6f438378f..81c0aa619 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -303,7 +303,7 @@ class admin_shortcodes $text .= "
-  "; + "; if(isset($aff)) { $text .= $sql->mySQLlanguage; @@ -1290,198 +1290,7 @@ Inverse 10 10 */ } - /** - * 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'); - - - function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE) - { - $cat_link = ($cat_link ? $cat_link : "javascript:void(0);"); - $text = ""; - return $text; - } - - - function adnav_main($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_highlight='') - { - - $exit = ""; - $text = "".$cat_title.""; - if ($cat_id) - { - $text .= "▶"; - } - $text .= ""; - return $text; - } - - - if (file_exists(THEME.'nav_menu.js')) - { - $text = ""; - } - else - { - $text = ""; - } - - $text .= "
- '; - - if (varset($exit) != 'off') - { - $text .= "'; - } - - $text .= ' -
-
"; - - $text .= adnav_cat(ADLAN_151, e_ADMIN.'admin.php', E_16_NAV_MAIN); // Main Link. - - // Render Settings, Users, Content, Tools, Manage. - for ($i = 1; $i < 7; $i++) - { - - $ad_tmpi = 0; - $ad_links_array = asortbyindex($array_functions, 1); - $nav_main = adnav_cat($admin_cat['title'][$i], '', $admin_cat['img'][$i], $admin_cat['id'][$i]); - $ad_texti = "'; - if ($ad_tmpi == 1) - { - $text .= $nav_main; - $text .= $ad_texti; - } - } - - $render_plugins = FALSE; - include_once(e_HANDLER.'plugin_class.php'); - $plug = new e107plugin; - $plugin_array = array(); // kill php notices - if($sql -> db_Select('plugin', '*', 'plugin_installflag=1 ORDER BY plugin_path')) - { - while($row = $sql -> db_Fetch()) - { - if(getperms('P'.$row['plugin_id'])) - { - if($plug->parse_plugin($row['plugin_path'])) - { - $plug_vars = $plug->plug_vars; - loadLanFiles($row['plugin_path'], 'admin'); - if($plug_vars['administration']['configFile']) - { - $plug_vars['@attributes']['name'] = $tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs"); - $icon_src = (isset($plug_vars['plugin_php']) ? e_PLUGIN_ABS : e_PLUGIN_ABS.$row['plugin_path'].'/') .$plug_vars['administration']['iconSmall']; - $plugin_icon = $plug_vars['administration']['iconSmall'] ? "".$plug_vars[" : E_16_PLUGIN; - $plugin_array[ucfirst($plug_vars['@attributes']['name'])] = adnav_main($plug_vars['@attributes']['name'], e_PLUGIN.$row['plugin_path']."/".$plug_vars['administration']['configFile'], $plugin_icon); - } - $render_plugins = TRUE; - $active_plugs = TRUE; - } - } - } - ksort($plugin_array, SORT_STRING); - $plugs_text = ''; - foreach ($plugin_array as $plugin_compile) - { - $plugs_text .= $plugin_compile; - } - } - - // if (getperms('Z')) - // { - // $pclass_extended = $active_plugs ? 'header' : ''; - // $plugin_text = adnav_main(ADLAN_98, e_ADMIN.'plugin.php', E_16_PLUGMANAGER, FALSE, $pclass_extended); - // $render_plugins = TRUE; - // } - - if ($render_plugins) - { - $text .= adnav_cat(ADLAN_CL_7, '', E_16_CAT_PLUG, 'plugMenu'); - $text .= ""; - } - - - // Render the "About" Menu - Phpinfo, Credits and Docs. - $text .= adnav_cat(ADLAN_CL_20, '', E_16_CAT_ABOUT, $admin_cat['id'][20]); //E_16_NAV_DOCS - $text .= "'; - - - $text .= '
- 		-
"; - - $text .= adnav_cat(ADLAN_53, e_HTTP.'index.php', E_16_NAV_LEAV); - $text .= adnav_cat(ADLAN_46, e_ADMIN_ABS.'admin.php?logout', E_16_NAV_LGOT); - - $text .= '
-
-
'; - - return $text; - } - } - */ /** * New Admin Navigation Routine. @@ -1506,8 +1315,6 @@ Inverse 10 10 parse_str($parm, $parms); $tmpl = strtoupper(varset($parms['tmpl'], 'E_ADMIN_NAVIGATION')); global $$tmpl; - - require_once(e_ADMIN.'ad_links.php'); //FIXME loaded in boot.php but $admin_cat is not available here. if($parm == 'home' || $parm == 'logout' || $parm == 'language' || $parm == 'pm') { diff --git a/e107_core/shortcodes/batch/comment_shortcodes.php b/e107_core/shortcodes/batch/comment_shortcodes.php index 9c8a9396a..12275411b 100644 --- a/e107_core/shortcodes/batch/comment_shortcodes.php +++ b/e107_core/shortcodes/batch/comment_shortcodes.php @@ -400,137 +400,5 @@ class comment_shortcodes extends e_shortcode } -/* -SC_BEGIN SUBJECT -global $SUBJECT, $comrow, $pref, $NEWIMAGE, $tp; -if (isset($pref['nested_comments']) && $pref['nested_comments']) { - $SUBJECT = $NEWIMAGE." ".(empty($comrow['comment_subject']) ? $subject : $tp->toHTML($comrow['comment_subject'], TRUE)); -} else { - $SUBJECT = ''; -} -return $SUBJECT; -SC_END - -SC_BEGIN USERNAME -global $USERNAME, $comrow; -if (isset($comrow['user_id']) && $comrow['user_id']) -{ - $USERNAME = $parm == 'raw' ? $comrow['user_name'] : " $comrow['user_id'], 'name' => $comrow['user_name']))."'>".$comrow['user_name']."\n"; -} -else -{ - $comrow['user_id'] = 0; - $USERNAME = preg_replace("/[0-9]+\./", '', $comrow['comment_author_name']); - $USERNAME = str_replace("Anonymous", LAN_ANONYMOUS, $USERNAME); -} -return $USERNAME; -SC_END - - -SC_BEGIN TIMEDATE -global $TIMEDATE, $comrow, $datestamp, $gen; -$datestamp = $gen->convert_date($comrow['comment_datestamp'], "short"); -return $datestamp; -SC_END - -SC_BEGIN REPLY -global $REPLY, $comrow, $action, $pref, $table, $id, $thisaction, $thistable, $thisid; -$REPLY = ''; -if($comrow['comment_lock'] != "1"){ - if ($thisaction == "comment" && $pref['nested_comments']) { - $REPLY = "".COMLAN_326.""; - } -} -return $REPLY; -SC_END - -SC_BEGIN AVATAR -global $AVATAR, $comrow; -if (isset($comrow['user_id']) && $comrow['user_id']) { - if (isset($comrow['user_image']) && $comrow['user_image']) { - require_once(e_HANDLER."avatar_handler.php"); - $comrow['user_image'] = avatar($comrow['user_image']); - $comrow['user_image'] = "
"; - }else{ - $comrow['user_image'] = ''; - } -}else{ - $comrow['user_image'] = ''; -} -return $comrow['user_image']; -SC_END - -SC_BEGIN COMMENTS -global $COMMENTS, $comrow; -return (isset($comrow['user_id']) && $comrow['user_id'] ? COMLAN_99.": ".$comrow['user_comments'] : COMLAN_194)."
"; -SC_END - -SC_BEGIN JOINED -global $JOINED, $comrow, $gen; -$JOINED = ''; -if ($comrow['user_id'] && !$comrow['user_admin']) { - $comrow['user_join'] = $gen->convert_date($comrow['user_join'], "short"); - $JOINED = ($comrow['user_join'] ? COMLAN_145." ".$comrow['user_join'] : ''); -} -return $JOINED; -SC_END - -SC_BEGIN COMMENT -global $COMMENT, $comrow, $tp, $pref; -return (isset($comrow['comment_blocked']) && $comrow['comment_blocked'] ? COMLAN_0 : $tp->toHTML($comrow['comment_comment'], TRUE, FALSE, $comrow['user_id'])); -SC_END - -SC_BEGIN COMMENTEDIT -global $COMMENTEDIT, $pref, $comrow, $comment_edit_query; -if ($pref['allowCommentEdit'] && USER && $comrow['user_id'] == USERID && $comrow['comment_lock'] != "1") -{ - $adop_icon = (file_exists(THEME."images/commentedit.png") ? THEME_ABS."images/commentedit.png" : e_IMAGE_ABS."admin_images/edit_16.png"); - //Searching for '.' is BAD!!! It breaks mod rewritten requests. Why is this needed at all? - if (strstr(e_QUERY, "&")) - { - return "".COMLAN_318.""; - } - else - { -// return "".COMLAN_318.""; - return "".COMLAN_318.""; - } -} -else -{ - return ""; -} -SC_END - -SC_BEGIN RATING -global $RATING; -return $RATING; -SC_END - -SC_BEGIN IPADDRESS -global $IPADDRESS, $comrow, $e107; -//require_once(e_HANDLER."encrypt_handler.php"); -return (ADMIN ? "".COMLAN_330." ".e107::getIPHandler()->ipDecode($comrow['comment_ip'])."" : ""); -SC_END - -SC_BEGIN LEVEL -global $LEVEL, $comrow, $pref; -//FIXME - new level handler, currently commented to avoid parse errors -//$ldata = get_level($comrow['user_id'], $comrow['user_forums'], $comrow['user_comments'], $comrow['user_chats'], $comrow['user_visits'], $comrow['user_join'], $comrow['user_admin'], $comrow['user_perms'], $pref); -return ($comrow['user_admin'] ? $ldata[0] : $ldata[1]); -SC_END - -SC_BEGIN LOCATION -global $LOCATION, $comrow, $tp; -return (isset($comrow['user_location']) && $comrow['user_location'] ? COMLAN_313.": ".$tp->toHTML($comrow['user_location'], TRUE) : ''); -SC_END - -SC_BEGIN SIGNATURE -global $SIGNATURE, $comrow, $tp; -$SIGNATURE = (isset($comrow['user_signature']) && $comrow['user_signature'] ? $tp->toHTML($comrow['user_signature'], true) : ''); -return $SIGNATURE; -SC_END - -*/ ?> \ No newline at end of file diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php index d18b1335b..c3cfcef02 100644 --- a/e107_core/templates/admin_icons_template.php +++ b/e107_core/templates/admin_icons_template.php @@ -9,68 +9,6 @@ * Administration Icons, should handle all icons in the future (somehow) * */ -/* - define("ADMIN_TRUE_ICON", ""); - define("ADMIN_TRUE_ICON_PATH", e_IMAGE_ABS."admin_images/true_16.png"); - - define("ADMIN_FALSE_ICON", ""); - define("ADMIN_FALSE_ICON_PATH", e_IMAGE_ABS."admin_images/false_16.png"); - - define("ADMIN_EDIT_ICON", ""); - define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_16.png"); - - define("ADMIN_DELETE_ICON", ""); - define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_16.png"); - - define("ADMIN_UP_ICON", ""); - define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); - - define("ADMIN_DOWN_ICON", ""); - define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png"); - - define("ADMIN_WARNING_ICON", ""); - define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_16.png"); - - define("ADMIN_INFO_ICON", ""); - define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png"); - - define("ADMIN_CONFIGURE_ICON", ""); - define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png"); - - define("ADMIN_ADD_ICON", ""); - define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png"); - - define("ADMIN_VIEW_ICON", ""); - define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png"); - - define("ADMIN_URL_ICON", ""); - define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png"); - - define("ADMIN_INSTALLPLUGIN_ICON", ""); - define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png"); - - define("ADMIN_UNINSTALLPLUGIN_ICON", ""); - define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png"); - - define("ADMIN_UPGRADEPLUGIN_ICON", ""); - define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); - - define("ADMIN_EXECUTE_ICON", "");//TODO LAN - define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png"); - - define("ADMIN_SORT_ICON", ""); //TODO LAN - define("ADMIN_SORT_ICON_PATH", e_IMAGE."admin_images/sort_16.png"); - - define("E_32_TRUE", ""); - - -*/ - - - - - - if (!defined('E_16_FACEBOOK')) { @@ -576,19 +514,6 @@ define("E_32_TRUE", ""); } -// define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED -// define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png"); //XXX DEPRECATED -// define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png"); //XXX DEPRECATED -// define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png"); //XXX DEPRECATED -// define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png"); //XXX DEPRECATED -// define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png"); //XXX DEPRECATED -// define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png"); //XXX DEPRECATED -// define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png"); //XXX DEPRECATED -// define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png"); //XXX DEPRECATED -// define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED -// define("ADMIN_EXECUTE_ICON", ""); -// define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png"); //XXX DEPRECATED -// define("ADMIN_SORT_ICON", ""); \ No newline at end of file diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index 0a9501df0..784a0846d 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -1150,7 +1150,7 @@ class e_userperms function __construct() { - // require_once(e_ADMIN."ad_links.php"); + $this->core_perms = array( // In the same order as admin navigation! diff --git a/e107_images/custom/index.html b/e107_images/custom/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/e107_images/newspost_images/index.html b/e107_images/newspost_images/index.html deleted file mode 100644 index e69de29bb..000000000 diff --git a/e107_images/newspost_images/welcome.png b/e107_images/newspost_images/welcome.png deleted file mode 100644 index f32c74e42..000000000 Binary files a/e107_images/newspost_images/welcome.png and /dev/null differ