Heavy rewrite:

[mailer.git] / inc / modules / admin / what-overview.php

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 7f947a212c6f27e1c60ba0087aebddce634baca5..e3204cb0d03bf77500a30ddc38263864abded766 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -46,13 +46,13 @@ 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)
-LOAD_INC_ONCE("inc/modules/admin/overview-inc.php");
+loadIncludeOnce('inc/modules/admin/overview-inc.php');
 
 $jobsDone = 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 (getAction() == 'login') {
        if (EXT_IS_ACTIVE('task')) {
                // When task extension is registered output advanced overview page
                $jobsDone = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
@@ -64,9 +64,9 @@ if ($GLOBALS['action'] == "login") {
 } // END - if
 
 // Are we in 'welcome' page and are there jobs to be done?
-if (!ifAdminMenuHasEntries($GLOBALS['action'])) {
+if (!ifAdminMenuHasEntries(getAction())) {
        // This menu is empty and so no content is displayed
-       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), $GLOBALS['action']));
+       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), getAction()));
 } elseif ($jobsDone === true) {
        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {