X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=d532a27f7cc635556af63c6113fa43704c0afa16;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hp=e18bbad546cdfac61b2d76fc69511d2b8eeb0767;hpb=5ef6ed7373ae85e5635e39e2a0adf9496a8add05;p=mailer.git

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index e18bbad546..d532a27f7c 100644
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/05/2003 *
- * ===============                              Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/05/2003 *
+ * ===================                          Last change: 07/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-overview.php                                *
@@ -10,9 +10,15 @@
  * -------------------------------------------------------------------- *
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,58 +38,68 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+// In Opera browsers the menu is being displayed double: addMenuDescription('admin', __FILE__);
+
+// Is sql_patches not yet installed?
+if (!isExtensionInstalled('sql_patches')) {
+	// Output warning
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_WARNING_SQL_PATCHES_MISSING--}');
+} // END - if
+
+ // Load include file 'overview-inc' (old standard overview page)
+loadIncludeOnce('inc/modules/admin/overview-inc.php');
 
-// Otherwise load include file 'overview-inc' (old standard overview page)
-require_once(PATH."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 (getAction() == 'login') {
+	if ((isExtensionActive('task')) && (function_exists('outputAdvancedOverview'))) {
 		// 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 = outputAdvancedOverview($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 = outputStandardOverview($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(getAction())) {
+	// This menu is empty and so no content is displayed
+	loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MENU_IS_EMPTY', getAction()));
+} 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' => $menuTitle[$key],
+				'title' => $GLOBALS['menu']['title'][$key],
 				'text'  => $value
 			);
 
 			// Load row template
-			$OUT .= LOAD_TEMPLATE("admin_menu_hints_row", true, $content);
-		}
+			$OUT .= loadTemplate('admin_menu_hints_row', true, $content);
+		} // END - foreach
 
 		// Load base template
-		LOAD_TEMPLATE("admin_menu_hints", false, $OUT);
+		loadTemplate('admin_menu_hints', false, $OUT);
 	}
-} elseif (!EXT_IS_ACTIVE("task")) {
+} elseif ($taskExt === false) {
+	if (isExtensionActive('task')) {
+		// Output warning message
+		loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXTENSION_INACTIVE', 'task'));
+	} // END - if
+
 	// List selected tasks on overview when task management is not active
-	OUTPUT_SELECTED_TASKS($_POST, $result_tasks);
+	outputSeletectedTasks(postRequestArray(), $result_tasks);
 }
 
-//
+// [EOF]
 ?>