Naming inconsistencies for userid fixed

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

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 2bbc1eeee18add4d0906cca71ea9261e59bc5a99..777d43cc00ac54f2b309b9dcfcb78264a3c9b8e7 100644 (file)
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -52,9 +52,9 @@ if ((!isExtensionActive('transfer')) && (!isAdmin())) {
 } // END - if
 
 // Load data
 } // END - if
 
 // Load data

-if (!fetchUserData(getUserId())) {
+if (!fetchUserData(getMemberId())) {

        // Something really bad happened
        // Something really bad happened

-       debug_report_bug('No user account ' . getUserId() . ' found.');
+       debug_report_bug('No user account ' . getMemberId() . ' found.');

 } // END - if
 
 // Check for mode in GET
 } // END - if
 
 // Check for mode in GET


@@ -67,7 +67,7 @@ if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = '';
 switch ($mode) {
        case 'new': // Start new transfer
                // Get total points and subtract the balance amount from it = maximum transferable points
 switch ($mode) {
        case 'new': // Start new transfer
                // Get total points and subtract the balance amount from it = maximum transferable points

-               $total = countSumTotalData(getUserId(), 'user_points', 'points')  - countSumTotalData(getUserId(), 'user_data', 'used_points');
+               $total = countSumTotalData(getMemberId(), 'user_points', 'points')  - countSumTotalData(getMemberId(), 'user_data', 'used_points');

 
                // Remember maximum value for template
                $content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);
 
                // Remember maximum value for template
                $content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);


