X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=4f1a7073b46714444169be33505e8ed10cdb05e8;hb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;hp=965ac2be33a9fe8fc706ab6271b7aed8b08f52ab;hpb=a84801467693b6adc9e9a984a30c79ccbc6622db;p=mailer.git diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index 965ac2be33..4f1a7073b4 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -41,14 +41,14 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) { // In Opera browsers the menu is being displayed double: ADD_DESCR("admin", __FILE__); // Otherwise load include file 'overview-inc' (old standard overview page) -require_once(PATH."inc/modules/admin/overview-inc.php"); +LOAD_INC_ONCE("inc/modules/admin/overview-inc.php"); $JOBS_DONE = true; $taskExt = false; // Default is that "task" is not installed // When the admin is logging in check several things first (new jobs to complete and so on) if ($GLOBALS['action'] == "login") { - if ((EXT_IS_ACTIVE("task")) && (function_exists('OUTPUT_ADVANCED_OVERVIEW'))) { + if (EXT_IS_ACTIVE("task")) { // When task extension is registered output advanced overview page $JOBS_DONE = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task' $taskExt = true; @@ -61,14 +61,13 @@ if ($GLOBALS['action'] == "login") { // Are there jobs to be done? if ($JOBS_DONE) { // Generate overview of all main menus - global $menuDesription, $FATAL; - if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) { + if ((is_array($GLOBALS['menu']['description'])) && (sizeof($GLOBALS['menu']['description']) > 0)) { $OUT = ""; - foreach ($menuDesription as $key => $value) + foreach ($GLOBALS['menu']['description'] as $key => $value) { // Prepare content $content = array( - 'title' => $menuTitle[$key], + 'title' => $GLOBALS['menu']['title'][$key], 'text' => $value ); @@ -82,12 +81,11 @@ if ($JOBS_DONE) { } elseif (!$taskExt) { if (EXT_IS_ACTIVE("task")) { // Output warning message - LOAD_TEMPLATE("admin_settings_saved", false, sprintf(EXTENSION_WARNING_EXT_INACTIVE, "task")); - OUTPUT_HTML("
"); + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), "task")); } // List selected tasks on overview when task management is not active - OUTPUT_SELECTED_TASKS($_POST, $result_tasks); + OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $result_tasks); } //