Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[mailer.git] / inc / modules / member / what-payout.php

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index f9b5405b394e2444738264e426c9de7c193665c7..e9bf25cbf547d416e1d2493b472b1663915c16b4 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -57,7 +57,7 @@ $TPTS = 0;
 while ($content = SQL_FETCHARRAY($result_depths)) {
        // Load referal points
        $result_points = SQL_QUERY_ESC("SELECT points FROM `{!_MYSQL_PREFIX_user_points!}` WHERE userid=%s AND ref_depth=%d LIMIT 1",
-       array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+               array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result_points) == 1) {
@@ -66,7 +66,7 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 
                // Add them to total
                $TPTS += $points;
-       }
+       } // END - if
 
        // Free result
        SQL_FREERESULT($result_points);
@@ -76,13 +76,13 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 SQL_FREERESULT($result_depths);
 
 // Get used points
-$USED = GET_TOTAL_DATA(getUserId(), "user_data", "used_points");
+$USED = GET_TOTAL_DATA(getUserId(), 'user_data', 'used_points');
 
 // Translate point into comma
 $TPTS = translateComma($TPTS - $USED);
 
 // Sanity check...
-if (empty($TPTS)) $TPTS = "0.00000";
+if (empty($TPTS)) $TPTS = '0.00000';
 
 if (!REQUEST_ISSET_GET(('payout'))) {
        // Load payout types
@@ -140,7 +140,7 @@ ORDER BY p.payout_timestamp DESC",
                                );
 
                                // Load row template and switch colors
-                               $OUT .= LOAD_TEMPLATE("member_payout_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('member_payout_row', true, $content);
                                $SW = 3 - $SW;
                        }
 
@@ -149,7 +149,7 @@ ORDER BY p.payout_timestamp DESC",
                        define('__PAYOUT_ROWS', $OUT);
 
                        // Load template
-                       LOAD_TEMPLATE("member_payout");
+                       LOAD_TEMPLATE('member_payout');
                }
 
                // Free memory
@@ -161,7 +161,7 @@ ORDER BY p.payout_timestamp DESC",
 } else {
        // Chedk if he can get paid by selected type
        $result = SQL_QUERY_ESC("SELECT type, rate, min_points, allow_url AS allow FROM `{!_MYSQL_PREFIX!}_payout_types` WHERE `id`=%s LIMIT 1",
-       array(bigintval(REQUEST_GET('payout'))), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('payout'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
                // ID is valid so load the data
@@ -199,58 +199,58 @@ ORDER BY p.payout_timestamp DESC",
                                        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_payouts` (userid, payout_total, payout_id, payout_timestamp, status, target_url, link_text, banner_url)
 VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
                                        array(
-                                       getUserId(),
-                                       bigintval(REQUEST_POST('payout')),
-                                       bigintval(REQUEST_GET('payout')),
-                                       REQUEST_POST('turl'),
-                                       REQUEST_POST('alt'),
-                                       REQUEST_POST('banner')
+                                               getUserId(),
+                                               bigintval(REQUEST_POST('payout')),
+                                               bigintval(REQUEST_GET('payout')),
+                                               REQUEST_POST('turl'),
+                                               REQUEST_POST('alt'),
+                                               REQUEST_POST('banner')
                                        ), __FILE__, __LINE__);
 
                                        // Load templates
-                                       $msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request_banner", array(), getUserId());
+                                       $msg_mem = LOAD_EMAIL_TEMPLATE('member_payout_request_banner', REQUEST_POST_ARRAY(), getUserId());
                                        if (GET_EXT_VERSION('admins') >= '0.4.1') {
-                                               $adm_tpl = "admin_payout_request_banner";
+                                               $adm_tpl = 'admin_payout_request_banner';
                                        } else {
-                                               $msg_adm = LOAD_EMAIL_TEMPLATE("admin_payout_request_banner", array(), getUserId());
+                                               $msg_adm = LOAD_EMAIL_TEMPLATE('admin_payout_request_banner', REQUEST_POST_ARRAY(), getUserId());
                                        }
                                } else {
                                        // e-currency payout requested
                                        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_user_payouts` (userid, payout_total, target_account, target_bank, payout_id, payout_timestamp, status, password)
 VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                        array(
-                                       getUserId(),
-                                       bigintval(REQUEST_POST('payout')),
-                                       bigintval(REQUEST_POST('account')),
-                                       REQUEST_POST('bank'),
-                                       bigintval(REQUEST_GET('payout')),
-                                       REQUEST_POST('pass')
+                                               getUserId(),
+                                               bigintval(REQUEST_POST('payout')),
+                                               bigintval(REQUEST_POST('account')),
+                                               REQUEST_POST('bank'),
+                                               bigintval(REQUEST_GET('payout')),
+                                               REQUEST_POST('pass')
                                        ), __FILE__, __LINE__);
 
                                        // Load templates
-                                       $msg_mem = LOAD_EMAIL_TEMPLATE("member_payout_request", array(), getUserId());
-                                       $msg_adm = LOAD_EMAIL_TEMPLATE("admin_payout_request", array(), getUserId());
+                                       $msg_mem = LOAD_EMAIL_TEMPLATE('member_payout_request', REQUEST_POST_ARRAY(), getUserId());
+                                       $msg_adm = LOAD_EMAIL_TEMPLATE('admin_payout_request', REQUEST_POST_ARRAY(), getUserId());
                                        $admin_tpl = '';
 
                                        // @TODO Rewrite this to a filter
                                        if (GET_EXT_VERSION('admins') >= '0.4.1') {
-                                               $admin_tpl = "admin_payout_request";
-                                       }
+                                               $admin_tpl = 'admin_payout_request';
+                                       } // END - if
                                }
 
                                // Generate task
                                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
 VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] {--PAYOUT_REQUEST_ADMIN--}','%s', UNIX_TIMESTAMP(), %s)",
                                array(
-                               $msg_adm,
-                               getUserId()
+                                       $msg_adm,
+                                       getUserId()
                                ), __FILE__, __LINE__);
 
                                // Send out mails
                                sendEmail(getUserId(), getMessage('PAYOUT_REQUEST_MEMBER'), $msg_mem);
 
                                // To admin(s)
-                               sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, array(), getUserId());
+                               sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, REQUEST_POST_ARRAY(), getUserId());
 
                                // Load template and output it
                                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT'));
@@ -261,7 +261,7 @@ VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] {--PAYOUT_REQUEST_ADMIN--}','%s', U
                                );
 
                                // Generate banner order form
-                               LOAD_TEMPLATE("member_payout_form_banner", false, $content);
+                               LOAD_TEMPLATE('member_payout_form_banner', false, $content);
                        } else {
                                // Prepare content
                                $content = array(
@@ -269,7 +269,7 @@ VALUES (0, 'NEW','PAYOUT_REQUEST','[payout:] {--PAYOUT_REQUEST_ADMIN--}','%s', U
                                );
 
                                // Generate normal form
-                               LOAD_TEMPLATE("member_payout_form", false, $content);
+                               LOAD_TEMPLATE('member_payout_form', false, $content);
                        }
                } else {
                        // Not enougth points