New naming convention applied to many functions, see #118 for details

[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 90b60ed755b574599659f18647a74bdd58bcefba..1215c5fa6db72bf5d14844fdf265cabcc480dbfe 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -47,7 +47,7 @@ ADD_DESCR('admin', __FILE__);
 
 if (REQUEST_ISSET_GET(('pid'))) {
        // First let's get the member's ID
-       $result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT userid, target_account, payout_total, payout_timestamp, password FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE `id`=%s LIMIT 1",
                array(REQUEST_GET('pid')), __FILE__, __LINE__);
        list($uid, $tuid, $points, $tstamp, $tpass) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
@@ -55,12 +55,12 @@ if (REQUEST_ISSET_GET(('pid'))) {
        // Obtain some data
        if (!REQUEST_ISSET_GET(('task')) && (!empty($uid)) && ($uid > 0)) {
                // 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='".$tstamp."' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_task_system` WHERE userid=%s AND `task_type`='PAYOUT_REQUEST' AND task_created='".$tstamp."' LIMIT 1",
                        array(bigintval($uid)), __FILE__, __LINE__);
                list($task) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                if (empty($task)) $task = 0;
-       } elseif ((empty($uid)) || ($uid == "0")) {
+       } elseif ((empty($uid)) || ($uid == '0')) {
                // Cannot obtain member ID!
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_USERID'));
        } else {
@@ -76,20 +76,20 @@ if (REQUEST_ISSET_GET(('pid'))) {
                SQL_FREERESULT($result);
 
                // Konstante bauen
-               define('PAYOUT_USERDATA_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$surname." ".$family."</a>");
+               define('PAYOUT_USERDATA_VALUE', "<a href=\"".generateMemberEmailLink($email, "user_data")."\">".translateGender($gender)." ".$surname." ".$family."</a>");
 
                if ((REQUEST_GET('do') == "accept") && (!empty($email))) {
                        // Ok, now we can output the form or execute accepting
                        if (IS_FORM_SENT()) {
                                // Obtain payout type and other data
-                               $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT payout_id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE `id`=%s LIMIT 1",
                                 array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
                                list($ptype) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
 
                                if (!empty($ptype)) {
                                        // Obtain data from payout type
-                                       $result = SQL_QUERY_ESC("SELECT from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT from_account, from_pass, engine_url, engine_ret_ok, engine_ret_failed, pass_enc, allow_url FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE `id`=%s LIMIT 1",
                                         array(bigintval($ptype)), __FILE__, __LINE__);
                                        list($fuid, $fpass, $eurl, $eok, $failed, $eenc, $allow) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -118,7 +118,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                                eval($eval);
 
                                                // Execute transfer
-                                               $ret = GET_URL($URL);
+                                               $ret = sendGetRequest($URL);
                                        } else {
                                                // No URL to run
                                                $ret[0] = $eok;
@@ -131,7 +131,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                                }
 
                                                // Clear payout request
-                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET `status`='ACCEPTED' WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET `status`='ACCEPTED' WHERE `id`=%s LIMIT 1",
                                                        array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
 
                                                // Send out mail
@@ -147,7 +147,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                                }
 
                                                // Finally send mail
-                                               SEND_EMAIL($email, PAYOUT_ACCEPTED_SUBJECT, $msg);
+                                               sendEmail($email, getMessage('PAYOUT_ACCEPTED_SUBJECT'), $msg);
                                        } else {
                                                // Something goes wrong... :-(
                                                $content = implode("<br />", $ret);
@@ -176,7 +176,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                }
 
                                // Clear payout request
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET `status`='REJECTED' WHERE id=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_payouts` SET `status`='REJECTED' WHERE `id`=%s LIMIT 1",
                                        array(bigintval(REQUEST_GET('pid'))), __FILE__, __LINE__);
 
                                // Send out mail
@@ -186,7 +186,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PAYOUT_REJECTED_NOTIFIED'));
 
                                // Finally send mail
-                               SEND_EMAIL($email, getMessage('PAYOUT_REJECTED_SUBJECT'), $msg);
+                               sendEmail($email, getMessage('PAYOUT_REJECTED_SUBJECT'), $msg);
                        } else {
                                // Prepare content
                                $content = array(
@@ -201,7 +201,7 @@ if (REQUEST_ISSET_GET(('pid'))) {
                        // Cannot load user data
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_USERDATA'));
                }
-       } elseif ((empty($task)) || ($task == "0")) {
+       } elseif ((empty($task)) || ($task == '0')) {
                // Failed loading task ID
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PAYOUT_FAILED_OBTAIN_TASK_ID'));
        }
@@ -254,11 +254,11 @@ ORDER BY p.payout_timestamp DESC", __FILE__, __LINE__);
                        // Remember data in array for the template
                        $content = array(
                                'sw'      => $SW,
-                               'ulink'   => ADMIN_USER_PROFILE_LINK($content['userid']),
-                               'ptype'   => TRANSLATE_COMMA($content['payout_total'])." ".COMPILE_CODE($content['type']),
+                               'ulink'   => generateUserProfileLink($content['userid']),
+                               'ptype'   => translateComma($content['payout_total'])." ".COMPILE_CODE($content['type']),
                                'account' => $content['target_account'],
                                'bank'    => $content['target_bank'],
-                               'tstamp'  => MAKE_DATETIME($content['payout_timestamp'], "2"),
+                               'tstamp'  => generateDateTime($content['payout_timestamp'], "2"),
                                'status'  => $content['status'],
                        );