X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=2a02b281d66bd00b8fa1df77085b2fb63ebdaf8a;hp=46b470a6be5a9eef0b42915083d6cf3271f2f4d6;hb=cf3765c38cf0a76f396aca291f71858936e92956;hpb=8d70fd41c880ca61bafb47a69a6411c741c71dff diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 46b470a6be..2a02b281d6 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 = "
  • {--ADMIN_TASK_SUPPORT_MODE--}: " . $mode . "
    • "; + $add = '
  • {--ADMIN_TASK_SUPPORT_MODE--}: ' . $mode . '
    • '; } // END - if // Is a userid assign? @@ -179,7 +176,7 @@ LIMIT 1", $content = getUserDataArray(); // Generate HTML list entry - $add = "
  • {--ADMIN_MEMBER_UID--}: ".generateUserProfileLink($taskData['userid'], 'user_data')." (".translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'].")
    • "; + $add = '
  • {--ADMIN_MEMBER_UID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; } else { // Invalid userid, so log and zero it logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!'); @@ -195,7 +192,7 @@ LIMIT 1", // Initialize variables (no title for SQL commands by default) $ext_name = ''; $ext_ver = ''; - $title = getMessage('TASK_NO_TITLE'); + $title = '{--TASK_NO_TITLE--}'; // Shall I list SQL commands assigned to an extension installation or update task? if ((getConfig('verbose_sql') == 'Y')) { @@ -220,7 +217,7 @@ LIMIT 1", $taskData['text'] .= getExtensionNotes(); // Set title - $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER'); + $title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}'; } elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') { // Prepare extension name and version $ext_name = substr($ext_name, 7); @@ -239,7 +236,7 @@ LIMIT 1", $taskData['text'] .= getExtensionNotes(); // Set title - $title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE'); + $title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}'; } else { // Remove extension's name $ext_name = ''; @@ -261,17 +258,16 @@ LIMIT 1", $taskData['text'] .= getExtensionNotes(); } else { // This should not normally happen! - debug_report_bug('ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql')); + debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql')); } // Prepare array for the template $content = array( - 'sw' => $SW, - 'subject' => $taskData['subject'], - 'add' => $add, - 'text' => $taskData['text'], - 'created' => generateDateTime($taskData['task_created'], 1), - 'extension' => $ext_name + 'subject' => $taskData['subject'], + 'add' => $add, + 'text' => $taskData['text'], + 'task_created' => generateDateTime($taskData['task_created'], 1), + 'extension' => $ext_name ); // Load template @@ -294,7 +290,7 @@ LIMIT 1", )); } else { // Task is closed so nothing is todo - $OUT .= '
    {--ADMIN_EXT_ALREADY_REGISTERED--}
    '; + $OUT .= '
    {--ADMIN_EXTENSION_ALREADY_REGISTERED--}
    '; // Close task but not already closed, solved, deleted or update tasks if ((!in_array($taskData['status'], array('CLOSED','DELETED','SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) { @@ -344,7 +340,7 @@ LIMIT 1", $OUT .= loadTemplate('admin_payout_overview_form', true, $content); } else { // Problem obtaining payout id - $OUT .= '
    {--PAYOUT_OBTAIN_ID_FAILED--}
    '; + $OUT .= '
    {--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}
    '; } } else { // Extension is not installed @@ -397,9 +393,6 @@ LIMIT 1", // Free result SQL_FREERESULT($result_task); - - // Switch colors - $SW = 3 - $SW; } // END - foreach // Load final template @@ -421,7 +414,7 @@ LIMIT 1", } } else { // Unknown action - debug_report_bug(sprintf("Unknown task action performed. data=
    %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