From a99300aed548ad43909d053fdcde09ac5fb956e3 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 24 Jan 2021 10:44:30 -0800 Subject: [PATCH] admin_icons_template.php reformatted to v2 standards. --- e107_admin/admin.php | 4 +- e107_admin/boot.php | 5 +- e107_admin/menus.php | 5 +- e107_core/templates/admin_icons_template.php | 744 ++++++------------ e107_handlers/admin_ui.php | 6 +- e107_handlers/e107_class.php | 33 + e107_handlers/sitelinks_class.php | 3 +- e107_tests/tests/unit/e107Test.php | 17 +- e107_tests/tests/unit/e_formTest.php | 3 +- .../tests/unit/e_parse_shortcodeTest.php | 4 +- e107_tests/tests/unit/pluginsTest.php | 4 - 11 files changed, 288 insertions(+), 540 deletions(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index fd0f8d0b1..7dd3f7b30 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -35,7 +35,9 @@ if($info = e107::getLibrary()->load('bootstrap')) } } -include_once(e107::coreTemplatePath('admin_icons')); // Needs to be loaded before infopanel AND in boot.php +e107::getDebug()->logTime('[admin.php: Loading admin_icons]'); +//include_once(e107::coreTemplatePath('admin_icons')); +e107::loadAdminIcons(); // Needs to be loaded before infopanel AND in boot.php /*if(vartrue($_GET['iframe']) == 1) { diff --git a/e107_admin/boot.php b/e107_admin/boot.php index 023286ea8..ec17078df 100644 --- a/e107_admin/boot.php +++ b/e107_admin/boot.php @@ -235,11 +235,14 @@ e107::coreLan('footer', true); // Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed e107::getDebug()->logTime('[boot.php: Loading admin_icons]'); -include_once(e107::coreTemplatePath('admin_icons')); +e107::loadAdminIcons(); +e107::getDebug()->logTime('[boot.php: After Loading admin_icons]'); +//include_once(e107::coreTemplatePath('admin_icons')); if(!defset('e_ADMIN_UI') && !defset('e_PAGETITLE')) { + e107::getDebug()->logTime('[boot.php: Loading adminLinks(\'legacy\')]'); $array_functions = e107::getNav()->adminLinks('legacy'); // replacement see e107_handlers/sitelinks.php foreach($array_functions as $val) { diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 3f72e0667..f3f6043e4 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -737,8 +737,9 @@ class e_layout unset($HEADER,$FOOTER,$CUSTOMHEADER,$CUSTOMFOOTER,$style); - - require_once(e_CORE."templates/admin_icons_template.php"); + + e107::loadAdminIcons(); + // require_once(e_CORE."templates/admin_icons_template.php"); diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php index 8db2d3927..86d2a4f3b 100644 --- a/e107_core/templates/admin_icons_template.php +++ b/e107_core/templates/admin_icons_template.php @@ -10,545 +10,249 @@ * */ - -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', ""); -} -define("E_16_E107", ""); -define("E_32_E107", ""); - +$ADMIN_ICONS_TEMPLATE['E_16_FACEBOOK'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_FACEBOOK'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_TWITTER'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_GITHUB'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_E107'] = ""; +$ADMIN_ICONS_TEMPLATE['E_32_E107'] = ""; -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_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', " "); -} +$ADMIN_ICONS_TEMPLATE['E_32_ADMIN'] = ""; +$ADMIN_ICONS_TEMPLATE['E_32_ADPASS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_32_BANLIST'] = ""; +$ADMIN_ICONS_TEMPLATE['E_32_CACHE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CREDITS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_32_CRON'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CUST'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_DATAB'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_DOCS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_EMOTE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_FILE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_FORUM'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_FRONT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_IMAGES'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_INSPECT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_LINKS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_WELCOME'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_MAIL'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_MAINTAIN'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_MENUS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_META'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NEWS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NEWSFEED'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NOTIFY'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_PHP'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_POLLS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_PREFS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_SEARCH'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_UPLOADS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_EURL'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_USER'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_USER_EXTENDED'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_USERCLASS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_LANGUAGE'] = " "; // Large Admin Other Link Images -// Large Admin Other Link Images -if (!defined('E_24_PLUGIN')) { - define('E_24_PLUGIN', " "); -} -if (!defined('E_32_PLUGIN')) { - define('E_32_PLUGIN', " "); -} -if (!defined('E_32_PLUGMANAGER')) { - define('E_32_PLUGMANAGER', " "); -} -if (!defined('E_32_MAIN')) { - define('E_32_MAIN', " "); -} - -if (!defined('E_32_THEMEMANAGER')) { - define('E_32_THEMEMANAGER', " "); -} +$ADMIN_ICONS_TEMPLATE['E_24_PLUGIN'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_PLUGIN'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_PLUGMANAGER'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_MAIN'] = " "; +$ADMIN_ICONS_TEMPLATE['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', " "); -} +$ADMIN_ICONS_TEMPLATE['E_32_COMMENT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_ADMINLOG'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_LOGOUT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_MANAGE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CREATE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_SETTINGS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_SYSINFO'] = " "; - -// Small Category Images -/** - * -// @DEPRECATED -if (!defined('E_16_CAT_SETT')) { - define('E_16_CAT_SETT', e_IMAGE.'admin_images/cat_settings_16.png'); -} -if (!defined('E_16_CAT_USER')) { - define('E_16_CAT_USER', e_IMAGE.'admin_images/cat_users_16.png'); -} -if (!defined('E_16_CAT_CONT')) { - define('E_16_CAT_CONT', e_IMAGE.'admin_images/cat_content_16.png'); -} -if (!defined('E_16_CAT_FILE')) { - define('E_16_CAT_FILE', e_IMAGE.'admin_images/cat_files_16.png'); -} -if (!defined('E_16_CAT_TOOL')) { - define('E_16_CAT_TOOL', e_IMAGE.'admin_images/cat_tools_16.png'); -} -if (!defined('E_16_CAT_PLUG')) { - define('E_16_CAT_PLUG', e_IMAGE.'admin_images/cat_plugins_16.png'); -} -if (!defined('E_16_CAT_MANAGE')) { - define('E_16_CAT_MANAGE', e_IMAGE.'admin_images/manage_16.png'); -} -if (!defined('E_16_CAT_MISC')) { - define('E_16_CAT_MISC', e_IMAGE.'admin_images/settings_16.png'); -} -if (!defined('E_16_CAT_ABOUT')) { - define('E_16_CAT_ABOUT', e_IMAGE.'admin_images/info_16.png'); -} -*/ // Large Category Images -if (!defined('E_32_CAT_SETT')) { - define('E_32_CAT_SETT', " "); -} -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', " "); -} + +$ADMIN_ICONS_TEMPLATE['E_32_CAT_SETT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_USER'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_CONT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_FILE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_TOOL'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_PLUG'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_MANAGE'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_MISC'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_CAT_ABOUT'] = " "; + +$ADMIN_ICONS_TEMPLATE['E_16_ADMIN'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_ADPASS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_BANLIST'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CACHE'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_COMMENT'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CREDITS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CRON'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CUST'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CUSTOMFIELD'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_DATAB'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_DOCS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_EMOTE'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_FILE'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_FORUM'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_FRONT'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_IMAGES'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_INSPECT'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_LINKS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_WELCOME'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_MAIL'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_MAINTAIN'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_MENUS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_META'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_NEWS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_NEWSFEED'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_NOTIFY'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_PHP'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_POLLS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_PREFS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_SEARCH'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_UPLOADS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_EURL'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_USER'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_USER_EXTENDED'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_USERCLASS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_LANGUAGE'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_ADMINLOG'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_MANAGE'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CREATE'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_SETTINGS'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_SYSINFO'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_FAILEDLOGIN'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_PLUGIN'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_PLUGMANAGER'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_THEMEMANAGER'] = ""; + + + +$ADMIN_ICONS_TEMPLATE['ADMIN_FALSE_ICON'] = "⨯"; /*""*/ +$ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_GRID_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_LIST_ICON'] = ""; + +$ADMIN_ICONS_TEMPLATE['ADMIN_ADD_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_INFO_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_CONFIGURE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_VIEW_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_URL_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_INSTALLPLUGIN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_UNINSTALLPLUGIN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_UPGRADEPLUGIN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_REPAIRPLUGIN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_UP_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_DOWN_ICON'] = ""; + +// FOR BC + +$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON_PATH'] = e_IMAGE_ABS . "admin_images/edit_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON_PATH'] = e_IMAGE_ABS . "admin_images/delete_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON_PATH'] = e_IMAGE_ABS . "admin_images/warning_32.png"; + +$ADMIN_ICONS_TEMPLATE['ADMIN_TRUE_ICON_PATH'] = e_IMAGE_ABS . "admin_images/true_16.png"; //XXX DEPRECATED but used in v1.x +$ADMIN_ICONS_TEMPLATE['ADMIN_FALSE_ICON_PATH'] = e_IMAGE_ABS . "admin_images/false_16.png"; //XXX DEPRECATED but used in v1.x + +$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_PAGES_ICON'] = ""; + +$ADMIN_ICONS_TEMPLATE['E_32_TRUE'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_CHILD_ICON'] = ''; // must use single quotes. +$ADMIN_ICONS_TEMPLATE['ADMIN_FILTER_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_TRUE_ICON'] = "✔"; /*"" */ +$ADMIN_ICONS_TEMPLATE['ADMIN_TRUE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_FALSE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_ADD_ICON_PATH'] = e_IMAGE_ABS."admin_images/add_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_INFO_ICON_PATH'] = e_IMAGE_ABS."admin_images/info_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_CONFIGURE_ICON_PATH'] = e_IMAGE_ABS."admin_images/configure_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_VIEW_ICON_PATH'] = e_IMAGE_ABS."admin_images/admin_images/search_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_URL_ICON_PATH'] = e_IMAGE_ABS."admin_images/forums_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_INSTALLPLUGIN_ICON_PATH'] = e_IMAGE_ABS."admin_images/plugin_install_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_UNINSTALLPLUGIN_ICON_PATH'] = e_IMAGE_ABS."admin_images/plugin_unstall_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_UPGRADEPLUGIN_ICON_PATH'] = e_IMAGE_ABS."admin_images/up_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_UP_ICON_PATH'] = e_IMAGE_ABS."admin_images/up_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_DOWN_ICON_PATH'] = e_IMAGE_ABS."admin_images/down_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON_PATH'] = e_IMAGE_ABS."admin_images/execute_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON_PATH'] = e_IMAGE_ABS."admin_images/sort_32.png"; +$ADMIN_ICONS_TEMPLATE['ADMIN_TRUE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_FALSE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_UP_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_DOWN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_INFO_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_CONFIGURE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_ADD_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_VIEW_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_URL_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_INSTALLPLUGIN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_UNINSTALLPLUGIN_ICON'] =""; +$ADMIN_ICONS_TEMPLATE['ADMIN_UPGRADEPLUGIN_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON'] = ""; +$ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON'] = ""; + +/** + * @deprecated + +$ADMIN_ICONS_TEMPLATE['E_32_CUSTOMFIELD'] = ""; +$ADMIN_ICONS_TEMPLATE['E_16_CAT_SETT'] = e_IMAGE.'admin_images/cat_settings_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_USER'] = e_IMAGE.'admin_images/cat_users_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_CONT'] = e_IMAGE.'admin_images/cat_content_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_FILE'] = e_IMAGE.'admin_images/cat_files_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_TOOL'] = e_IMAGE.'admin_images/cat_tools_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_PLUG'] = e_IMAGE.'admin_images/cat_plugins_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_MANAGE'] = e_IMAGE.'admin_images/manage_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_MISC'] = e_IMAGE.'admin_images/settings_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_CAT_ABOUT'] = e_IMAGE.'admin_images/info_16.png'); // Small Nav Images -/** - * @DEPRECATED -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'); -// } +$ADMIN_ICONS_TEMPLATE['E_16_NAV_MAIN'] = e_IMAGE.'admin_images/main_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_NAV_DOCS'] = e_IMAGE.'admin_images/docs_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_NAV_LEAV'] = e_IMAGE.'admin_images/leave_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_NAV_LGOT'] = e_IMAGE.'admin_images/logout_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_NAV_ARROW'] = e_IMAGE.'admin_images/arrow_16.png'); +$ADMIN_ICONS_TEMPLATE['E_16_NAV_ARROW_OVER'] = e_IMAGE.'admin_images/arrow_over_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 + +$ADMIN_ICONS_TEMPLATE['E_32_NAV_MAIN'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NAV_DOCS'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NAV_LEAV'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NAV_LGOT'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NAV_ARROW'] = " "; +$ADMIN_ICONS_TEMPLATE['E_32_NAV_ARROW_OVER'] = " "; + +// Small Admin Main Link Images + + + + +// Small Admin Other Link Images + + + * +// Small Admin Other Images + + + +$ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON_PATH'] = e_IMAGE_ABS."admin_images/edit_16.png"; //XXX DEPRECATED but used in v1.x +$ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON_PATH'] = e_IMAGE_ABS."admin_images/delete_16.png"; //XXX DEPRECATED but used in v1.x +$ADMIN_ICONS_TEMPLATE['ADMIN_WARNING_ICON_PATH'] = e_IMAGE_ABS."admin_images/warning_16.png"; //XXX DEPRECATED but used in v1.x */ -// 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_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_THEMEMANAGER')) { - define('E_16_THEMEMANAGER', ""); -} - -// Small Admin Other Images -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', ""); -} - - -define("E_32_TRUE", ""); - - - define("ADMIN_CHILD_ICON", ''); // must use single quotes. - define("ADMIN_FILTER_ICON", ""); - define("ADMIN_TRUE_ICON", "✔"/*""*/); - define("ADMIN_FALSE_ICON", "⨯" /*""*/); - define("ADMIN_WARNING_ICON", ""); - define("ADMIN_GRID_ICON", ""); - define("ADMIN_LIST_ICON", ""); - -if(defset('THEME_STYLE') === 'css/kadmin.css') -{ - - define("ADMIN_EDIT_ICON", ""); - define("ADMIN_DELETE_ICON", ""); - define("ADMIN_EXECUTE_ICON", ""); - define("ADMIN_SORT_ICON", ""); - define("ADMIN_PAGES_ICON", ""); -} -else -{ - define("ADMIN_EDIT_ICON", ""); - define("ADMIN_DELETE_ICON", ""); - define("ADMIN_SORT_ICON", ""); - define("ADMIN_EXECUTE_ICON", ""); - define("ADMIN_PAGES_ICON", ""); - - -} - -// define("ADMIN_TRUE_ICON", ""); -// define("ADMIN_FALSE_ICON", ""); -// define("ADMIN_WARNING_ICON", ""); - - - - - - - define("ADMIN_ADD_ICON", ""); - define("ADMIN_INFO_ICON", ""); - define("ADMIN_CONFIGURE_ICON", ""); - define("ADMIN_VIEW_ICON", ""); - define("ADMIN_URL_ICON", ""); - define("ADMIN_INSTALLPLUGIN_ICON", ""); - define("ADMIN_UNINSTALLPLUGIN_ICON", ""); - define("ADMIN_UPGRADEPLUGIN_ICON", ""); - define("ADMIN_REPAIRPLUGIN_ICON", ""); - define("ADMIN_UP_ICON", ""); - define("ADMIN_DOWN_ICON", ""); - - - - - // FOR BC - - define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_32.png"); - define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_32.png"); - define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_32.png"); -// define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_32.png"); -// define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_32.png"); -// define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_32.png"); -// define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_32.png"); -// define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_32.png"); -// define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_32.png"); -// define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_32.png"); -// define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_32.png"); -// define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_32.png"); -// define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_32.png"); -// define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE_ABS."admin_images/execute_32.png"); -// define("ADMIN_SORT_ICON_PATH", e_IMAGE_ABS."admin_images/sort_32.png"); - - - - //XXX Do NOT use 'title' attributes - these should go in the - - if(!defined('ADMIN_EDIT_ICON') && !defined('ADMIN_TRUE_ICON')) - {/* - define("ADMIN_TRUE_ICON", ""); - define("ADMIN_FALSE_ICON", ""); - define("ADMIN_EDIT_ICON", ""); - define("ADMIN_DELETE_ICON", ""); - define("ADMIN_UP_ICON", ""); - define("ADMIN_DOWN_ICON", ""); - define("ADMIN_WARNING_ICON", ""); - define("ADMIN_INFO_ICON", ""); - define("ADMIN_CONFIGURE_ICON", ""); - define("ADMIN_ADD_ICON", ""); - define("ADMIN_VIEW_ICON", ""); - define("ADMIN_URL_ICON", ""); - define("ADMIN_INSTALLPLUGIN_ICON", ""); - define("ADMIN_UNINSTALLPLUGIN_ICON",""); - define("ADMIN_UPGRADEPLUGIN_ICON", ""); - define("ADMIN_EXECUTE_ICON", ""); - define("ADMIN_SORT_ICON", ""); - */ - define("ADMIN_TRUE_ICON_PATH", e_IMAGE_ABS."admin_images/true_16.png"); //XXX DEPRECATED but used in v1.x - define("ADMIN_FALSE_ICON_PATH", e_IMAGE_ABS."admin_images/false_16.png"); //XXX DEPRECATED but used in v1.x - // define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_16.png"); //XXX DEPRECATED but used in v1.x - // define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_16.png"); //XXX DEPRECATED but used in v1.x - // define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_16.png"); //XXX DEPRECATED but used in v1.x - } - - - \ No newline at end of file diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index f9ea4c2d1..798f42c12 100755 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -8255,11 +8255,7 @@ class e_admin_form_ui extends e_form } } - - - - -include_once(e107::coreTemplatePath('admin_icons')); +e107::loadAdminIcons(); /** * TODO: diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index b4a4244d1..7d278185a 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -3041,6 +3041,39 @@ class e107 return $path; } + /** + * Load admin icons template and define their constants + * @return void; + */ + public static function loadAdminIcons() + { + $regID = 'e107/core/adminicons/loaded'; + + if(self::getRegistry($regID)) + { + return null; + } + + $ADMIN_ICONS_TEMPLATE = self::getCoreTemplate('admin_icons', null, false); + + if(defset('THEME_STYLE') === 'css/kadmin.css') + { + + $ADMIN_ICONS_TEMPLATE['ADMIN_EDIT_ICON'] = ""; + $ADMIN_ICONS_TEMPLATE['ADMIN_DELETE_ICON'] = ""; + $ADMIN_ICONS_TEMPLATE['ADMIN_EXECUTE_ICON'] = ""; + $ADMIN_ICONS_TEMPLATE['ADMIN_SORT_ICON'] = ""; + $ADMIN_ICONS_TEMPLATE['ADMIN_PAGES_ICON'] = ""; + } + + foreach($ADMIN_ICONS_TEMPLATE as $def=>$val) + { + define($def, $val); + } + + self::setRegistry($regID, true); + } + /** * Retrieve core template path * Example: echo e107::coreTemplatePath('admin_icons'); diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index 97a9ac307..19de7e4e6 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -675,7 +675,8 @@ class e_navigation { if(!defined('E_32_MAIN')) { - e107::getCoreTemplate('admin_icons'); + // e107::getCoreTemplate('admin_icons'); + e107::loadAdminIcons(); } diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php index 9b81aeaa3..369abec5d 100644 --- a/e107_tests/tests/unit/e107Test.php +++ b/e107_tests/tests/unit/e107Test.php @@ -727,14 +727,23 @@ class e107Test extends \Codeception\Test\Unit $this->assertTrue($res); } */ - public function testGetCoreTemplate() + public function testLoadAdminIcons() { - - $templates = scandir(e_CORE . "templates"); $e107 = $this->e107; + $e107::loadAdminIcons(); + $e107::loadAdminIcons(); + } + + + public function testGetCoreTemplate() + { + $e107 = $this->e107; + $templates = scandir(e_CORE . "templates"); + + $exclude = array( - 'admin_icons_template.php', + // 'admin_icons_template.php', 'admin_template.php',// FIXME - convert the template to v2.x standards. 'bbcode_template.php', 'online_template.php', // FIXME - convert the template to v2.x standards. diff --git a/e107_tests/tests/unit/e_formTest.php b/e107_tests/tests/unit/e_formTest.php index fecda0e14..e9b299946 100644 --- a/e107_tests/tests/unit/e_formTest.php +++ b/e107_tests/tests/unit/e_formTest.php @@ -162,7 +162,8 @@ class e_formTest extends \Codeception\Test\Unit e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php'); e107::includeLan(e_PLUGIN.'forum/languages/English/English_front.php'); - include_once(e_CORE."templates/admin_icons_template.php"); + e107::loadAdminIcons(); + include_once(e_PLUGIN.'forum/forum_class.php'); require_once(e_PLUGIN.'forum/templates/forum_icons_template.php'); diff --git a/e107_tests/tests/unit/e_parse_shortcodeTest.php b/e107_tests/tests/unit/e_parse_shortcodeTest.php index 5de06f78d..60a59798a 100644 --- a/e107_tests/tests/unit/e_parse_shortcodeTest.php +++ b/e107_tests/tests/unit/e_parse_shortcodeTest.php @@ -155,10 +155,12 @@ class e_parse_shortcodeTest extends \Codeception\Test\Unit public function testAdminShortcodes() { require_once(e_CORE."shortcodes/batch/admin_shortcodes.php"); - require_once(e_CORE."templates/admin_icons_template.php"); + require_once(e_LANGUAGEDIR.'English/admin/lan_header.php'); require_once(e_LANGUAGEDIR.'English/admin/lan_footer.php'); + e107::loadAdminIcons(); + try { $sc = $this->make('admin_shortcodes'); diff --git a/e107_tests/tests/unit/pluginsTest.php b/e107_tests/tests/unit/pluginsTest.php index 9b6f43933..df5efe407 100644 --- a/e107_tests/tests/unit/pluginsTest.php +++ b/e107_tests/tests/unit/pluginsTest.php @@ -142,10 +142,6 @@ 'forum/forum_post.php', 'forum/forum_viewtopic.php', // needs a major cleanup. 'forum/index.php', - 'log/log.php', // headers - 'log/loginfo.php', // include. - 'log/stats.php', // FIXME or remove the plugin - 'log/stats_csv.php', 'online/online_menu.php', // FIXME missing template for member/new 'pm/pm.php', // FIXME contains exit, needs rework. 'poll/admin_config.php', // FIXME convert to admin-ui