X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=2249daa7c480d87e16597516d5c30d7c67059d1b;hp=8835316d6f52b0ab889ac7464e5b21c6dff3672c;hb=57227d33e870ec5cd271209c4a978a52b45c2dd6;hpb=2f0357c7ac9da6c17d361b8e7cb0b1ad09eb85f6
diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 8835316d6f..2249daa7c4 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')) && (countPostSelection() > 0)) {
// Assign / do tasks
- LOAD_INC_ONCE("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 ((countPostSelection() > 0) && (!isDemoModeActive())) {
// Only unassign / delete tasks when there are selected tasks posted
- if (REQUEST_ISSET_POST(('unassign'))) {
+ if (isPostRequestParameterSet('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), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
- }
- } elseif (REQUEST_ISSET_POST('del')) {
+ foreach (postRequestParameter('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__);
+ } // END - foreach
+ } elseif (isPostRequestParameterSet('del')) {
// Delete tasks
- foreach (REQUEST_POST('task') as $id => $sel) {
- if (REQUEST_GET('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",
+ 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(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');
+ $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestParameter('type')).'_TYPE');
// @TODO Rewrite these templates to one and add $OUT
- LOAD_TEMPLATE("admin_overview_header_task", false, array(
+ loadTemplate('admin_overview_header_task', false, array(
'message' => $type,
- 'type' => REQUEST_GET('type')
+ 'type' => getRequestParameter('type')
));
$OUT = ''; $SW = 2;
while ($content = SQL_FETCHARRAY($result_tasks)) {
@@ -137,66 +153,66 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
$content['infos'] = '---';
// Generate link
- $content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
+ $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
// Get admin task
$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
// Generate infos
- switch ($content['task_type'])
- {
- case "EXTENSION":
- case "EXTENSION_UPDATE":
- $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1);
- break;
- }
+ 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) {
// Member found otherwise it's a system task
- $content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
+ $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
+ // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
$content = merge_array($content, array(
'sw' => $SW,
'admin' => $content['assigned_admin'],
- 'uid' => $content['userid'],
+ 'userid' => $content['userid'],
'type' => $content['task_type_msg'],
- 'created' => MAKE_DATETIME($content['task_created'], "2")
+ 'created' => generateDateTime($content['task_created'], 2)
));
// Do we have an extension task?
- if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) {
+ if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
// Load extension row template
// @TODO Rewrite this to $OUT .= ..., true, ...
- LOAD_TEMPLATE("admin_list_task_ext_rows", false, $content);
+ loadTemplate('admin_list_task_ext_rows', false, $content);
} else {
// Load default row template
// @TODO Rewrite this to $OUT .= ..., true, ...
- LOAD_TEMPLATE("admin_list_task_rows", false, $content);
+ loadTemplate('admin_list_task_rows', false, $content);
}
// Switch colors
$SW = 3 - $SW;
- }
+ } // END - while
// Free memory
SQL_FREERESULT($result_tasks);
// Load footer template
- if (REQUEST_GET('type') == "deleted") {
+ if (getRequestParameter('type') == 'deleted') {
// Delete now button
- LOAD_TEMPLATE("admin_overview_footer_task");
+ loadTemplate('admin_overview_footer_task');
} else {
// Normal footer
- LOAD_TEMPLATE("admin_overview_footer");
+ loadTemplate('admin_overview_footer');
}
}
-}
-//
+} // END - if
+
+// [EOF]
?>