X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=04be6624f607b5e752adff2a8ff396ed6e7d6369;hb=305ad0593fb7abd5051045615c5cc5f00fecd823;hp=d532a27f7cc635556af63c6113fa43704c0afa16;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;p=mailer.git diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index d532a27f7c..04be6624f6 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -14,11 +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, 2010 by Mailer Developer Team * + * 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 * @@ -42,20 +40,20 @@ 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, '{--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') { @@ -72,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, getMaskedMessage('ADMIN_MENU_IS_EMPTY', getAction())); + displayMessage('{--ADMIN_MENU_IS_EMPTY--}'); } elseif ($jobsDone === true) { // Generate overview of all main menus if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) { @@ -94,7 +92,7 @@ if (!ifAdminMenuHasEntries(getAction())) { } elseif ($taskExt === false) { if (isExtensionActive('task')) { // Output warning message - loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXTENSION_INACTIVE', 'task')); + displayMessage('{%message,EXTENSION_WARNING_EXTENSION_INACTIVE=task%}'); } // END - if // List selected tasks on overview when task management is not active