More queries and language constants rewritten

[mailer.git] / inc / doubler_send.php

diff --git a/inc/doubler_send.php b/inc/doubler_send.php
index 02d7b56d841e949d9d53ecd8780fa8286ad3ce86..58bf1ab3e2bee4f77dc057e173669f99c25203ce 100644 (file)
--- a/inc/doubler_send.php
+++ b/inc/doubler_send.php
@@ -59,7 +59,7 @@ $result_total = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remot
 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'
+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__);
 
 // Check for accounts with limitation
@@ -67,12 +67,12 @@ $result_main = SQL_QUERY_ESC("SELECT DISTINCT d.id, d.userid, d.points, d.remote
 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'
+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__);
 
 // 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;
@@ -133,7 +133,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == "Y"))
                        } // END - if
 
                        // Update variables to prevent errors
-                       $_CONFIG['doubler_used'] += $points;
+                       incrementConfigEntry('doubler_used', $points);
                        $DOUBLER_POINTS -= $points;
 
                        // Prepare array
@@ -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