Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / modules / admin / what-list_task.php

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 493903850cc995609536a3e7f0a03749e39f58c1..d8af21ff70a35bd337778408de7bd2e044edb88c 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -44,9 +44,9 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 $whereStatement = "";
 ADD_DESCR("admin", __FILE__);
 
 $whereStatement = "";

-if (empty($_GET['type'])) $_GET['type'] = "your";
+if (!REQUEST_ISSET_GET(('type'))) REQUEST_SET_GET('type', "your");

 
 

-switch ($_GET['type'])
+switch (REQUEST_GET('type'))

 {
 case "your": // List only your own open (new) tasks
        $whereStatement = "assigned_admin='".GET_CURRENT_ADMIN_ID()."' AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'";
 {
 case "your": // List only your own open (new) tasks
        $whereStatement = "assigned_admin='".GET_CURRENT_ADMIN_ID()."' AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'";


@@ -73,20 +73,20 @@ case "closed": // List all closed
        break;
 
 default: // Unknown type
        break;
 
 default: // Unknown type

-       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $_GET['type']));
-       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), $_GET['type']));
+       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", REQUEST_GET('type')));
+       LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), REQUEST_GET('type')));

        break;
 }
 
        break;
 }
 

-if (!empty($whereStatement))
-{
+if (!empty($whereStatement)) {

        $SEL = 0;
        $SEL = 0;

-       if (isset($_POST['task'])) $SEL = SELECTION_COUNT($_POST['task']);
-       if ((isset($_POST['assign'])) && ($SEL > 0)) {
+       if (REQUEST_ISSET_POST(('task'))) $SEL = SELECTION_COUNT(REQUEST_POST('task'));
+
+       if ((REQUEST_ISSET_POST(('assign'))) && ($SEL > 0)) {

                // Assign / do tasks
                LOAD_INC_ONCE("inc/modules/admin/overview-inc.php");
                if (empty($dmy)) $dmy = "";
                // Assign / do tasks
                LOAD_INC_ONCE("inc/modules/admin/overview-inc.php");
                if (empty($dmy)) $dmy = "";

-               OUTPUT_SELECTED_TASKS($_POST, $dmy);
+               OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $dmy);

        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created


@@ -95,16 +95,16 @@ WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
                if (($SEL > 0) && (!IS_DEMO())) {
                        // Only unassign / delete tasks when there are selected tasks posted
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
                if (($SEL > 0) && (!IS_DEMO())) {
                        // Only unassign / delete tasks when there are selected tasks posted

-                       if (isset($_POST['unassign'])) {
+                       if (REQUEST_ISSET_POST(('unassign'))) {

                                // Unassign from tasks
                                // Unassign from tasks

-                               foreach ($_POST['task'] as $id => $sel) {
+                               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__);
                                }
                                        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 (isset($_POST['del'])) {
+                       } elseif (REQUEST_ISSET_POST(('del'))) {

                                // Delete tasks
                                // Delete tasks

-                               foreach ($_POST['task'] as $id => $sel) {
-                                       if ($_GET['type'] == "deleted") {
+                               foreach (REQUEST_POST('task') as $id => $sel) {
+                                       if (REQUEST_GET('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__);
                                                // Delete task immediately
                                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
                                                        array(bigintval($id)),__FILE__, __LINE__);


@@ -120,10 +120,10 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                }
 
                // There are uncompleted jobs!
                }
 
                // There are uncompleted jobs!

-               $type = constant('ADMIN_OVERVIEW_TASK_'.strtoupper($_GET['type']).'_TYPE');
+               $type = constant('ADMIN_OVERVIEW_TASK_'.strtoupper(REQUEST_GET('type')).'_TYPE');

                LOAD_TEMPLATE("admin_overview_header_task", false, array(
                        'message' => $type,
                LOAD_TEMPLATE("admin_overview_header_task", false, array(
                        'message' => $type,

-                       'type'    => $_GET['type']
+                       'type'    => REQUEST_GET('type')

                ));
                $SW = 2;
                while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
                ));
                $SW = 2;
                while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {


@@ -183,7 +183,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                SQL_FREERESULT($result_tasks);
 
                // Load footer template
                SQL_FREERESULT($result_tasks);
 
                // Load footer template

-               if ($_GET['type'] == "deleted")
+               if (REQUEST_GET('type') == "deleted")

                {
                        // Delete now button
                        LOAD_TEMPLATE("admin_overview_footer_task");
                {
                        // Delete now button
                        LOAD_TEMPLATE("admin_overview_footer_task");