X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=ecd876f699d3f4ea85a1714e916b560e2f291327;hb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;hp=a6e033567a2374c6f2b854cdec95287ecc7ec46e;hpb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;p=mailer.git
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index a6e033567a..ecd876f699 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -71,13 +71,10 @@ function outputStandardOverview (&$result_tasks) {
// Is the extension not yet installed?
if ($extInstalled === false) {
- // Generate subject line
- $ext_subj = sprintf("[%s:]", $ext_name);
-
// We maybe want to install an extension so let's test-drive it...
if (loadExtension($ext_name, getExtensionMode(), '', true)) {
- // Create a task for newly installed extension
- createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name);
+ // Create a task for newly installed extension (we ignore the task id here)
+ createNewExtensionTask($ext_name);
} // END - if
} else {
// Test-drive extension in update mode
@@ -85,10 +82,10 @@ function outputStandardOverview (&$result_tasks) {
// Get extension version
$ext_ver = getExtensionVersion($ext_name);
- //* DEBUG: */ outputHtml($ext_name."=".$ext_ver."
");
+ //* DEBUG: */ debugOutput($ext_name.'='.$ext_ver);
// Update extension if extension is installed and outdated
- //* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."
");
+ //* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name));
if (getThisExtensionVersion() > $ext_ver) {
// Update the extension
updateExtension($ext_name, $ext_ver);
@@ -135,7 +132,7 @@ ORDER BY
function outputSeletectedTasks ($postData, $result_tasks) {
if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
// Assign / do tasks
- $OUT = ''; $SW = 2;
+ $OUT = '';
foreach ($postData['sel'] as $id => $sel) {
$result_task = SQL_QUERY_ESC("SELECT
`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
@@ -168,7 +165,7 @@ LIMIT 1",
if ($taskData['task_type'] == 'SUPPORT_MEMBER') {
$mode = substr($taskData['text'], 0, strpos($taskData['text'], ':'));
$taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1);
- $add = "
%s", print_r($postData, true))); + debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=
%s", print_r($postData, true))); } // Update query @@ -430,13 +423,10 @@ LIMIT 1", } // END - if // There are uncompleted jobs! - $OUT = ''; $SW = 2; + $OUT = ''; while ($content = SQL_FETCHARRAY($result_tasks)) { // Init infos - $content['infos'] = '---'; - - // Generate assign link - $content['assigned_admin'] = generateAdminLink($content['assigned_admin']); + $content['infos'] = ''; // Generate infos // @TODO Try to move this in includes @@ -448,23 +438,17 @@ LIMIT 1", } // Get task type - $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).''); + $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}'; - if ($content['userid'] > 0) { + if (isValidUserId($content['userid'])) { // Member found otherwise it's a system task $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}'; } - // Prepare content - $content = merge_array($content, array( - 'sw' => $SW, - 'assigned_admin' => $content['assigned_admin'], - 'userid' => $content['userid'], - 'task_type_msg' => $content['task_type_msg'], - 'created' => generateDateTime($content['task_created'], 2) - )); + // Add/translate some content + $content['task_created'] = generateDateTime($content['task_created'], 2); // Do we have extension task? if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) { @@ -474,9 +458,6 @@ LIMIT 1", // Load default row template $OUT .= loadTemplate('admin_overview_list_rows', true, $content); } - - // Switch color - $SW = 3 - $SW; } // END - while // Free memory