X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-overview.php;h=799cae84f1cdf967d578f9c633d80830970911fb;hp=44991b3b282478b053528b2c039ffb7f2cee3380;hb=e79e1454e88271e35086963a0422a51cc243e67a;hpb=e87430f959a8b240d516ef830e6494165bc933b2 diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index 44991b3b28..799cae84f1 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -44,23 +44,23 @@ ADD_DESCR("admin", basename(__FILE__)); require_once(PATH."inc/modules/admin/overview-inc.php"); $JOBS_DONE = true; +$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 ($GLOBALS['action'] == "login") { - if ((EXT_IS_ACTIVE("task")) && (function_exists('OUTPUT_ADVANCED_OVERVIEW'))) - { + if ((EXT_IS_ACTIVE("task")) && (function_exists('OUTPUT_ADVANCED_OVERVIEW'))) { // 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 - { + $taskExt = true; + } else { // Output standart overview (provided by overview-inc.php) $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_tasks); } } -// Do we have new jobs or not? -if ($JOBS_DONE) -{ + +// Are there jobs to be done? +if ($JOBS_DONE) { // Generate overview of all main menus global $menuDesription, $FATAL; if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) { @@ -80,7 +80,13 @@ if ($JOBS_DONE) // Load base template LOAD_TEMPLATE("admin_menu_hints", false, $OUT); } -} elseif (!EXT_IS_ACTIVE("task")) { +} elseif (!$taskExt) { + if (EXT_IS_ACTIVE("task")) { + // Output warning message + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(EXTENSION_WARNING_EXT_INACTIVE, "task")); + OUTPUT_HTML("
"); + } + // List selected tasks on overview when task management is not active OUTPUT_SELECTED_TASKS($_POST, $result_tasks); }