Mailer project rwritten:

[mailer.git] / inc / modules / admin / what-list_payouts.php

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index a4c330c85a5bb352d8c14e665d1a9e6f77a724d0..be043aceac4c6b3f2e5828de868aa42fd2436be8 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -51,14 +51,14 @@ if (isGetRequestElementSet('pid')) {
        SQL_FREERESULT($result);
 
        // Obtain some data
-       if (!isGetRequestElementSet('task') && (!empty($userid)) && (isValidUserId($userid))) {
+       if (!isGetRequestElementSet('task') && (!empty($userid)) && (isValidId($userid))) {
                // Get task id from database
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `userid`=%s AND `task_type`='PAYOUT_REQUEST' AND `task_created`=%s LIMIT 1",
                        array(bigintval($userid), bigintval($tstamp)), __FILE__, __LINE__);
                list($taskId) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($taskId)) $taskId = '0';
-       } elseif ((empty($userid)) || ($userid == '0')) {
+       } elseif (!isValidId($userid)) {
                // Cannot obtain member id!
                displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
        } else {
@@ -66,7 +66,7 @@ if (isGetRequestElementSet('pid')) {
                $taskId = getRequestElement('task');
        }
 
-       if ((!empty($taskId)) && (!empty($userid)) && (isValidUserId($userid))) {
+       if ((!empty($taskId)) && (!empty($userid)) && (isValidId($userid))) {
                // Load user's data
                if (!fetchUserData($userid)) {
                        // Abort here because it is not valid!
@@ -127,7 +127,7 @@ LIMIT 1",
                                                $reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), FALSE);
 
                                                // Execute transfer
-                                               $ret = sendGetRequest($data['engine_url']);
+                                               $ret = sendHttpGetRequest($data['engine_url']);
                                        } else {
                                                // No URL to run
                                                $ret[0] = $data['engine_ret_ok'];
@@ -135,7 +135,7 @@ LIMIT 1",
 
                                        if ($ret[0] == $data['engine_ret_ok']) {
                                                // Clear task
-                                               if ($taskId > 0) {
+                                               if (isValidId($taskId)) {
                                                        runFilterChain('solve_task', $taskId);
                                                } // END - if
 
@@ -180,7 +180,7 @@ LIMIT 1",
                } elseif ((getRequestElement('do') == 'reject') && (getUserData('email') != '')) {
                        // Ok, now we can output the form or execute rejecting
                        if (isFormSent()) {
-                               if ($taskId > 0) {
+                               if (isValidId($taskId)) {
                                        // Clear task
                                        runFilterChain('solve_task', $taskId);
                                } // END - if
@@ -212,7 +212,7 @@ LIMIT 1",
                        // Cannot load user data
                        displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
                }
-       } elseif ((empty($taskId)) || ($taskId == '0')) {
+       } elseif (!isValidId($taskId)) {
                // Failed loading task id
                displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
        }
@@ -223,19 +223,27 @@ LIMIT 1",
        } // END - if
 
        // Search for payouts
-       $result = SQL_QUERY("SELECT
-       p.id, p.userid, p.payout_total, p.target_account,
-       p.target_bank, t.type, p.payout_timestamp, p.status,
-       t.allow_url AS allow, p.target_url AS url, p.link_text AS alt,
-       p.banner_url AS banner
+       $result = SQL_QUERY('SELECT
+       `p`.`id`,
+       `p`.`userid`,
+       `p`.`payout_total`,
+       `p`.`target_account`,
+       `p`.`target_bank`,
+       `t`.`type`,
+       `p`.`payout_timestamp`,
+       `p`.`status`,
+       `t`.`allow_url` AS `allow`,
+       `p`.`target_url` AS `url`,
+       `p`.`link_text` AS `alt`,
+       `p`.`banner_url` AS `banner`
 FROM
-       `{?_MYSQL_PREFIX?}_user_payouts` AS p
+       `{?_MYSQL_PREFIX?}_user_payouts` AS `p`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_payout_types` AS t
+       `{?_MYSQL_PREFIX?}_payout_types` AS `t`
 ON
-       p.payout_id=t.id
+       `p`.`payout_id`=`t`.`id`
 ORDER BY
-       p.payout_timestamp DESC", __FILE__, __LINE__);
+       `p`.`payout_timestamp` DESC', __FILE__, __LINE__);
 
        if (!SQL_HASZERONUMS($result)) {
                // List found payouts