X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=d51f0d6ab6b7123d3efd2d827adf407539729408;hb=f5e6a0a8acafd76f06f1122b4bdc2dc0f9277aa4;hp=ff48e0d633ec6837c6445744a00db329141c7fb0;hpb=747c49b9f46a3d7d1d881c9e1c273ecf107f8d8b;p=mailer.git diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index ff48e0d633..d51f0d6ab6 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -1,7 +1,7 @@ 0)) { +if (!empty($whereStatement)) { + if ((isPostRequestElementSet('assign')) && (countPostSelection() > 0)) { // Assign / do tasks - require_once(PATH."inc/modules/admin/overview-inc.php"); - if (empty($dmy)) $dmy = ""; - OUTPUT_SELECTED_TASKS($_POST, $dmy); + loadIncludeOnce("inc/modules/admin/overview-inc.php"); + if (empty($dmy)) $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 ((countPostSelection() > 0) && (!isDemoModeActive())) { // Only unassign / delete tasks when there are selected tasks posted - if (isset($_POST['unassign'])) { + if (isPostRequestElementSet('unassign')) { // Unassign from tasks - foreach ($_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), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__); + foreach (postRequestElement('sel') 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 (isset($_POST['del'])) { + } elseif (isPostRequestElementSet('del')) { // Delete tasks - foreach ($_POST['task'] as $id => $sel) { - if ($_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", + 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); } } + } else { + // Unknown action performed + debug_report_bug(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 = constant('ADMIN_OVERVIEW_TASK_'.strtoupper($_GET['type']).'_TYPE'); - LOAD_TEMPLATE("admin_overview_header_task", false, array( + $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' => $_GET['type'] + 'type' => getRequestElement('type') )); - $SW = 2; - while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) - { - $infos = "---"; - if ($admin == "0") - { - // No admin currently is assigned - $admin = "