X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=6003db9bba992349e52b8fcc688768e6cf5e60f8;hb=8d0ed5ed9a9ca0e07b9582f2311b44bdcc5a95ea;hp=6f9fee94ba63d28871ac80fb3acae492131332ec;hpb=23646b4ddeb178cb71250d75be00ec0a2ed4c0f2;p=mailer.git

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 6f9fee94ba..6003db9bba 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                                *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,24 +40,24 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
 } // END - if
 
-// Add description as navigation point
-// 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, getMessage('ADMIN_WARNING_SQL_PATCHES_MISSING'));
+	displayMessage('{--ADMIN_WARNING_SQL_PATCHES_MISSING--}');
 } // END - if
 
  // Load include file 'overview-inc' (old standard overview page)
 loadIncludeOnce('inc/modules/admin/overview-inc.php');
 
+// Default is that all jobs are done (why?)
 $jobsDone = true;
-$taskExt = false; // Default is that 'task' is not installed
+
+// Default is that 'task' is not installed
+$taskExt = false;
 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if (getAction() == 'login') {
-	if (isExtensionActive('task')) {
+	if ((isExtensionActive('task')) && (function_exists('outputAdvancedOverview'))) {
 		// When task extension is registered output advanced overview page
 		$jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'
 		$taskExt = true;
@@ -71,7 +70,7 @@ if (getAction() == 'login') {
 // 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, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), getAction()));
+	displayMessage(getMaskedMessage('ADMIN_MENU_IS_EMPTY', getAction()));
 } elseif ($jobsDone === true) {
 	// Generate overview of all main menus
 	if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
@@ -93,8 +92,8 @@ if (!ifAdminMenuHasEntries(getAction())) {
 } elseif ($taskExt === false) {
 	if (isExtensionActive('task')) {
 		// Output warning message
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), 'task'));
-	}
+		displayMessage(getMaskedMessage('EXTENSION_WARNING_EXTENSION_INACTIVE', 'task'));
+	} // END - if
 
 	// List selected tasks on overview when task management is not active
 	outputSeletectedTasks(postRequestArray(), $result_tasks);