Renamed all SQL-related functions to camel-case notation

[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 ce4b96dfcf1d8569075475ff9e99214db63107dc..e8fd2aac206cb50dffcf513fe54585d5ca84de91 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // @TODO This function does also check for uncompleted tasks
 function outputStandardOverview (&$result_tasks) {
        // First check for solved and not assigned tasks and assign them to current admin
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `assigned_admin` IS NULL AND status != 'NEW'",
+       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `assigned_admin` IS NULL AND status != 'NEW'",
                array(getCurrentAdminId()), __FILE__, __LINE__);
 
        // We currently don't want to install an extension so let's find out if we need...
@@ -102,7 +102,7 @@ function outputStandardOverview (&$result_tasks) {
        } // END - foreach
 
        // At last - but not least - check for own and new unassigned tasks...
-       $result_tasks = SQL_QUERY_ESC("SELECT
+       $result_tasks = sqlQueryEscaped("SELECT
        `id`,
        `assigned_admin`,
        `userid`,
@@ -121,13 +121,13 @@ ORDER BY
        `task_created` DESC",
                array(getCurrentAdminId()), __FILE__, __LINE__);
 
-       if (!SQL_HASZERONUMS($result_tasks)) {
+       if (!ifSqlHasZeroNums($result_tasks)) {
                // New jobs found
                $jobsDone = FALSE;
        } // END - if
 
        // Free the result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Return status
        return $jobsDone;
@@ -139,7 +139,7 @@ function outputSeletectedTasks ($postData, $result_tasks) {
                // Assign / do tasks
                $OUT = '';
                foreach ($postData['sel'] as $taskId => $sel) {
-                       $result_task = SQL_QUERY_ESC("SELECT
+                       $result_task = sqlQueryEscaped("SELECT
        `id`,
        `userid`,
        `task_type`,
@@ -159,13 +159,13 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
 
                        // Task is found?
-                       if (SQL_NUMROWS($result_task) == 1) {
+                       if (sqlNumRows($result_task) == 1) {
                                // Task is valid so load it's data
-                               $taskData = SQL_FETCHARRAY($result_task);
+                               $taskData = sqlFetchArray($result_task);
 
                                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` IS NULL LIMIT 1",
+                                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin` IS NULL LIMIT 1",
                                                array(
                                                        getCurrentAdminId(),
                                                        bigintval($taskData['id'])
@@ -328,10 +328,10 @@ LIMIT 1",
                                        case 'PAYOUT_REQUEST': // Payout requests
                                                if (isExtensionActive('payout')) {
                                                        // Extension is installed so let him send a notification to the user
-                                                       $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
+                                                       $result_pay = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
                                                                array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
-                                                       list($pid) = SQL_FETCHROW($result_pay);
-                                                       SQL_FREERESULT($result_pay);
+                                                       list($pid) = sqlFetchRow($result_pay);
+                                                       sqlFreeResult($result_pay);
 
                                                        if (isValidId($pid)) {
                                                                // Payout id can be obtained
@@ -355,10 +355,10 @@ LIMIT 1",
                                        case 'WERNIS_REQUEST': // Wernis requests
                                                if (isExtensionActive('wernis')) {
                                                        // Extension is installed so let him send a notification to the user
-                                                       $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
+                                                       $result_pay = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
                                                                array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
-                                                       list($pid) = SQL_FETCHROW($result_pay);
-                                                       SQL_FREERESULT($result_pay);
+                                                       list($pid) = sqlFetchRow($result_pay);
+                                                       sqlFreeResult($result_pay);
 
                                                        if (isValidId($pid)) {
                                                                // Payout id can be obtained
@@ -396,7 +396,7 @@ LIMIT 1",
                        } // END - if
 
                        // Free result
-                       SQL_FREERESULT($result_task);
+                       sqlFreeResult($result_task);
                } // END - foreach
 
                // Load final template
@@ -407,13 +407,13 @@ 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`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+                                       sqlQueryEscaped("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 (!empty($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,NULL) LIMIT 1",
+                                       sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0,NULL) LIMIT 1",
                                                array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
                                } // END - foreach
                        } else {
@@ -422,13 +422,13 @@ LIMIT 1",
                        }
 
                        // 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 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
+                       $result_tasks = sqlQueryEscaped("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
 
                // There are uncompleted jobs!
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result_tasks)) {
+               while ($content = sqlFetchArray($result_tasks)) {
                        // Init infos
                        $content['infos'] = '';
 
@@ -462,7 +462,7 @@ LIMIT 1",
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result_tasks);
+               sqlFreeResult($result_tasks);
 
                // Load footer template
                loadTemplate('admin_overview_table', FALSE, $OUT);