From fdf78c92a4b29805836c6e527e0c8d3c5d1e36d1 Mon Sep 17 00:00:00 2001 From: Cameron Date: Tue, 26 Feb 2013 17:17:31 -0800 Subject: [PATCH] Issue #73 Deprecated admin_handlers.php file. --- e107_admin/admin.php | 1 - e107_admin/includes/tabbed.php | 1 - .../shortcodes/batch/admin_shortcodes.php | 4 +- e107_core/shortcodes/single/imageselector.php | 2 +- e107_core/shortcodes/single/imageselector.sc | 1 - e107_handlers/admin_handler.php | 56 +----------------- e107_handlers/admin_ui.php | 2 +- e107_handlers/core_functions.php | 57 +++++++++++++++++++ e107_handlers/e107_class.php | 3 +- e107_handlers/menumanager_class.php | 2 +- e107_handlers/sitelinks_class.php | 1 - e107_plugins/admin_menu/admin_menu.php | 4 -- e107_plugins/download/includes/admin.php | 1 - e107_themes/core/admin_alt_nav.sc | 2 +- 14 files changed, 65 insertions(+), 72 deletions(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 374565dd3..f1d3fd97c 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -42,7 +42,6 @@ if(strpos($pref['adminstyle'], 'infopanel') === 0) require_once(e_ADMIN.'boot.php'); require_once(e_ADMIN.'auth.php'); -require_once(e_HANDLER.'admin_handler.php'); require_once(e_HANDLER.'upload_handler.php'); // require_once (e_HANDLER."message_handler.php"); $mes = e107::getMessage(); diff --git a/e107_admin/includes/tabbed.php b/e107_admin/includes/tabbed.php index e183c0aa4..1d3bc176e 100644 --- a/e107_admin/includes/tabbed.php +++ b/e107_admin/includes/tabbed.php @@ -28,7 +28,6 @@ class tabbed $plugs = e107::getNav()->pluginLinks(E_16_PLUGMANAGER, "array"); $this->links = array_merge($core,$plugs); - require_once(e_HANDLER."admin_handler.php"); $this->links = multiarray_sort($this->links,'title'); //XXX Move this function in e107_class? $this->render(); } diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 21a7fa07b..d0f5cdb1e 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -1082,8 +1082,7 @@ class admin_shortcodes 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) { @@ -1286,7 +1285,6 @@ class admin_shortcodes global $$tmpl; require_once(e_ADMIN.'ad_links.php'); //FIXME loaded in boot.php but $admin_cat is not available here. - require_once(e_HANDLER.'admin_handler.php'); if($parm == 'home' || $parm == 'logout' || $parm == 'language' || $parm == 'pm') { diff --git a/e107_core/shortcodes/single/imageselector.php b/e107_core/shortcodes/single/imageselector.php index b63a657a6..c0d966d30 100644 --- a/e107_core/shortcodes/single/imageselector.php +++ b/e107_core/shortcodes/single/imageselector.php @@ -85,7 +85,7 @@ function imageselector_shortcode($parm = '', $mod = '') $text .= "\n \n"; - require_once(e_HANDLER.'admin_handler.php'); + foreach ($imagelist as $imagedirlabel => $icons) { if(!vartrue($parms['media'])) $imagedirlabel = str_replace('../', '', $tp->replaceConstants($imagedirlabel)); diff --git a/e107_core/shortcodes/single/imageselector.sc b/e107_core/shortcodes/single/imageselector.sc index 47367d752..26fabfea5 100644 --- a/e107_core/shortcodes/single/imageselector.sc +++ b/e107_core/shortcodes/single/imageselector.sc @@ -59,7 +59,6 @@ if($scaction == 'select' || $scaction == 'all') $text .= " \n"; - require_once(e_HANDLER.'admin_handler.php'); foreach($imagelist as $imagedirlabel => $icons) { diff --git a/e107_handlers/admin_handler.php b/e107_handlers/admin_handler.php index ce69ae9d0..de3a7f740 100644 --- a/e107_handlers/admin_handler.php +++ b/e107_handlers/admin_handler.php @@ -16,58 +16,6 @@ if (!defined('e107_INIT')) { exit; } -// Better Array-sort by key function by acecream (22-Apr-2003 11:02) http://php.net/manual/en/function.asort.php -if (!function_exists('asortbyindex')) -{ - function asortbyindex($array, $key) - { - foreach ($array as $i => $k) - { - $sort_values[$i] = $array[$i][$key]; - } - asort ($sort_values); - reset ($sort_values); - while (list ($arr_key, $arr_val) = each ($sort_values)) - { - $sorted_arr[] = $array[$arr_key]; - } - return $sorted_arr; - } -} - -if (!function_exists('multiarray_sort')) { - function multiarray_sort(&$array, $key, $order = 'asc', $natsort = true, $case = true) - { - if(!is_array($array)) return $array; - - $order = strtolower($order); - foreach ($array as $i => $arr) - { - $sort_values[$i] = $arr[$key]; - } - - if(!$natsort) - { - ($order=='asc')? asort($sort_values) : arsort($sort_values); - } - elseif(isset($sort_values)) - { - $case ? natsort($sort_values) : natcasesort($sort_values); - if($order != 'asc') $sort_values = array_reverse($sort_values, true); - } - - if(!isset($sort_values)) - { - return; - } - - reset ($sort_values); - - while (list ($arr_key, $arr_val) = each ($sort_values)) - { - $sorted_arr[] = $array[$arr_key]; - } - return $sorted_arr; - } -} +// DEBUG INFO ONLY - do NOT translate. +e107::getMessage()->addDebug("admin_handler.php is deprecated. You can simply remove it from your script and continue to use its functions which can now be found inside core_functions.php"); diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index d2e636039..402865a7a 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5152,7 +5152,7 @@ class e_admin_form_ui extends e_form
".$this->select_open('etrigger_batch', array('class' => 'tbox select batch e-autosubmit reset', 'id' => false))." - ".$this->option(LAN_BATCH_LABEL_SELECTED, '')." + ".$this->option(LAN_BATCH_LABEL_SELECTED, '', false, 'disabled=1')." ".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".($allow_delete ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".($allow_url ? $this->option(LAN_UI_BATCH_CREATELINK, 'url', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." diff --git a/e107_handlers/core_functions.php b/e107_handlers/core_functions.php index fe7a423a2..08d4bd49c 100644 --- a/e107_handlers/core_functions.php +++ b/e107_handlers/core_functions.php @@ -240,4 +240,61 @@ function echo_gzipped_page() } } + +// Better Array-sort by key function by acecream (22-Apr-2003 11:02) http://php.net/manual/en/function.asort.php +if (!function_exists('asortbyindex')) +{ + function asortbyindex($array, $key) + { + foreach ($array as $i => $k) + { + $sort_values[$i] = $array[$i][$key]; + } + asort ($sort_values); + reset ($sort_values); + while (list ($arr_key, $arr_val) = each ($sort_values)) + { + $sorted_arr[] = $array[$arr_key]; + } + return $sorted_arr; + } +} + +if (!function_exists('multiarray_sort')) { + function multiarray_sort(&$array, $key, $order = 'asc', $natsort = true, $case = true) + { + if(!is_array($array)) return $array; + + $order = strtolower($order); + foreach ($array as $i => $arr) + { + $sort_values[$i] = $arr[$key]; + } + + if(!$natsort) + { + ($order=='asc')? asort($sort_values) : arsort($sort_values); + } + elseif(isset($sort_values)) + { + $case ? natsort($sort_values) : natcasesort($sort_values); + if($order != 'asc') $sort_values = array_reverse($sort_values, true); + } + + if(!isset($sort_values)) + { + return; + } + + reset ($sort_values); + + while (list ($arr_key, $arr_val) = each ($sort_values)) + { + $sorted_arr[] = $array[$arr_key]; + } + return $sorted_arr; + } +} + + ?> \ No newline at end of file diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index c9aa90b66..7fbac56e2 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -149,7 +149,6 @@ class e107 'e_admin_controller_ui' => '{e_HANDLER}admin_ui.php', 'e_admin_dispatcher' => '{e_HANDLER}admin_ui.php', 'e_admin_form_ui' => '{e_HANDLER}admin_ui.php', - // 'e_admin_icons' => '{e_HANDLER}admin_handler.php', // DEPRECATED 'e_admin_log' => '{e_HANDLER}admin_log_class.php', 'e_admin_model' => '{e_HANDLER}model_class.php', 'e_admin_request' => '{e_HANDLER}admin_ui.php', @@ -162,6 +161,7 @@ class e107 'e_media' => '{e_HANDLER}media_class.php', 'e_menu' => '{e_HANDLER}menu_class.php', 'e_model' => '{e_HANDLER}model_class.php', + 'e_navigation' => '{e_HANDLER}sitelinks_class.php', 'e_news_item' => '{e_HANDLER}news_class.php', 'e_news_tree' => '{e_HANDLER}news_class.php', 'e_object' => '{e_HANDLER}model_class.php', @@ -202,7 +202,6 @@ class e107 'redirection' => '{e_HANDLER}redirection_class.php', 'secure_image' => '{e_HANDLER}secure_img_handler.php', 'sitelinks' => '{e_HANDLER}sitelinks_class.php', - 'e_navigation' => '{e_HANDLER}sitelinks_class.php', 'themeHandler' => '{e_HANDLER}theme_handler.php', 'user_class' => '{e_HANDLER}userclass_class.php', 'userlogin' => '{e_HANDLER}login.php', diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php index 51f7acdea..6affc6db3 100644 --- a/e107_handlers/menumanager_class.php +++ b/e107_handlers/menumanager_class.php @@ -1144,7 +1144,7 @@ class e_menuManager { //FIXME extract extract($row); if(!$menu_id){ return; } - // include_once(e_HANDLER.'admin_handler.php'); + $menu_name = preg_replace("#_menu#i", "", $menu_name); //TODO we need a CSS class for this $vis = ($menu_class || strlen($menu_pages) > 1) ? " * " : ""; diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index fd2c8294b..13f16ad09 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -721,7 +721,6 @@ class e_navigation if($mode == 'assoc') { - require_once(e_HANDLER.'admin_handler.php'); $newarray = asortbyindex($array_functions, 1); $array_functions_assoc = $this->convert_core_icons($newarray); return $array_functions_assoc; diff --git a/e107_plugins/admin_menu/admin_menu.php b/e107_plugins/admin_menu/admin_menu.php index aaea88ae0..9e39ab741 100644 --- a/e107_plugins/admin_menu/admin_menu.php +++ b/e107_plugins/admin_menu/admin_menu.php @@ -22,10 +22,6 @@ if (ADMIN == TRUE) $tp = e107::getParser(); $pref = e107::getPref(); $ns = e107::getRender(); - - // require_once(e_HANDLER."userclass_class.php"); -// require_once(e_ADMIN."ad_links.php"); - require_once(e_HANDLER.'admin_handler.php'); $nav = e107::getNav(); diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php index 1942191f2..787162c5a 100644 --- a/e107_plugins/download/includes/admin.php +++ b/e107_plugins/download/includes/admin.php @@ -12,7 +12,6 @@ * $Id: admin.php 12212 2011-05-11 22:25:02Z e107coders $ */ -//require_once(e_HANDLER.'admin_handler.php'); - autoloaded - see class2.php __autoload() if (!defined('e107_INIT')){ exit; } class plugin_download_admin extends e_admin_dispatcher diff --git a/e107_themes/core/admin_alt_nav.sc b/e107_themes/core/admin_alt_nav.sc index 130f4750b..14291ede0 100644 --- a/e107_themes/core/admin_alt_nav.sc +++ b/e107_themes/core/admin_alt_nav.sc @@ -5,7 +5,7 @@ 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) { list($cat_link, $anchor) = explode('#', $cat_link, 2);