Fix for fix... :(

[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 120c40a65078ede93c35bd07670acf36c781ae05..763187ed6a25ceb31657524be57323d2a3a976fb 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -53,12 +53,12 @@ if ((!isExtensionActive('payout')) && (!isAdmin())) {
        return;
 } // END - if
 
-$result_depths = SQL_QUERY("SELECT level, percents FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY level", __FILE__, __LINE__);
+$result_depths = SQL_QUERY("SELECT `level`, `percents` FROM `{?_MYSQL_PREFIX?}_refdepths` ORDER BY level", __FILE__, __LINE__);
 $totalPoints = 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`='%s' LIMIT 1",
-               array(getUserId(), bigintval($content['level'])), __FILE__, __LINE__);
+               array(getMemberId(), bigintval($content['level'])), __FILE__, __LINE__);
 
        // Entry found?
        if (SQL_NUMROWS($result_points) == 1) {
@@ -71,13 +71,13 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 
        // Free result
        SQL_FREERESULT($result_points);
-}
+} // END - while
 
 // Free memory
 SQL_FREERESULT($result_depths);
 
 // Get used points
-$usedPoints = countSumTotalData(getUserId(), 'user_data', 'used_points');
+$usedPoints = countSumTotalData(getMemberId(), 'user_data', 'used_points');
 
 // Translate point into comma
 $totalPoints = ($totalPoints - $usedPoints);
@@ -87,10 +87,14 @@ if (empty($totalPoints)) $totalPoints = '0.00000';
 
 if (!isGetRequestElementSet('payout')) {
        // Load payout types
-       $result = SQL_QUERY_ESC("SELECT id, type, rate, min_points, allow_url
-FROM `{?_MYSQL_PREFIX?}_payout_types`
-WHERE %s >= min_points
-ORDER BY type ASC",
+       $result = SQL_QUERY_ESC("SELECT
+       `id`, `type`, `rate`, `min_points`, `allow_url`
+FROM
+       `{?_MYSQL_PREFIX?}_payout_types`
+WHERE
+       %s >= `min_points`
+ORDER BY
+       `type` ASC",
                array($totalPoints), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Free memory
@@ -109,7 +113,7 @@ WHERE
        p.userid = %s
 ORDER BY
        p.payout_timestamp DESC",
-                       array(getUserId()), __FILE__, __LINE__);
+                       array(getMemberId()), __FILE__, __LINE__);
                if (SQL_NUMROWS($result_payouts) > 0) {
                        // List all his requests
                        $OUT = ''; $SW = 2;
@@ -160,6 +164,9 @@ ORDER BY
 
                // Output payout list
                outputPayoutList($totalPoints);
+       } else {
+               // No payout types setup
+               loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_NO_PAYOUT_TYPES'));
        }
 } else {
        // Chedk if he can get paid by selected type
@@ -167,7 +174,7 @@ ORDER BY
                array(bigintval(getRequestElement('payout'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) == 1) {
-               // ID is valid so load the data
+               // id is valid so load the data
                $content = SQL_FETCHARRAY($result);
 
                // Calculate maximum value
@@ -190,7 +197,7 @@ ORDER BY
                                setRequestPostElement('type'         , $content['type']);
 
                                // Subtract points from member's account
-                               subtractPoints('payout', getUserId(), $points);
+                               subtractPoints('payout', getMemberId(), $points);
 
                                // Add entry to his tranfer history
                                if ($content['allow'] == 'Y') {
@@ -198,7 +205,7 @@ ORDER BY
                                        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(),
+                                               getMemberId(),
                                                bigintval(postRequestElement('payout')),
                                                bigintval(getRequestElement('payout')),
                                                postRequestElement('turl'),
@@ -207,18 +214,18 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
                                        ), __FILE__, __LINE__);
 
                                        // Load templates
-                                       $message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getUserId());
+                                       $message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId());
                                        if (getExtensionVersion('admins') >= '0.4.1') {
                                                $adm_tpl = 'admin_payout_request_banner';
                                        } else {
-                                               $message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getUserId());
+                                               $message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId());
                                        }
                                } 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(),
+                                               getMemberId(),
                                                bigintval(postRequestElement('payout')),
                                                bigintval(postRequestElement('account')),
                                                postRequestElement('bank'),
@@ -227,8 +234,8 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                        ), __FILE__, __LINE__);
 
                                        // Load templates
-                                       $message_mem = loadEmailTemplate('member_payout_request', postRequestArray(), getUserId());
-                                       $message_adm = loadEmailTemplate('admin_payout_request', postRequestArray(), getUserId());
+                                       $message_mem = loadEmailTemplate('member_payout_request', postRequestArray(), getMemberId());
+                                       $message_adm = loadEmailTemplate('admin_payout_request', postRequestArray(), getMemberId());
                                        $admin_tpl = '';
 
                                        // @TODO Rewrite this to a filter
@@ -238,13 +245,13 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                }
 
                                // Generate task
-                               createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getUserId());
+                               createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
 
                                // Send out mails
-                               sendEmail(getUserId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem);
+                               sendEmail(getMemberId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem);
 
                                // To admin(s)
-                               sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getUserId());
+                               sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getMemberId());
 
                                // Load template and output it
                                loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT'));
@@ -274,7 +281,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                        loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_POINTS_NOT_ENOUGTH'));
                }
        } else {
-               // ID is invalid
+               // id is invalid
                loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ID_INVALID'));
        }