Naming inconsistencies for userid fixed

[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 624d8e1d5c385a5549a944cfdb55509462a964c5..763187ed6a25ceb31657524be57323d2a3a976fb 100644 (file)
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.php
@@ -58,7 +58,7 @@ $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) {
@@ -77,7 +77,7 @@ while ($content = SQL_FETCHARRAY($result_depths)) {
 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);
@@ -113,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;
@@ -197,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') {
@@ -205,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'),
@@ -214,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'),
@@ -234,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
@@ -245,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'));