X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=677277428947dcfe1aa53906c45f7002fd08470f;hp=7c443d6d65aeecb1ad503e545adeb6eb56939967;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=75ad748a68473ace540251427a74fb781b1145e9

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 7c443d6d65..6772774289 100644
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Einfache Task-Liste oder Menuebeschreibungen     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,57 +37,62 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+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");
+loadIncludeOnce('inc/modules/admin/overview-inc.php');
+
+$jobsDone = true;
+$taskExt = false; // Default is that 'task' is not installed
 
-$JOBS_DONE = true;
 // 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 ($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
-	{
+		$jobsDone = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
+		$taskExt = true;
+	} else {
 		// Output standart overview (provided by overview-inc.php)
-		$JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_tasks);
+		$jobsDone = OUTPUT_STANDARD_OVERVIEW($result_tasks);
 	}
-}
-// Do we have new jobs or not?
-if ($JOBS_DONE)
-{
+} // END - if
+
+// Are we in 'welcome' page and are there jobs to be done?
+if (!ifAdminMenuHasEntries($GLOBALS['action'])) {
+	// This menu is empty and so no content is displayed
+	LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), $GLOBALS['action']));
+} elseif ($jobsDone === true) {
 	// Generate overview of all main menus
-	global $menuDesription, $FATAL;
-	if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) {
-		$OUT = "";
-		foreach ($menuDesription as $key=>$value)
-		{
+	if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
+		$OUT = '';
+		foreach ($GLOBALS['menu']['description'] as $key => $value) {
 			// Prepare content
 			$content = array(
-				'title' => $MTITLE[$key],
+				'title' => $GLOBALS['menu']['title'][$key],
 				'text'  => $value
 			);
 
 			// Load row template
 			$OUT .= LOAD_TEMPLATE("admin_menu_hints_row", true, $content);
-		}
+		} // END - foreach
 
 		// 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);
+	OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $result_tasks);
 }
 
 //