X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=59c55b245f39f3910f031762d160aafe5fefb6ca;hb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;hp=e3204cb0d03bf77500a30ddc38263864abded766;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850;p=mailer.git

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index e3204cb0d0..59c55b245f 100644
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -17,7 +17,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,13 +37,12 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-// In Opera browsers the menu is being displayed double: ADD_DESCR('admin', __FILE__);
+// In Opera browsers the menu is being displayed double: addMenuDescription('admin', __FILE__);
 
 // Otherwise load include file 'overview-inc' (old standard overview page)
 loadIncludeOnce('inc/modules/admin/overview-inc.php');
@@ -53,20 +52,20 @@ $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 (getAction() == 'login') {
-	if (EXT_IS_ACTIVE('task')) {
+	if (isExtensionActive('task')) {
 		// When task extension is registered output advanced overview page
-		$jobsDone = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
+		$jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'
 		$taskExt = true;
 	} else {
 		// Output standart overview (provided by overview-inc.php)
-		$jobsDone = OUTPUT_STANDARD_OVERVIEW($result_tasks);
+		$jobsDone = outputStandardOverview($result_tasks);
 	}
 } // 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
-	LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), getAction()));
+	loadTemplate('admin_settings_saved', false, sprintf(getMessage('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)) {
@@ -79,21 +78,21 @@ if (!ifAdminMenuHasEntries(getAction())) {
 			);
 
 			// 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 (!$taskExt) {
-	if (EXT_IS_ACTIVE('task')) {
+} elseif ($taskExt === false) {
+	if (isExtensionActive('task')) {
 		// Output warning message
-		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), 'task'));
+		loadTemplate('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(REQUEST_POST_ARRAY(), $result_tasks);
+	outputSeletectedTasks(postRequestArray(), $result_tasks);
 }
 
-//
+// [EOF]
 ?>