More improved SQL queries

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index f9e89a7031a072e63e3823193ac90b89ed495d71..e87f4d5606d02dd6da5c89afff5235072584c26f 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -101,7 +101,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
        // At last - but not least - check for own and new unassigned tasks...
        $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
 FROM `{!_MYSQL_PREFIX!}_task_system`
-WHERE assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')
+WHERE assigned_admin='%s' OR (assigned_admin='0' AND `status`='NEW')
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
@@ -124,7 +124,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                // Assign / do tasks
                $OUT = ""; $SW = 2;
                foreach ($POST['task'] as $id => $sel) {
-                       $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')) LIMIT 1",
+                       $result_task = SQL_QUERY_ESC("SELECT id, userid, task_type, subject, text, task_created, status, assigned_admin FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND (assigned_admin='%s' OR (assigned_admin='0' AND `status`='NEW')) LIMIT 1",
                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_task) == 1) {
                                // Task is valid...
@@ -378,7 +378,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
                        }
 
                        // Update query
-                       $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s OR (assigned_admin=0 AND status='NEW') ORDER BY task_created DESC",
+                       $result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s OR (assigned_admin=0 AND `status`='NEW') ORDER BY task_created DESC",
                         array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                } // END - if