X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=21452467c839ddeed01954cdfdbaac391a424f91;hb=ba973321465edf4c1239d3b499b6de1e4be1f10c;hp=44991b3b282478b053528b2c039ffb7f2cee3380;hpb=c5fbd4afb0965d5f3b504d0547e60affb51d52c7;p=mailer.git

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 44991b3b28..21452467c8 100644
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -32,40 +32,39 @@
  ************************************************************************/
 
 // 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);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+// 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 ($GLOBALS['action'] == "login") {
+	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'
-	}
-	 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)
-{
+} // END - if
+
+// Are there jobs to be done?
+if ($JOBS_DONE) {
 	// Generate overview of all main menus
-	global $menuDesription, $FATAL;
+	global $menuDesription;
 	if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) {
 		$OUT = "";
-		foreach ($menuDesription as $key=>$value)
+		foreach ($menuDesription as $key => $value)
 		{
 			// Prepare content
 			$content = array(
@@ -80,7 +79,12 @@ 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(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), "task"));
+	}
+
 	// List selected tasks on overview when task management is not active
 	OUTPUT_SELECTED_TASKS($_POST, $result_tasks);
 }