Next wave of lesser getMessage() usage and more EL

[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 1d085886b8f58e6b4312d5e53e2b55c663bc643b..18749aaa981560b649dc6997ca3779f285de233e 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,9 +51,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,13 +79,13 @@ switch (getRequestElement('type')) {
                break;
 
        default: // Unknown type
-               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('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)) {
-       if ((isPostRequestElementSet('assign')) && (countPostSelection() > 0)) {
+       if ((isPostRequestParameterSet('assign')) && (countPostSelection() > 0)) {
                // Assign / do tasks
                loadIncludeOnce('inc/modules/admin/overview-inc.php');
                if (empty($dmy)) $dmy = '';
@@ -105,16 +106,16 @@ ORDER BY
                        __FILE__, __LINE__);
                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('sel') 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__);
                                } // END - foreach
-                       } elseif (isPostRequestElementSet('del')) {
+                       } elseif (isFormSent('del')) {
                                // Delete tasks
-                               foreach (postRequestElement('sel') 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 +126,7 @@ ORDER BY
                                } // END - foreach
                        } else {
                                // Unknown action performed
-                               debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
                        }
 
                        // Update query
@@ -141,11 +142,11 @@ ORDER BY
                }
 
                // There are uncompleted jobs!
-               $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestElement('type')).'_TYPE');
+               $type = '{--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)) {
@@ -156,7 +157,7 @@ ORDER BY
                        $content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
 
                        // Get admin task
-                       $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+                       $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
 
                        // Generate infos
                        switch ($content['task_type']) {
@@ -167,7 +168,7 @@ ORDER BY
                        } // 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 {
@@ -176,7 +177,7 @@ ORDER BY
                        }
 
                        // Prepare content
-                       // @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
+                       // @TODO Rewritings: admin->assigned_admin,type->task_type_msg in template
                        $content = merge_array($content, array(
                                'sw'      => $SW,
                                'admin'   => $content['assigned_admin'],
@@ -204,7 +205,7 @@ ORDER BY
                SQL_FREERESULT($result_tasks);
 
                // Load footer template
-               if (getRequestElement('type') == 'deleted') {
+               if (getRequestParameter('type') == 'deleted') {
                        // Delete now button
                        loadTemplate('admin_overview_footer_task');
                } else {