X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=db1e154849cc5becddc63b7ae12d1a588e46a43a;hb=22f132c8d6314f76c69dff58ec0dac21f5ca3bf2;hp=e5d3f0cdcb582432029dad0c73e11306daa4b2ab;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index e5d3f0cdcb..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) { @@ -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 @@ -119,7 +116,7 @@ ORDER BY `task_created` DESC", array(getCurrentAdminId()), __FILE__, __LINE__); - if (SQL_NUMROWS($result_tasks) > 0) { + if (!SQL_HASZERONUMS($result_tasks)) { // New jobs found! $jobsDone = false; } // END - if @@ -135,8 +132,8 @@ ORDER BY function outputSeletectedTasks ($postData, $result_tasks) { if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) { // Assign / do tasks - $OUT = ''; $SW = 2; - foreach ($postData['sel'] as $id => $sel) { + $OUT = ''; + foreach ($postData['sel'] as $taskId => $sel) { $result_task = SQL_QUERY_ESC("SELECT `id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin` FROM @@ -145,7 +142,7 @@ WHERE `id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')) LIMIT 1", array( - bigintval($id), + bigintval($taskId), getCurrentAdminId() ), __FILE__, __LINE__); @@ -165,7 +162,7 @@ LIMIT 1", $add = ''; // @TODO Rewrite this to a filter - if ($taskData['task_type'] == 'SUPPORT_MEMBER') { + if ($taskData['task_type'] == 'MEMBER_SUPPORT') { $mode = substr($taskData['text'], 0, strpos($taskData['text'], ':')); $taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1); $add = '
  • {--ADMIN_TASK_SUPPORT_MODE--}: ' . $mode . '
    • '; @@ -195,22 +192,22 @@ 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 ((getConfig('verbose_sql') == 'Y')) { + if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) { // Extract extension name from subject $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1); // Update task or extension task? if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) { // Load SQL commands for registering in dry-run - registerExtension($ext_name, $id, true); + registerExtension($ext_name, $taskId, true); // 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 @@ -246,9 +243,9 @@ LIMIT 1", } // Add SQLs to a table - if ((!empty($ext_name)) && (isExtensionInstalled('sql_patches')) && (getConfig('verbose_sql') == 'Y')) { + 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 @@ -261,17 +258,16 @@ LIMIT 1", $taskData['text'] .= getExtensionNotes(); } else { // This should not normally happen! - 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')); + debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled())); } // 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 @@ -282,18 +278,14 @@ LIMIT 1", switch ($taskData['task_type']) { case 'EXTENSION': // Install new extensions $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1); - $result_lines = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", - array($ext_name), __FILE__, __LINE__); - $lines = SQL_NUMROWS($result_lines); - SQL_FREERESULT($result_lines); - if ($lines == '0') { - // New extension found - $OUT .= loadTemplate('admin_ext_reg_form', true, array( - 'id' => bigintval($id), + if (!isExtensionInstalled($ext_name)) { + // New (not yet installed) extension found + $OUT .= loadTemplate('admin_extension_reg_form', true, array( + 'id' => bigintval($taskId), 'ext_name' => $ext_name )); } else { - // Task is closed so nothing is todo + // Extension is already installed $OUT .= '
    {--ADMIN_EXTENSION_ALREADY_REGISTERED--}
    '; // Close task but not already closed, solved, deleted or update tasks @@ -315,7 +307,7 @@ LIMIT 1", } // END - if break; - case 'SUPPORT_MEMBER': // Assign on member's support request + case 'MEMBER_SUPPORT': // Assign on member's support request // @TODO This may also be rewritten to include files switch ($mode) { default: // @TODO Unknown support mode @@ -382,12 +374,12 @@ LIMIT 1", break; case 'MEMBER_ORDER': // Member mail orders - $OUT .= loadTemplate('admin_task_order', true, $id); + $OUT .= loadTemplate('admin_task_order', true, $taskId); break; default: // Unknown task type logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type'])); - $OUT .= '
    ' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $id) . '
    '; + $OUT .= '
    ' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '
    '; break; } $OUT .= ' @@ -397,9 +389,6 @@ LIMIT 1", // Free result SQL_FREERESULT($result_task); - - // Switch colors - $SW = 3 - $SW; } // END - foreach // Load final template @@ -409,15 +398,15 @@ LIMIT 1", // Only unassign / delete tasks when there are selected tasks posted if (!empty($postData['unassign'])) { // Unassign from tasks - foreach ($postData['sel'] as $id => $sel) { + foreach ($postData['sel'] as $taskId => $sel) { SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1", - array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__); + array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__); } } elseif (isset($postData['del'])) { // Delete tasks - foreach ($postData['sel'] as $id => $sel) { + foreach ($postData['sel'] as $taskId => $sel) { SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0) LIMIT 1", - array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__); + array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__); } } else { // Unknown action @@ -430,13 +419,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 @@ -457,26 +443,17 @@ LIMIT 1", $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']))) { + if (isExtensionTask($content)) { // Load extension row template $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content); } else { // Load default row template $OUT .= loadTemplate('admin_overview_list_rows', true, $content); } - - // Switch color - $SW = 3 - $SW; } // END - while // Free memory