Swapped all

[mailer.git] / inc / referral-functions.php

diff --git a/inc/referral-functions.php b/inc/referral-functions.php
index 1b95e84ee9c49cd3ee8cc1090f0e4b7e9a36923d..4bb7e4305ba065d0a2311e68ad9f3664221f207b 100644 (file)
--- a/inc/referral-functions.php
+++ b/inc/referral-functions.php
@@ -277,7 +277,7 @@ function addPointsThroughReferralSystem ($subject, $userid, $points, $refid = NU
 
                        // Maybe there's another ref?
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'points=' . $points . ',refid(var|data)=' . convertNullToZero($refid) . '|' . convertNullToZero(getUserData('refid')) . ',userid=' . $userid . ',paymentMethod=' . $paymentMethod . ',subject=' . $subject . ',ref_level=' . $GLOBALS['ref_level']);
-                       if ((isValidId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($paymentMethod == 'REFERRAL')) {
+                       if (($paymentMethod == 'REFERRAL') && (isValidId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid)) {
                                // Is _ref there?
                                if (substr($subject, -4, 4) == '_ref') {
                                        // Then remove it, no double _ref suffix!
@@ -390,29 +390,29 @@ function getUserReferralPoints ($userid, $level) {
 
        // Get refs from database
        $result = SQL_QUERY_ESC('SELECT
-       ur.`id`,
-       ur.`refid`,
-       ud.`status`,
-       ud.`last_online`,
-       ud.`mails_confirmed`,
-       ud.`emails_received`,
-       ud.`subid`
+       `ur`.`id`,
+       `ur`.`refid`,
+       `ud`.`status`,
+       `ud`.`last_online`,
+       `ud`.`mails_confirmed`,
+       `ud`.`emails_received`,
+       `ud`.`subid`
 FROM
        `{?_MYSQL_PREFIX?}_user_refs` AS `ur`
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_points` AS `up`
 ON
-       ur.`refid`=up.`userid` AND
-       (ur.`level`=0 OR ur.`level` IS NULL)
+       `ur`.`refid`=`up`.`userid` AND
+       (`ur`.`level`=0 OR `ur`.`level` IS NULL)
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_user_data` AS `ud`
 ON
-       ur.`refid`=ud.`userid`
+       `ur`.`refid`=`ud`.`userid`
 WHERE
-       ur.`userid`=%s AND
-       ur.`level`=%s
+       `ur`.`userid`=%s AND
+       `ur`.`level`=%s
 ORDER BY
-       ur.`refid` ASC',
+       `ur`.`refid` ASC',
                array(
                        bigintval($userid),
                        bigintval($level)