Filters for configurable userid exclusion added:

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index ae706217491ef433e3b25e4ae2d24d537d6bedc2..1d697914c02f337f39427ce47a03050de68ecc5e 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -95,21 +95,21 @@ LIMIT 1",
                if (SQL_HASZERONUMS($result_ref)) {
                        // Add userid and his ref count to table
                        $result_ref = SQL_QUERY_ESC("SELECT 
-       SUM(p.`points`) AS `points`
+       SUM(`p`.`points`) AS `points`
 FROM
-       `{?_MYSQL_PREFIX?}_user_points` AS p
+       `{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
        p.userid=d.userid
 WHERE
-       d.`status`='CONFIRMED'
+       `d`.`status`='CONFIRMED'
        " . runFilterChain('user_exclusion_sql', ' ') . " AND
-       d.`max_mails` > 0 AND
-       d.`mails_confirmed` >= {?ref_payout?} AND
-       p.`ref_depth`=1 AND
-       p.`points` > 0 AND
-       d.`userid`=%s",
+       `d`.`max_mails` > 0 AND
+       `d`.`mails_confirmed` >= {?ref_payout?} AND
+       `p`.`ref_depth`=1 AND
+       `p`.`points` > 0 AND
+       `d`.`userid`=%s",
                                array(bigintval($content['userid'])), __FUNCTION__, __LINE__);
 
                        // Get points
@@ -236,24 +236,24 @@ function addReferralRallyeTopUsers ($mode, $rallye, $default=0) {
 
        // And load only limited users
        $result = SQL_QUERY_ESC("SELECT DISTINCT
-       u.`userid`,
-       u.`refs`,
-       u.`curr_points`,
-       rd.`min_users`,
-       rd.`min_prices`
+       `u`.`userid`,
+       `u`.`refs`,
+       `u`.`curr_points`,
+       `rd`.`min_users`,
+       `rd`.`min_prices`
 FROM
-       `{?_MYSQL_PREFIX?}_rallye_users` AS u
+       `{?_MYSQL_PREFIX?}_rallye_users` AS `u`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_refsystem` AS r
+       `{?_MYSQL_PREFIX?}_refsystem` AS `r`
 ON
        u.userid=r.userid
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_rallye_data` AS rd
+       `{?_MYSQL_PREFIX?}_rallye_data` AS `rd`
 ON
-       u.`rallye_id`=rd.`id`
+       `u`.`rallye_id`=r`d`.`id`
 WHERE
-       u.`rallye_id`=%s AND
-       r.`counter` > 0
+       `u`.`rallye_id`=%s AND
+       `r`.`counter` > 0
 ORDER BY
        u.refs DESC",
                array(bigintval($rallye)), __FUNCTION__, __LINE__);
@@ -273,20 +273,20 @@ ORDER BY
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT
-       p.`points`
+       `p`.`points`
 FROM
-       `{?_MYSQL_PREFIX?}_user_points` AS p
+       `{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       p.`userid`=d.`userid`
+       `p`.`userid`=`d`.`userid`
 WHERE
-       d.`userid`=%s AND
-       d.`status`='CONFIRMED'
+       `d`.`userid`=%s AND
+       `d`.`status`='CONFIRMED'
        " . runFilterChain('user_exclusion_sql', ' ') . " AND
-       p.`ref_depth`=1 AND
-       d.`max_mails` > 0 AND
-       d.`mails_confirmed` >= {?ref_payout?}
+       `p`.`ref_depth`=1 AND
+       `d`.`max_mails` > 0 AND
+       `d`.`mails_confirmed` >= {?ref_payout?}
 LIMIT 1",
                        array(bigintval($row['userid'])), __FUNCTION__, __LINE__);
 
@@ -712,21 +712,21 @@ ORDER BY
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT
-       SUM(p.`points`) AS `points`
+       SUM(`p`.`points`) AS `points`
 FROM
-       `{?_MYSQL_PREFIX?}_user_points` AS p
+       `{?_MYSQL_PREFIX?}_user_points` AS `p`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 ON
-       p.`userid`=d.`userid`
+       `p`.`userid`=`d`.`userid`
 WHERE
-       d.`status`='CONFIRMED'
+       `d`.`status`='CONFIRMED'
        " . runFilterChain('user_exclusion_sql', ' ' ) . " AND
-       d.`max_mails` > 0 AND
-       d.`mails_confirmed` >= {?ref_payout?} AND
-       p.`ref_depth`=1 AND
-       p.`points` > 0 AND
-       d.`userid`=%s
+       `d`.`max_mails` > 0 AND
+       `d`.`mails_confirmed` >= {?ref_payout?} AND
+       `p`.`ref_depth`=1 AND
+       `p`.`points` > 0 AND
+       `d`.`userid`=%s
 LIMIT 1",
                        array(bigintval($content['userid'])), __FUNCTION__, __LINE__);
 
@@ -968,14 +968,14 @@ function getReferralRallyeRefsCount ($currUserid, $oldReferralCount = '0') {
                $result_ref = SQL_QUERY_ESC("SELECT
        SUM(s.counter) AS `cnt`
 FROM
-       `{?_MYSQL_PREFIX?}_refsystem` AS s
+       `{?_MYSQL_PREFIX?}_refsystem` AS `s`
 LEFT JOIN
-       `{?_MYSQL_PREFIX?}_refdepths` AS d
+       `{?_MYSQL_PREFIX?}_refdepths` AS `d`
 ON
-       s.level=d.level
+       s.`level`=`d`.`level`
 WHERE
-       s.userid=%s AND
-       s.level=1",
+       s.`userid`=%s AND
+       s.`level`=1",
                        array(
                                bigintval($userid)
                        ), __FUNCTION__, __LINE__);