diff --git a/comment.php b/comment.php index 8710d4a50..4abcbe6f4 100644 --- a/comment.php +++ b/comment.php @@ -556,7 +556,7 @@ if(isset($pref['trackbackEnabled']) && $pref['trackbackEnabled'] && $table == 'n } else { - require_once(e_THEME."templates/trackback_template.php"); + require_once(e_CORE."templates/trackback_template.php"); } $text = ""; diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php index 8bbb5de49..716fc9cb5 100644 --- a/e107_admin/ad_links.php +++ b/e107_admin/ad_links.php @@ -15,7 +15,7 @@ */ if (!defined('e107_INIT')) { exit; } - +/* if (file_exists(THEME.'admin_images/admin_images.php')) { e107_require_once(THEME.'admin_images/admin_images.php'); } @@ -82,11 +82,14 @@ if (!defined('E_32_CAT_ABOUT')) { 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'); } @@ -316,9 +319,12 @@ if (!defined('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', ""); } @@ -448,51 +454,10 @@ if (!defined('E_32_SYSINFO')) { define("E_16_E107", ""); define("E_32_E107", ""); - +*/ //XXX Move to e_navigation ? -$e_icon_array = array( - 'main' => E_32_MAIN, - 'admin' => E_32_ADMIN, - 'admin_pass' => E_32_ADPASS, - 'banlist' => E_32_BANLIST, - 'cache' => E_32_CACHE, - 'comment' => E_32_COMMENT, - 'credits' => E_32_CREDITS, - 'cron' => E_32_CRON, - 'custom' => E_32_CUST, - // 'custom_field' => E_32_CUSTOMFIELD, - 'database' => E_32_DATAB, - 'docs' => E_32_DOCS, - //'download' => E_32_DOWNL, - 'emoticon' => E_32_EMOTE, - 'filemanage' => E_32_FILE, - 'fileinspector' => E_32_INSPECT, - 'frontpage' => E_32_FRONT, - 'image' => E_32_IMAGES, - 'language' => E_32_LANGUAGE, - 'links' => E_32_LINKS, - 'mail' => E_32_MAIL, - 'maintain' => E_32_MAINTAIN, - 'menus' => E_32_MENUS, - 'meta' => E_32_META, - 'newsfeed' => E_32_NEWSFEED, - 'news' => E_32_NEWS, - 'notify' => E_32_NOTIFY, - 'phpinfo' => E_32_PHP, - 'plug_manage' => E_32_PLUGMANAGER, - 'poll' => E_32_POLLS, - 'prefs' => E_32_PREFS, - 'search' => E_32_SEARCH, - 'syslogs' => E_32_ADMINLOG, - 'theme_manage' => E_32_THEMEMANAGER, - 'maintain' => E_32_MAINTAIN, - 'upload' => E_32_UPLOADS, - 'eurl' => E_32_EURL, - 'userclass' => E_32_USERCLASS, - 'user_extended' => E_32_USER_EXTENDED, - 'users' => E_32_USER, - 'wmessage' => E_32_WELCOME ); + //FIXME array structure - see shortcodes/admin_navigation.php // Moved to sitelinks_class.php - e_navigation; diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 498298594..bdccd469c 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -15,9 +15,9 @@ */ require_once('../class2.php'); +include_once(e107::coreTemplatePath('admin_icons')); // Needs to be loaded before infopanel AND in boot.php + -//TODO - marj prepare language reorganisation -//include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); if(vartrue($_GET['iframe']) == 1) { diff --git a/e107_admin/header.php b/e107_admin/header.php index 4385d6188..7b7598e4c 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -32,7 +32,7 @@ if (defined('THEME') && file_exists(THEME.'admin_template.php')) } else { - require_once (e_BASE.$e107->getFolder('themes').'templates/admin_template.php'); + require_once (e_CORE.'templates/admin_template.php'); } diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 817b8116d..4a51d1378 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -99,6 +99,9 @@ class admin_shortcodes if (ADMIN) { global $e_sub_cat, $e_icon_array, $PLUGINS_DIRECTORY; + + $e_icon_array = e107::getNav()->getIconArray(); + if (e_CURRENT_PLUGIN) { $eplug_icon = ''; diff --git a/e107_core/shortcodes/single/search.sc b/e107_core/shortcodes/single/search.sc index 20bddb3d7..c433fe6b9 100644 --- a/e107_core/shortcodes/single/search.sc +++ b/e107_core/shortcodes/single/search.sc @@ -1,12 +1,17 @@ +// E_32_MAIN, + 'admin' => E_32_ADMIN, + 'admin_pass' => E_32_ADPASS, + 'banlist' => E_32_BANLIST, + 'cache' => E_32_CACHE, + 'comment' => E_32_COMMENT, + 'credits' => E_32_CREDITS, + 'cron' => E_32_CRON, + 'custom' => E_32_CUST, + // 'custom_field' => E_32_CUSTOMFIELD, + 'database' => E_32_DATAB, + 'docs' => E_32_DOCS, + //'download' => E_32_DOWNL, + 'emoticon' => E_32_EMOTE, + 'filemanage' => E_32_FILE, + 'fileinspector' => E_32_INSPECT, + 'frontpage' => E_32_FRONT, + 'image' => E_32_IMAGES, + 'language' => E_32_LANGUAGE, + 'links' => E_32_LINKS, + 'mail' => E_32_MAIL, + 'maintain' => E_32_MAINTAIN, + 'menus' => E_32_MENUS, + 'meta' => E_32_META, + 'newsfeed' => E_32_NEWSFEED, + 'news' => E_32_NEWS, + 'notify' => E_32_NOTIFY, + 'phpinfo' => E_32_PHP, + 'plug_manage' => E_32_PLUGMANAGER, + 'poll' => E_32_POLLS, + 'prefs' => E_32_PREFS, + 'search' => E_32_SEARCH, + 'syslogs' => E_32_ADMINLOG, + 'theme_manage' => E_32_THEMEMANAGER, + 'maintain' => E_32_MAINTAIN, + 'upload' => E_32_UPLOADS, + 'eurl' => E_32_EURL, + 'userclass' => E_32_USERCLASS, + 'user_extended' => E_32_USER_EXTENDED, + 'users' => E_32_USER, + 'wmessage' => E_32_WELCOME + ); + + function getIconArray() + { + return $this->iconArray; + } + /** * Structure $this->_md5cache[$category] = md5HASH diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php index 97577cd29..1010dca23 100644 --- a/e107_themes/bootstrap/admin_theme.php +++ b/e107_themes/bootstrap/admin_theme.php @@ -48,459 +48,6 @@ else $no_core_css = TRUE; -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', " "); -} - -// 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', " "); -} - - - -// Small Category Images -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', " "); -} - -// 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_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', ""); -} - - -define("E_32_TRUE", ""); - - - - define("ADMIN_TRUE_ICON", ""); - define("ADMIN_FALSE_ICON", ""); - - define("ADMIN_EDIT_ICON", ""); - define("ADMIN_DELETE_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_UP_ICON", ""); - define("ADMIN_DOWN_ICON", ""); - define("ADMIN_SORT_ICON", ""); - define("ADMIN_EXECUTE_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"); - function theme_head() { diff --git a/e107_themes/templates/admin_icons_template.php b/e107_themes/templates/admin_icons_template.php index 69571d445..d18b1335b 100644 --- a/e107_themes/templates/admin_icons_template.php +++ b/e107_themes/templates/admin_icons_template.php @@ -8,10 +8,6 @@ * * Administration Icons, should handle all icons in the future (somehow) * - * $Source: /cvs_backup/e107_0.8/e107_themes/templates/admin_icons_template.php,v $ - * $Revision$ - * $Date$ - * $Author$ */ /* define("ADMIN_TRUE_ICON", ""); @@ -73,6 +69,481 @@ + + + + +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", ""); + + + +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', " "); +} + +// 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', " "); +} + + + +// Small Category Images +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', " "); +} + +// 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_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', ""); +} + + +define("E_32_TRUE", ""); + + + + define("ADMIN_TRUE_ICON", ""); + define("ADMIN_FALSE_ICON", ""); + + define("ADMIN_EDIT_ICON", ""); + define("ADMIN_DELETE_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_UP_ICON", ""); + define("ADMIN_DOWN_ICON", ""); + define("ADMIN_SORT_ICON", ""); + define("ADMIN_EXECUTE_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 @@ -102,16 +573,7 @@ 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 - } - - - - - - - - - + } // define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED diff --git a/online.php b/online.php index ce8612fde..0c3f5d4c4 100644 --- a/online.php +++ b/online.php @@ -43,7 +43,7 @@ if (file_exists(THEME."online_template.php")) } else { - require_once(e_THEME."templates/online_template.php"); + require_once(e_CORE."templates/online_template.php"); } global $listuserson; diff --git a/search.php b/search.php index d24bdea13..d0d7ebd06 100644 --- a/search.php +++ b/search.php @@ -387,10 +387,13 @@ require_once(HEADERF); // render search config if (!isset($SEARCH_TOP_TABLE)) { - if (file_exists(THEME."search_template.php")) { + if (file_exists(THEME."search_template.php")) + { require(THEME."search_template.php"); - } else { - require(e_THEME."templates/search_template.php"); + } + else + { + require(e_CORE."templates/search_template.php"); } } diff --git a/userposts.php b/userposts.php index 04b520cba..52e1e98a8 100644 --- a/userposts.php +++ b/userposts.php @@ -63,18 +63,7 @@ if ($action == "comments") $user_name = e107::getSystemUser($id, false)->getName(LAN_ANONYMOUS); } - /*if (!isset($USERPOSTS_TEMPLATE)) - { - if (file_exists(THEME."userposts_template.php")) - { - require_once(THEME."userposts_template.php"); - } - else - { - require_once(e_THEME."templates/userposts_template.php"); - } - }*/ // new template engine - override in THEME/templates/userposts_template.php $USERPOSTS_TEMPLATE = e107::getCoreTemplate('userposts');