X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=b2c97da3607e55794f2fdc54913f089427c38020;hb=cc59ea1cce3e0fafc2cc6c9e36142698cf2b58ef;hp=b0d7f96980f0931c4fef8535cfbde2a26607052d;hpb=d495bd859975d08ee459d03c9b1cd51dd9b9304d;p=mailer.git diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index b0d7f96980..b2c97da360 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -1,7 +1,7 @@ 0)) { + if ((isPostRequestParameterSet('assign')) && (ifPostContainsSelections())) { // Assign / do tasks - loadIncludeOnce("inc/modules/admin/overview-inc.php"); + loadIncludeOnce('inc/modules/admin/overview-inc.php'); if (empty($dmy)) $dmy = ''; outputSeletectedTasks(postRequestArray(), $dmy); } else { @@ -106,18 +99,18 @@ ORDER BY `subject` ASC, `task_created` DESC', __FILE__, __LINE__); - if (($SEL > 0) && (!isDemoModeActive())) { + if ((ifPostContainsSelections()) && (!isDemoModeActive())) { // Only unassign / delete tasks when there are selected tasks posted - if (isPostRequestElementSet('unassign')) { + if (isPostRequestParameterSet('unassign')) { // Unassign from tasks - foreach (postRequestElement('task') as $id => $sel) { - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1", + foreach (postRequestParameter('sel') as $id => $sel) { + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1", array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__); - } - } elseif (isPostRequestElementSet('del')) { + } // END - foreach + } elseif (isFormSent('delete')) { // Delete tasks - foreach (postRequestElement('task') as $id => $sel) { - if (getRequestElement('type') == 'deleted') { + foreach (postRequestParameter('sel') as $id => $sel) { + if (getRequestParameter('type') == 'deleted') { // Delete task immediately SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1", array(bigintval($id)),__FILE__, __LINE__); @@ -125,10 +118,10 @@ ORDER BY // Mark task as to be deleted (purged by autopurge extension) adminDeleteTask($id); } - } + } // END - foreach } else { // Unknown action performed - debug_report_bug(sprintf("Unknown task action performed. data=
%s", print_r(postRequestArray(), true))); + debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=
%s", print_r(postRequestArray(), true))); } // Update query @@ -144,22 +137,10 @@ ORDER BY } // There are uncompleted jobs! - $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestElement('type')).'_TYPE'); - // @TODO Rewrite these templates to one and add $OUT - loadTemplate('admin_overview_header_task', false, array( - 'message' => $type, - 'type' => getRequestElement('type') - )); - $OUT = ''; $SW = 2; + $OUT = ''; while ($content = SQL_FETCHARRAY($result_tasks)) { // Init infos - $content['infos'] = '---'; - - // Generate link - $content['assigned_admin'] = generateAdminLink($content['assigned_admin']); - - // Get admin task - $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).''); + $content['infos'] = ''; // Generate infos switch ($content['task_type']) { @@ -170,7 +151,7 @@ ORDER BY } // END - switch // Member assigned with task? - if ($content['userid'] > 0) { + if (isValidUserId($content['userid'])) { // Member found otherwise it's a system task $content['userid'] = generateUserProfileLink($content['userid']); } else { @@ -179,43 +160,40 @@ ORDER BY } // Prepare content - // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template $content = merge_array($content, array( - 'sw' => $SW, - 'admin' => $content['assigned_admin'], - 'userid' => $content['userid'], - 'type' => $content['task_type_msg'], - 'created' => generateDateTime($content['task_created'], 2) + 'task_created' => generateDateTime($content['task_created'], 2) )); // Do we have an extension task? - if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) { + if (isExtensionTask($content)) { // Load extension row template - // @TODO Rewrite this to $OUT .= ..., true, ... - loadTemplate('admin_list_task_ext_rows', false, $content); + $OUT .= loadTemplate('admin_list_task_ext_rows', true, $content); } else { // Load default row template - // @TODO Rewrite this to $OUT .= ..., true, ... - loadTemplate('admin_list_task_rows', false, $content); + $OUT .= loadTemplate('admin_list_task_rows', true, $content); } - - // Switch colors - $SW = 3 - $SW; - } + } // END - while // Free memory SQL_FREERESULT($result_tasks); + // Prepare content + $content = array( + 'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestParameter('type')) . '_TYPE--}', + 'type' => getRequestParameter('type'), + 'rows' => $OUT + ); + // Load footer template - if (getRequestElement('type') == 'deleted') { + if (getRequestParameter('type') == 'deleted') { // Delete now button - loadTemplate('admin_overview_footer_task'); + loadTemplate('admin_list_task_delete', false, $content); } else { // Normal footer - loadTemplate('admin_overview_footer'); + loadTemplate('admin_list_task', false, $content); } } -} +} // END - if // [EOF] ?>