More SQL rewrites, TODO: Put all table and column names in backticks (`)

[mailer.git] / inc / doubler_send.php

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 0efe4f5bd436da73a090cfc6bcf31cf55b63a3ba..223caa39786fbb79dfff32864dc66f072f95e68d 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -57,7 +57,7 @@ if (empty($DOUBLER_UID)) $DOUBLER_UID = 0;
 $min = bigintval($_CONFIG['doubler_min'] * 2);
 $result_total = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark
 FROM "._MYSQL_PREFIX."_doubler AS d
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS u
 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark", array($DOUBLER_POINTS, $min), __FILE__, __LINE__);
@@ -65,7 +65,7 @@ ORDER BY d.timemark", array($DOUBLER_POINTS, $min), __FILE__, __LINE__);
 // Check for accounts with limitation
 $result_main = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote_ip, d.timemark
 FROM "._MYSQL_PREFIX."_doubler AS d
-LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
+LEFT JOIN `"._MYSQL_PREFIX."_user_data` AS u
 ON d.userid=u.userid
 WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed='N' AND d.is_ref='N'
 ORDER BY d.timemark
@@ -90,7 +90,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                                // Referal points found so add them and set line(s) to completed='Y'
                                $points += $ref;
                                $result_ref = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_doubler SET completed='Y' WHERE refid=%s AND completed='N' AND is_ref='Y'",
-                                array(bigintval($uid)), __FILE__, __LINE__);
+                                       array(bigintval($uid)), __FILE__, __LINE__);
                        } else {
                                // No referal points found
                                $ref = 0;
@@ -99,12 +99,12 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                        // Exclude webmaster from doubling...
                        if ($uid != $_CONFIG['doubler_uid']) {
                                // Add points
-                               ADD_POINTS_REFSYSTEM($uid, $points, false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM(sprintf("doubler_%s", strtolower($_CONFIG['doubler_send_mode'])), $uid, $points, false, "0", false, "direct");
                        } // END - if
 
                        // Set entry as "payed"
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_doubler SET completed='Y' WHERE id=%s LIMIT 1",
-                        array(bigintval($id)), __FILE__, __LINE__);
+                               array(bigintval($id)), __FILE__, __LINE__);
 
                        $OK = false;
                        // Check for jackpot inclusion in doubling process
@@ -120,7 +120,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                        // Exclude also webmaster's ID in taking points from webmaster's account
                        if (($user > 0) && ($user >= $points) && (!$OK) && ($_CONFIG['doubler_uid'] > 0) && ($uid != $_CONFIG['doubler_uid'])) {
                                // Add points to used points
-                               SUB_POINTS($_CONFIG['doubler_uid'], $points);
+                               SUB_POINTS("doubler_payout", $_CONFIG['doubler_uid'], $points);
 
                                // Okay, done!
                                $OK = true;