fooRequestElementBar() functions renamed, adding of request parameters added:

[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 3b0a16f0abeb6566c7439f93832137d65a62c6f4..2249daa7c480d87e16597516d5c30d7c67059d1b 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/03/2004 *
- * ================                             Last change: 08/07/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/03/2004 *
+ * ===================                          Last change: 08/07/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_task.php                               *
@@ -50,9 +50,9 @@ if (!isExtensionActive('task')) {
 } // END - if
 
 $whereStatement = '';
-if (!isGetRequestElementSet(('type'))) setRequestGetElement('type', 'your');
+if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
 
-switch (getRequestElement('type')) {
+switch (getRequestParameter('type')) {
        case 'your': // List only your own open (new) tasks
                $whereStatement = "`assigned_admin`='".getCurrentAdminId()."' AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
                break;
@@ -78,18 +78,15 @@ switch (getRequestElement('type')) {
                break;
 
        default: // Unknown type
-               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), getRequestElement('type')));
+               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestParameter('type')));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_TASK_UNKNOWN_MODE', getRequestParameter('type')));
                break;
-}
+} // END - switch
 
 if (!empty($whereStatement)) {
-       $SEL = 0;
-       if (isPostRequestElementSet(('task'))) $SEL = countSelection(postRequestElement('task'));
-
-       if ((isPostRequestElementSet(('assign'))) && ($SEL > 0)) {
+       if ((isPostRequestParameterSet('assign')) && (countPostSelection() > 0)) {
                // 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 +103,18 @@ ORDER BY
        `subject` ASC,
        `task_created` DESC',
                        __FILE__, __LINE__);
-               if (($SEL > 0) && (!isDemoModeActive())) {
+               if ((countPostSelection() > 0) && (!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) {
+                               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__);
-                               }
-                       } elseif (isPostRequestElementSet('del')) {
+                               } // END - foreach
+                       } elseif (isPostRequestParameterSet('del')) {
                                // 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,7 +122,7 @@ 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=<pre>%s</pre>", print_r(postRequestArray(), true)));
@@ -144,11 +141,11 @@ ORDER BY
                }
 
                // There are uncompleted jobs!
-               $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestElement('type')).'_TYPE');
+               $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestParameter('type')).'_TYPE');
                // @TODO Rewrite these templates to one and add $OUT
                loadTemplate('admin_overview_header_task', false, array(
                        'message' => $type,
-                       'type'    => getRequestElement('type')
+                       'type'    => getRequestParameter('type')
                ));
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result_tasks)) {
@@ -201,13 +198,13 @@ ORDER BY
 
                        // Switch colors
                        $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result_tasks);
 
                // Load footer template
-               if (getRequestElement('type') == 'deleted') {
+               if (getRequestParameter('type') == 'deleted') {
                        // Delete now button
                        loadTemplate('admin_overview_footer_task');
                } else {
@@ -215,7 +212,7 @@ ORDER BY
                        loadTemplate('admin_overview_footer');
                }
        }
-}
+} // END - if
 
 // [EOF]
 ?>