Refback will be payed now (user cannot setup currently)

[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 7c443d6d65aeecb1ad503e545adeb6eb56939967..1efd9171889bb96076a9caabcf4b37884b8f2a73 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -44,32 +44,32 @@ ADD_DESCR("admin", basename(__FILE__));
 require_once(PATH."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"))
-       {
+       if ((EXT_IS_ACTIVE("task")) && (function_exists('OUTPUT_ADVANCED_OVERVIEW'))) {
                // When task extension is registered output advanced overview page
                $JOBS_DONE = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
-       }
-        else
-       {
+               $taskExt = true;
+       } else {
                // Output standart overview (provided by overview-inc.php)
                $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_tasks);
        }
 }
-// Do we have new jobs or not?
-if ($JOBS_DONE)
-{
+
+// 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)) {
                $OUT = "";
-               foreach ($menuDesription as $key=>$value)
+               foreach ($menuDesription as $key => $value)
                {
                        // Prepare content
                        $content = array(
-                               'title' => $MTITLE[$key],
+                               'title' => $menuTitle[$key],
                                'text'  => $value
                        );
 
@@ -80,7 +80,13 @@ if ($JOBS_DONE)
                // Load base template
                LOAD_TEMPLATE("admin_menu_hints", false, $OUT);
        }
-} elseif (!EXT_IS_ACTIVE("task")) {
+} elseif (!$taskExt) {
+       if (EXT_IS_ACTIVE("task")) {
+               // Output warning message
+               LOAD_TEMPLATE("admin_settings_saved", false, sprintf(EXTENSION_WARNING_EXT_INACTIVE, "task"));
+               OUTPUT_HTML("<br />");
+       }
+
        // List selected tasks on overview when task management is not active
        OUTPUT_SELECTED_TASKS($_POST, $result_tasks);
 }