Fixes for 'Can't use function return value in write context in /foo/bar.php'

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index f7528f9063b59416534f4c29677171d3be4ef04e..b3da615f011855d1d912a81707bd71a34b910b61 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -53,7 +53,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
         array(bigintval($id)), __FILE__, __LINE__);
 
        // Do a snapshot off all user refs
-       $result_user = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+       $result_user = SQL_QUERY("SELECT userid FROM `"._MYSQL_PREFIX."_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
 
        // Transfer all neccessary data to the global $DATA array
        $DATA['uid_cnt']    = SQL_NUMROWS($result_user);
@@ -100,10 +100,10 @@ function RALLYE_AUTOSTART_RALLYES($result)
                        // Add userid and his ref count to table
                        $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
 FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
- array($_CONFIG['ref_payout'], bigintval($uid)), __FILE__, __LINE__);
+ array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
                        list($cpoints) = SQL_FETCHROW($result_ref);
                        SQL_FREERESULT($result_ref);
 
@@ -213,10 +213,10 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
 
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
 ON p.userid=d.userid
 WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
-LIMIT 1", array(bigintval($uid), $_CONFIG['ref_payout']), __FILE__, __LINE__);
+LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
@@ -476,7 +476,7 @@ function RALLYE_LOAD_USER_DATA($uids_array)
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
-       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
        while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
@@ -519,7 +519,7 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
        global $_CONFIG;
 
        // Fix zero points to 0.00000
-       if ($_CONFIG['ref_payout'] == "0") $_CONFIG['ref_payout'] = "0.00000";
+       if (getConfig('ref_payout') == "0") $_CONFIG['ref_payout'] = "0.00000";
 
        // Init multi array
        $users = array(
@@ -539,10 +539,10 @@ function RALLYE_LOAD_USERS_ARRAY($rallye)
                // Points of ref's
                $result_ref = SQL_QUERY_ESC("SELECT DISTINCT SUM(p.points)
 FROM "._MYSQL_PREFIX."_user_points AS p
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS d
 ON p.userid=d.userid
 WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
-                       array($_CONFIG['ref_payout'], bigintval($uid)), __FILE__, __LINE__);
+                       array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
                list($refpoints) = SQL_FETCHROW($result_ref);
                SQL_FREERESULT($result_ref);
 
@@ -596,7 +596,7 @@ function RALLYE_LIST_WINNERS($rallye,$default=0)
                // Check status
                //   active = 1: account is still confirmed
                //   active = 0: account is deleted or locked
-               $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
                 array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
                list($active) = SQL_FETCHROW($result_active);
                SQL_FREERESULT($result_active);
@@ -653,7 +653,7 @@ function RALLYE_DELETE_EXPIRED_RALLYES()
        global $DATA, $_CONFIG;
 
        // Check for expired rallyes
-       $EXPIRE = $_CONFIG['one_day'] * 3; // @TODO The hard-coded value...
+       $EXPIRE = getConfig('one_day') * 3; // @TODO The hard-coded value...
        $result_rallye = SQL_QUERY_ESC("SELECT id, title, start_time, end_time
 FROM "._MYSQL_PREFIX."_rallye_data
 WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
@@ -773,7 +773,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
 
                if ($cnt > 0) {
                        // Count cache hits
-                       if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+                       if (getConfig('cache_hits') > 0) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
                        // Remove old refs
                        //* DEBUG: */ echo "+".$cnt."/".$old."+<br />";