@@ -76,7 +76,7 @@ switch ($mode) {
                        // Add new transfer
                        if (getConfig('transfer_code') > 0) {
                                // Check for code
                        // Add new transfer
                        if (getConfig('transfer_code') > 0) {
                                // Check for code

-                               $code = generateRandomCode(getConfig('transfer_code'), postRequestElement('code_chk'), getUserId(), $content['max_transferable']);
+                               $code = generateRandomCode(getConfig('transfer_code'), postRequestElement('code_chk'), getMemberId(), $content['max_transferable']);

                                $valid_code = ($code == postRequestElement('code'));
                        } else {
                                // Zero length (= disabled) is always valid!
                                $valid_code = ($code == postRequestElement('code'));
                        } else {
                                // Zero length (= disabled) is always valid!


@@ -105,7 +105,7 @@ switch ($mode) {
                        // Re-check receivers and own personal data
                        $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email`".$add." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
                                array(
                        // Re-check receivers and own personal data
                        $result = SQL_QUERY_ESC("SELECT `userid`, `gender`, `surname`, `family`, `email`".$add." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED' LIMIT 2",
                                array(

-                                       getUserId(),
+                                       getMemberId(),

                                        bigintval(postRequestElement('to_userid'))
                                ), __FILE__, __LINE__);
 
                                        bigintval(postRequestElement('to_userid'))
                                ), __FILE__, __LINE__);
 


@@ -134,13 +134,13 @@ switch ($mode) {
                                $TEST_NICK_REC    = $content['recipient']['nickname'];
 
                                // Default is userids for subject line
                                $TEST_NICK_REC    = $content['recipient']['nickname'];
 
                                // Default is userids for subject line

-                               $SENDER = getUserId();
+                               $SENDER = getMemberId();

                                $RECIPIENT = bigintval(postRequestElement('to_userid'));
 
                                // If nickname is installed we can set the nickname
                                // @TODO Rewrite this to a filter
                                if (isExtensionActive('nickname')) {
                                $RECIPIENT = bigintval(postRequestElement('to_userid'));
 
                                // If nickname is installed we can set the nickname
                                // @TODO Rewrite this to a filter
                                if (isExtensionActive('nickname')) {

-                                       if (($TEST_NICK_SENDER != getUserId()) && (!empty($TEST_NICK_SENDER))) {
+                                       if (($TEST_NICK_SENDER != getMemberId()) && (!empty($TEST_NICK_SENDER))) {

                                                $SENDER = $content['sender']['nickname'];
                                        }
 
                                                $SENDER = $content['sender']['nickname'];
                                        }
 


@@ -154,26 +154,26 @@ switch ($mode) {
                                $content['expires'] = createFancyTime(getConfig('transfer_age'));
 
                                // Generate tranafer id
                                $content['expires'] = createFancyTime(getConfig('transfer_age'));
 
                                // Generate tranafer id

-                               $content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getUserId(), postRequestElement('reason')));
+                               $content['trans_id'] = bigintval(generateRandomCode('10', mt_rand(0, 99999), getMemberId(), postRequestElement('reason')));

 
                                // Add entries to both tables
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
 
                                // Add entries to both tables
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_in` (`userid`, `from_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",

-                                       array(bigintval(postRequestElement('to_userid')), getUserId(), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);
+                                       array(bigintval(postRequestElement('to_userid')), getMemberId(), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);

                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",
                                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_transfers_out` (`userid`, `to_userid`, `points`, `reason`, `time_trans`, `trans_id`) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP(),'%s')",

-                                       array(getUserId(), bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);
+                                       array(getMemberId(), bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')), postRequestElement('reason'), $content['trans_id']), __FILE__, __LINE__);

 
                                // Add points to account *directly* ...
                                addPointsDirectly('member_transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
 
                                // ... and add it to current user's used points
 
                                // Add points to account *directly* ...
                                addPointsDirectly('member_transfer', bigintval(postRequestElement('to_userid')), bigintval(postRequestElement('points')));
 
                                // ... and add it to current user's used points

-                               subtractPoints('transfer', getUserId(), postRequestElement('points'));
+                               subtractPoints('transfer', getMemberId(), postRequestElement('points'));

 
                                // First send email to recipient
                                $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestElement('to_userid'));
                                sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message);
 
                                // Second send email to sender
 
                                // First send email to recipient
                                $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestElement('to_userid'));
                                sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message);
 
                                // Second send email to sender

-                               $message = loadEmailTemplate('member_transfer_sender', $content, getUserId());
+                               $message = loadEmailTemplate('member_transfer_sender', $content, getMemberId());

                                sendEmail($content['sender']['email'], getMessage('TRANSFER_MEMBER_SENDER_SUBJ') . ': ' . $RECIPIENT, $message);
 
                                // At last send admin mail(s)
                                sendEmail($content['sender']['email'], getMessage('TRANSFER_MEMBER_SENDER_SUBJ') . ': ' . $RECIPIENT, $message);
 
                                // At last send admin mail(s)


@@ -217,11 +217,11 @@ switch ($mode) {
                        if (isExtensionActive('nickname')) {
                                // Load userid and nickname
                                $result = SQL_QUERY_ESC("SELECT `userid`, `nickname` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
                        if (isExtensionActive('nickname')) {
                                // Load userid and nickname
                                $result = SQL_QUERY_ESC("SELECT `userid`, `nickname` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",

-                                       array(getUserId()), __FILE__, __LINE__);
+                                       array(getMemberId()), __FILE__, __LINE__);

                        } else {
                                // Load only userid
                                $result = SQL_QUERY_ESC("SELECT `userid`, `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",
                        } else {
                                // Load only userid
                                $result = SQL_QUERY_ESC("SELECT `userid`, `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND `opt_in`='Y' AND `userid` != '%s' ORDER BY `userid` ASC",

-                                       array(getUserId()), __FILE__, __LINE__);
+                                       array(getMemberId()), __FILE__, __LINE__);

                        }
 
                        if (SQL_NUMROWS($result) > 0) {
                        }
 
                        if (SQL_NUMROWS($result) > 0) {


@@ -259,7 +259,7 @@ switch ($mode) {
                        // Generate Code
                        if (getConfig('transfer_code') > 0) {
                                $rand = mt_rand(0, 99999);
                        // Generate Code
                        if (getConfig('transfer_code') > 0) {
                                $rand = mt_rand(0, 99999);

-                               $code = generateRandomCode(getConfig('transfer_code'), $rand, getUserId(), $content['max_transferable']);
+                               $code = generateRandomCode(getConfig('transfer_code'), $rand, getMemberId(), $content['max_transferable']);

                                $img = generateImageOrCode($code, false);
                                $content['captcha_code'] = "<input type=\"hidden\" name=\"code_chk\" value=\"".$rand."\" /><input type=\"text\" name=\"code\" class=\"member_normal\" size=\"5\" maxlength=\"7\"".$content['to_disabled']." />&nbsp;" . $img;
                        } else {
                                $img = generateImageOrCode($code, false);
                                $content['captcha_code'] = "<input type=\"hidden\" name=\"code_chk\" value=\"".$rand."\" /><input type=\"text\" name=\"code\" class=\"member_normal\" size=\"5\" maxlength=\"7\"".$content['to_disabled']." />&nbsp;" . $img;
                        } else {


@@ -308,7 +308,7 @@ switch ($mode) {
 
                // Run the SQL command and set total points to zero
                $totalPoints = 0;
 
                // Run the SQL command and set total points to zero
                $totalPoints = 0;

-               $result = SQL_QUERY_ESC($sql, array(getUserId()), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC($sql, array(getMemberId()), __FILE__, __LINE__);

 
                // Do we have entries?
                if (SQL_NUMROWS($result) > 0) {
 
                // Do we have entries?
                if (SQL_NUMROWS($result) > 0) {


@@ -376,7 +376,7 @@ KEY (`party_userid`)
 
                // Let's begin with the incoming list
                $result = SQL_QUERY_ESC("SELECT `trans_id`, `from_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT %s",
 
                // Let's begin with the incoming list
                $result = SQL_QUERY_ESC("SELECT `trans_id`, `from_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `id` ASC LIMIT %s",

-                       array(getUserId(), getConfig('transfer_max')), __FILE__, __LINE__);
+                       array(getMemberId(), getConfig('transfer_max')), __FILE__, __LINE__);

                while ($DATA = SQL_FETCHROW($result)) {
                        $DATA[] = 'IN';
                        $DATA = implode("','", $DATA);
                while ($DATA = SQL_FETCHROW($result)) {
                        $DATA[] = 'IN';
                        $DATA = implode("','", $DATA);


@@ -388,7 +388,7 @@ KEY (`party_userid`)
 
                // As the last table transfer data from outgoing table to temporary
                $result = SQL_QUERY_ESC("SELECT `trans_id`, `to_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",
 
                // As the last table transfer data from outgoing table to temporary
                $result = SQL_QUERY_ESC("SELECT `trans_id`, `to_userid`, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `id` LIMIT {?transfer_max?}",

-                       array(getUserId()), __FILE__, __LINE__);
+                       array(getMemberId()), __FILE__, __LINE__);

                while ($DATA = SQL_FETCHROW($result)) {
                        $DATA[] = 'OUT';
                        $DATA = implode("','", $DATA);
                while ($DATA = SQL_FETCHROW($result)) {
                        $DATA[] = 'OUT';
                        $DATA = implode("','", $DATA);


@@ -458,14 +458,14 @@ KEY (`party_userid`)
 
        default: // Overview page
                // Check incoming transfers
 
        default: // Overview page
                // Check incoming transfers

-               $total = countSumTotalData(getUserId(), 'user_transfers_in', 'id', 'userid', true);
+               $total = countSumTotalData(getMemberId(), 'user_transfers_in', 'id', 'userid', true);

                $content['in_link'] = $total;
                if ($total > 0) {
                        $content['in_link'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$total."</a>";
                } // END - if
 
                // Check outgoing transfers
                $content['in_link'] = $total;
                if ($total > 0) {
                        $content['in_link'] = "<a href=\"{?URL?}/modules.php?module=login&amp;what=transfer&amp;mode=list_in\">".$total."</a>";
                } // END - if
 
                // Check outgoing transfers

-               $dmy = countSumTotalData(getUserId(), 'user_transfers_out', 'id', 'userid', true);
+               $dmy = countSumTotalData(getMemberId(), 'user_transfers_out', 'id', 'userid', true);

 
                // Add to total amount
                $total += $dmy;
 
                // Add to total amount
                $total += $dmy;


@@ -484,7 +484,7 @@ KEY (`party_userid`)
                if (isFormSent()) {
                        // Save settings
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `opt_in`='%s' WHERE `userid`=%s LIMIT 1",
                if (isFormSent()) {
                        // Save settings
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `opt_in`='%s' WHERE `userid`=%s LIMIT 1",

-                               array(postRequestElement('opt_in'), getUserId()), __FILE__, __LINE__);
+                               array(postRequestElement('opt_in'), getMemberId()), __FILE__, __LINE__);

 
                        // Rember for next switch() command
                        getUserData('opt_in') = substr(postRequestElement('opt_in'), 0, 1);
 
                        // Rember for next switch() command
                        getUserData('opt_in') = substr(postRequestElement('opt_in'), 0, 1);


@@ -524,7 +524,7 @@ ORDER BY
 LIMIT 1",
                        array(
                                getConfig('transfer_timeout'),
 LIMIT 1",
                        array(
                                getConfig('transfer_timeout'),

-                               getUserId()
+                               getMemberId()

                        ), __FILE__, __LINE__);
 
                // Do we have an entry?
                        ), __FILE__, __LINE__);
 
                // Do we have an entry?