X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=31d68b7b04feebea5bf5a5b15e1300e1f00253aa;hb=3c311675e341584ad25c561a5a65198f3717125f;hp=877418b340a215c904740b85610d08f4740b271f;hpb=f577a47a8149d34039aa3c4921c35a38fcb2f2a3;p=mailer.git diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index 877418b340..31d68b7b04 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -1,7 +1,7 @@ 0)) { + if ((isPostRequestElementSet('assign')) && (ifPostContainsSelections())) { // Assign / do tasks - loadIncludeOnce("inc/modules/admin/overview-inc.php"); + loadIncludeOnce('inc/modules/admin/overview-inc.php'); if (empty($dmy)) $dmy = ''; - OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $dmy); + outputSeletectedTasks(postRequestArray(), $dmy); } else { // Start listing tasks matching selected filter - $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created -FROM `{!_MYSQL_PREFIX!}_task_system` -WHERE ".$whereStatement." -ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__); - if (($SEL > 0) && (!IS_DEMO())) { + $result_tasks = SQL_QUERY('SELECT + `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created` +FROM + `{?_MYSQL_PREFIX?}_task_system` +WHERE + '.$whereStatement.' +ORDER BY + `userid` DESC, + `task_type` DESC, + `subject` ASC, + `task_created` DESC', + __FILE__, __LINE__); + if ((ifPostContainsSelections()) && (!isDemoModeActive())) { // Only unassign / delete tasks when there are selected tasks posted - if (REQUEST_ISSET_POST(('unassign'))) { + if (isPostRequestElementSet('unassign')) { // Unassign from tasks - foreach (REQUEST_POST('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", - array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__); - } - } elseif (REQUEST_ISSET_POST('del')) { + foreach (postRequestElement('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__); + } // END - foreach + } elseif (isFormSent('delete')) { // Delete tasks - foreach (REQUEST_POST('task') as $id => $sel) { - if (REQUEST_GET('type') == "deleted") { + foreach (postRequestElement('sel') as $id => $sel) { + if (getRequestElement('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__); + SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1", + array(bigintval($id)),__FILE__, __LINE__); } else { - // Mark task as to be deleted (purged by autppurge extension) - ADMIN_DELETE_TASK($id); + // Mark task as to be deleted (purged by autopurge extension) + adminDeleteTask($id); } - } + } // END - foreach + } else { + // Unknown action performed + debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=
%s", print_r(postRequestArray(), true))); } // Update query - $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__); + $result_tasks = SQL_QUERY('SELECT + `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created` +FROM + `{?_MYSQL_PREFIX?}_task_system` +WHERE + '.$whereStatement.' +ORDER BY + `subject` ASC, + `task_created` DESC', __FILE__, __LINE__); } // There are uncompleted jobs! - $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(REQUEST_GET('type')).'_TYPE'); - // @TODO Rewrite these templates to one and add $OUT - LOAD_TEMPLATE("admin_overview_header_task", false, array( - 'message' => $type, - 'type' => REQUEST_GET('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']) - { + switch ($content['task_type']) { case 'EXTENSION': case 'EXTENSION_UPDATE': $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1); break; - } + } // 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 { // Is a system task! - $content['userid'] = "{--ADMIN_IS_SYSTEM_TASK--}"; + $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}'; } // Prepare content - // @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template $content = merge_array($content, array( - 'sw' => $SW, - 'admin' => $content['assigned_admin'], - 'uid' => $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') && (GET_EXT_VERSION($content['infos']) == '')) { + if (isExtensionTask($content)) { // Load extension row template - // @TODO Rewrite this to $OUT .= ..., true, ... - LOAD_TEMPLATE("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, ... - LOAD_TEMPLATE("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(getRequestElement('type')) . '_TYPE--}', + 'type' => getRequestElement('type'), + 'rows' => $OUT + ); + // Load footer template - if (REQUEST_GET('type') == "deleted") { + if (getRequestElement('type') == 'deleted') { // Delete now button - LOAD_TEMPLATE("admin_overview_footer_task"); + loadTemplate('admin_list_task_delete', false, $content); } else { // Normal footer - LOAD_TEMPLATE("admin_overview_footer"); + loadTemplate('admin_list_task', false, $content); } } -} -// +} // END - if + +// [EOF] ?>