New wrapper functions introduced, TODOs.txt updated

[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 7304ac172f49c73350ef8ed5db62bf254280d59f..caa0096616c47d976a086a675609ccc771d94682 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -106,7 +106,7 @@ function outputStandardOverview (&$result_tasks) {
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
-       `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')
+       `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW')
 ORDER BY
        `userid` DESC,
        `task_type` DESC,
@@ -137,7 +137,7 @@ function outputSeletectedTasks ($postData, $result_tasks) {
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
-       `id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
+       `id`=%s AND (`assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW'))
 LIMIT 1",
                                array(
                                        bigintval($taskId),
@@ -151,7 +151,7 @@ LIMIT 1",
 
                                if ($taskData['assigned_admin'] == '0') {
                                        // Assgin current admin to unassgigned task
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=0 LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=NULL LIMIT 1",
                                                array(
                                                        getCurrentAdminId(),
                                                        bigintval($taskData['id'])
@@ -205,7 +205,7 @@ LIMIT 1",
                                                // Is this non-productive?
                                                if (isExtensionProductive() === false) {
                                                        // Issue warning
-                                                       $taskData['text'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text'];
+                                                       $taskData['text'] = displayMessage(getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name), true) . $taskData['text'];
                                                } // END - if
 
                                                // Set current extension name
@@ -312,7 +312,7 @@ LIMIT 1",
                                                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
                                                        $OUT .= '<div class="notice medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
                                                        break;
-                                               }
+                                               } // END - switch
                                                break;
 
                                        case 'PAYOUT_REQUEST': // Payout requests
@@ -397,22 +397,22 @@ LIMIT 1",
                        if (!empty($postData['unassign'])) {
                                // Unassign from tasks
                                foreach ($postData['sel'] as $taskId => $sel) {
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
                                                array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
-                               }
+                               } // END - foreach
                        } elseif (isset($postData['delete'])) {
                                // Delete tasks
                                foreach ($postData['sel'] as $taskId => $sel) {
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0) LIMIT 1",
                                                array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
-                               }
+                               } // END - foreach
                        } else {
                                // Unknown action
                                debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
                        }
 
                        // 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 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
                                array(getCurrentAdminId()), __FILE__, __LINE__);
                } // END - if
 
@@ -429,7 +429,7 @@ LIMIT 1",
                                case 'EXTENSION_UPDATE':
                                        $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
                                        break;
-                       }
+                       } // END - switch
 
                        // Get task type
                        $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';