More fixes, thanks to Piter01

[mailer.git] / inc / doubler_send.php

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 8df3d834dc4a8f598b5a4d121cd0c59cbe1f2753..fd5d61d29a676c9f30fb3f5bc85a792f2cffe661 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -45,7 +45,7 @@ $DOUBLER_POINTS = DOUBLER_GET_TOTAL_POINTS_LEFT();
 if ($DOUBLER_POINTS == 0) {
        // Exit here to prevent some SQL errors (SQL_QUERY_ESC doen't insert zeros! We need to fix this...)
        return;
-}
+} // END - if
 
 // If not currently doubled set it to zero
 unset($_GET['DOUBLER_UID']);
@@ -71,6 +71,7 @@ WHERE u.status='CONFIRMED' AND d.points <= %s AND d.points >= %s AND d.completed
 ORDER BY d.timemark
 LIMIT %d", array($DOUBLER_POINTS, $min, $_CONFIG['doubler_max_sent']), __FILE__, __LINE__);
 
+// Do we have entries found?
 if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y")) || ((SQL_NUMROWS($result_main) == $_CONFIG['doubler_group_sent']) && ($_CONFIG['doubler_sent_all'] == "N"))) {
        // Switch to matching SQL resource
        $result_load = $result_main;
@@ -89,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;
@@ -98,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
@@ -119,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;
@@ -129,7 +130,7 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                        if (!$OK) {
                                // Add points to used doubler points
                                UPDATE_CONFIG("doubler_used", $points, "+");
-                       }
+                       } // END - if
 
                        // Update variables to prevent errors
                        $_CONFIG['doubler_used'] += $points;
@@ -150,9 +151,9 @@ if (((SQL_NUMROWS($result_total) > 0) && ($_CONFIG['doubler_sent_all'] == "Y"))
                        // Load mail template and send mail away...
                        $msg = LOAD_EMAIL_TEMPLATE("member_doubler", $content, $uid);
                        SEND_EMAIL($uid, DOUBLER_MEMBER_SUBJECT, $msg);
-               }
-       }
-}
+               } // END - if
+       } // END - while
+} // END - if
 
 // Free memory
 SQL_FREERESULT($result_total);