X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=db1e154849cc5becddc63b7ae12d1a588e46a43a;hb=22f132c8d6314f76c69dff58ec0dac21f5ca3bf2;hp=90bb61a8986780da3f61f211325cb5578e4d5693;hpb=241acfbd7e38ff9916100dac9d88892713f85c7f;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 90bb61a898..db1e154849 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -40,7 +40,7 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // @TODO This function does also check for uncompleted tasks function outputStandardOverview (&$result_tasks) { @@ -192,7 +192,7 @@ LIMIT 1", // Initialize variables (no title for SQL commands by default) $ext_name = ''; $ext_ver = ''; - $title = '{--TASK_NO_TITLE--}'; + $title = '{--ADMIN_TASK_NO_SQL_TITLE--}'; // Shall I list SQL commands assigned to an extension installation or update task? if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) { @@ -207,7 +207,7 @@ LIMIT 1", // Is this non-productive? if (isExtensionProductive() === false) { // Issue warning - $taskData['text'] .= loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)); + $taskData['text'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text']; } // END - if // Set current extension name @@ -245,7 +245,7 @@ LIMIT 1", // Add SQLs to a table if ((!empty($ext_name)) && (isVerboseSqlEnabled())) { // Add verbose SQL table - $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . "
\n"; + $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '
'; } // END - if } elseif ((!empty($ext_name)) && (!empty($ext_ver))) { // Run SQL commands in dry mode but only return the notes @@ -447,7 +447,7 @@ LIMIT 1", $content['task_created'] = generateDateTime($content['task_created'], 2); // Do we have extension task? - if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) { + if (isExtensionTask($content)) { // Load extension row template $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content); } else {