Filters for configurable userid exclusion 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 3d842ec5d5e42d8085f1a0a5985f614f8602306f..7298f63cc2066347da2b9fd563190777b62b1c29 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -88,7 +88,7 @@ if (!empty($whereStatement)) {
        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY('SELECT
-       `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
+       `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -101,7 +101,7 @@ ORDER BY
                        __FILE__, __LINE__);
                if ((ifPostContainsSelections()) && (!isDemoModeActive())) {
                        // Only unassign / delete tasks when there are selected tasks posted
-                       if (isPostRequestElementSet('unassign')) {
+                       if (isFormSent('unassign')) {
                                // Unassign from tasks
                                foreach (postRequestElement('sel') as $id => $sel) {
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
@@ -121,12 +121,12 @@ ORDER BY
                                } // END - foreach
                        } else {
                                // Unknown action performed
-                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
+                               reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), TRUE)));
                        }
 
                        // Update query
                        $result_tasks = SQL_QUERY('SELECT
-       `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
+       `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -151,7 +151,7 @@ ORDER BY
                        } // END - switch
 
                        // Member assigned with task?
-                       if (isValidUserId($content['userid'])) {
+                       if (isValidId($content['userid'])) {
                                // Member found otherwise it's a system task
                                $content['userid'] = generateUserProfileLink($content['userid']);
                        } else {
@@ -164,13 +164,13 @@ ORDER BY
                                'task_created'  => generateDateTime($content['task_created'], 2)
                        ));
 
-                       // Do we have an extension task?
+                       // Is there an extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template
-                               $OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
+                               $OUT .= loadTemplate('admin_list_task_ext_rows', TRUE, $content);
                        } else {
                                // Load default row template
-                               $OUT .= loadTemplate('admin_list_task_rows', true, $content);
+                               $OUT .= loadTemplate('admin_list_task_rows', TRUE, $content);
                        }
                } // END - while
 
@@ -187,10 +187,10 @@ ORDER BY
                // Load footer template
                if (getRequestElement('type') == 'deleted') {
                        // Delete now button
-                       loadTemplate('admin_list_task_delete', false, $content);
+                       loadTemplate('admin_list_task_delete', FALSE, $content);
                } else {
                        // Normal footer
-                       loadTemplate('admin_list_task', false, $content);
+                       loadTemplate('admin_list_task', FALSE, $content);
                }
        }
 } // END - if