More constant rewrites

[mailer.git] / inc / doubler_send.php

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 1fd505799d8808144097bc225d72958b3f79e67a..fe1f0262181d06a97a4d87cb8bb602ea0ead0824 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -72,7 +72,7 @@ ORDER BY d.timemark
 LIMIT %d", array($DOUBLER_POINTS, $min, 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') == "N"))) {
+if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y")) || ((SQL_NUMROWS($result_main) == getConfig('doubler_group_sent')) && (getConfig('doubler_sent_all') != "Y"))) {
        // Switch to matching SQL resource
        $result_load = $result_main;
        if ((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y")) $result_load = $result_total;
@@ -106,7 +106,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y"))
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_doubler` SET completed='Y' WHERE id=%s LIMIT 1",
                                array(bigintval($id)), __FILE__, __LINE__);
 
-                       $OK = false;
+                       $okay = false;
                        // Check for jackpot inclusion in doubling process
                        if (($jackpot > 0) && ($jackpot >= $points) && (getConfig('doubler_jackpot') == "Y")) {
                                // Subtract points from jackpot
@@ -114,20 +114,20 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y"))
                                $jackpot -= $points;
 
                                // Okay, done!
-                               $OK = true;
+                               $okay = true;
                        } // END - if
 
                        // Exclude also webmaster's ID in taking points from webmaster's account
-                       if (($user > 0) && ($user >= $points) && (!$OK) && (getConfig('doubler_uid') > 0) && ($uid != getConfig('doubler_uid'))) {
+                       if (($user > 0) && ($user >= $points) && (!$okay) && (getConfig('doubler_uid') > 0) && ($uid != getConfig('doubler_uid'))) {
                                // Add points to used points
                                SUB_POINTS("doubler_payout", getConfig('doubler_uid'), $points);
 
                                // Okay, done!
-                               $OK = true;
+                               $okay = true;
                        } // END - if
 
                        // Update doubler's account only when others are not updated
-                       if (!$OK) {
+                       if (!$okay) {
                                // Add points to used doubler points
                                UPDATE_CONFIG("doubler_used", $points, "+");
                        } // END - if
@@ -150,7 +150,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('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);
+                       SEND_EMAIL($uid, getMessage('DOUBLER_MEMBER_SUBJECT'), $msg);
                } // END - if
        } // END - while
 } // END - if