X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=af377f5ca19290bdf54a70832afb96d32ee48c1e;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=fe87639e61422245eb43800afbc41afaf97e6dd6;hpb=e5fe5afb17a5c8106f4c890234dfa39419e70f5d;p=mailer.git diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index fe87639e61..af377f5ca1 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/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, 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 * @@ -42,12 +41,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -// In Opera browsers the menu is being displayed double: addMenuDescription('admin', __FILE__); +// In Opera browsers the menu is being displayed double: addYouAreHereLink('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')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_WARNING_SQL_PATCHES_MISSING--}'); } // END - if // Load include file 'overview-inc' (old standard overview page) @@ -58,7 +57,7 @@ $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 (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())); + loadTemplate('admin_settings_saved', false, 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')); - } + loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXTENSION_INACTIVE', 'task')); + } // END - if // List selected tasks on overview when task management is not active outputSeletectedTasks(postRequestArray(), $result_tasks);