X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=614ed5ab4db004ea07e75fb2b70447771bf333e7;hp=799cae84f1cdf967d578f9c633d80830970911fb;hb=e01fcf1ca8ddeb72af76465df3ef72301a1cdae7;hpb=e79e1454e88271e35086963a0422a51cc243e67a

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 799cae84f1..614ed5ab4d 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:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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,24 +37,23 @@
  ************************************************************************/
 
 // 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'
 		$taskExt = true;
@@ -57,19 +61,18 @@ if ($GLOBALS['action'] == "login")
 		// Output standart overview (provided by overview-inc.php)
 		$JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_tasks);
 	}
-}
+} // END - if
 
 // 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'])) && (count($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
 			);
 
@@ -83,12 +86,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("<br />");
+		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);
 }
 
 //