Several minor rewrites, getter GET_JACKPOT_POINTS() added

[mailer.git] / inc / doubler_send.php

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index cc34bddfedb5cf7b6facae0e50f4d4a2d05d25b8..7e40aaa6d5939253cbe5ea0d7f8e1a6f0dc3dd23 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -53,19 +53,22 @@ if ($DOUBLER_POINTS == 0) {
 } // END - if
 
 // If not currently doubled set it to zero
-unset($_GET['DOUBLER_UID']);
-unset($_POST['DOUBLER_UID']);
+REQUEST_UNSET_GET('DOUBLER_UID');
+REQUEST_UNSET_POST('DOUBLER_UID');
 setSession('DOUBLER_UID', '');
 if (empty($GLOBALS['doubler_uid'])) $GLOBALS['doubler_uid'] = 0;
 
 // Check for doubles which we can pay out
-$min = getConfig(('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
 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__);
+ORDER BY d.timemark",
+       array(
+               $DOUBLER_POINTS,
+               getConfig(('doubler_min') * 2)
+       ), __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
@@ -74,7 +77,12 @@ 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
-LIMIT %d", array($DOUBLER_POINTS, $min, getConfig('doubler_max_sent')), __FILE__, __LINE__);
+LIMIT %d",
+       array(
+               $DOUBLER_POINTS,
+               getConfig(('doubler_min') * 2),
+               getConfig('doubler_max_sent')
+       ), __FILE__, __LINE__);
 
 // Do we have entries found?
 if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y')) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != 'Y'))) {
@@ -87,15 +95,16 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                // Only double when points are enougth!
                if ($DOUBLER_POINTS >= $content['points']) {
                        // Check for his ref points
-                       $ref = GET_TOTAL_DATA($content['userid'], 'doubler', 'points', 'refid', false, " AND completed='N' AND is_ref='Y'");
+                       $ref = GET_TOTAL_DATA($content['userid'], 'doubler', 'points', 'refid', false, " AND `completed`='N' AND `is_ref`='Y'");
 
                        // Zero refid when empty (might be helpful!)
                        if (empty($ref)) $ref = 0;
+
                        if (($ref > 0) && ($GLOBALS['doubler_uid'] == $content['userid']) && (!empty($ref))) {
                                // Referal points found so add them and set line(s) to completed='Y'
                                $content['points'] += $ref;
-                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE refid=%s AND completed='N' AND is_ref='Y'",
-                               array(bigintval($content['userid'])), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET `completed`='Y' WHERE `refid`=%s AND `completed`='N' AND `is_ref`='Y'",
+                                       array(bigintval($content['userid'])), __FILE__, __LINE__);
                        } else {
                                // No referal points found
                                $ref = 0;
@@ -108,10 +117,11 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        } // END - if
 
                        // Set entry as "payed"
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE `id`=%s LIMIT 1",
-                       array(bigintval($content['id'])), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET `completed`='Y' WHERE `id`=%s LIMIT 1",
+                               array(bigintval($content['id'])), __FILE__, __LINE__);
 
                        $okay = false;
+
                        // Check for jackpot inclusion in doubling process
                        if (($jackpot > 0) && ($jackpot >= $content['points']) && (getConfig('doubler_jackpot') == 'Y')) {
                                // Subtract points from jackpot
@@ -123,16 +133,16 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
                        } // END - if
 
                        // Exclude also webmaster's ID in taking points from webmaster's account
-                       if (($user > 0) && ($user >= $content['points']) && (!$okay) && (getConfig('doubler_uid') > 0) && ($content['userid'] != getConfig('doubler_uid'))) {
+                       if (($user > 0) && ($user >= $content['points']) && ($okay === false) && (getConfig('doubler_uid') > 0) && ($content['userid'] != getConfig('doubler_uid'))) {
                                // Add points to used points
-                               SUB_POINTS("doubler_payout", getConfig('doubler_uid'), $content['points']);
+                               SUB_POINTS('doubler_payout', getConfig('doubler_uid'), $content['points']);
 
                                // Okay, done!
                                $okay = true;
                        } // END - if
 
                        // Update doubler's account only when others are not updated
-                       if (!$okay) {
+                       if ($okay === false) {
                                // Add points to used doubler points
                                updateConfiguration('doubler_used', $content['points'], '+');
                        } // END - if
@@ -143,19 +153,19 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 
                        // Prepare array
                        $content = array(
-                       // Doubler transmission ID
+                               // Doubler transmission ID
                                'id'     => $content['id'],
-                       // Doubled points
+                               // Doubled points
                                'points' => translateComma($content['points']),
-                       // Timemark
+                               // Timemark
                                'when'   => generateDateTime($content['timemark'], '2'),
-                       // IP number when the member submitted the doubling form
+                               // IP number when the member submitted the doubling form
                                'ip'     => $content['remote_ip'],
                        );
 
                        // Load mail template and send mail away...
-                       $msg = LOAD_EMAIL_TEMPLATE("member_doubler", $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('DOUBLER_MEMBER_SUBJECT'), $msg);
+                       $message = LOAD_EMAIL_TEMPLATE('member_doubler', $content, $content['userid']);
+                       sendEmail($content['userid'], getMessage('DOUBLER_MEMBER_SUBJECT'), $message);
                } // END - if
        } // END - while
 } // END - if