More improved SQL queries

[mailer.git] / inc / mails / beg_mails.php

diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 2d37118b0d145ca0290ea6cb39e809e8fd7f9ee4..5fa921256436733246ac8bcd705b841a94be5c00 100644 (file)
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -44,15 +44,15 @@ global $CSS;
 if ($CSS == 1) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, $_CONFIG['last_month'], date("d", time()), date('Y', time()));
+$mark = mktime(0, 0, 0, getConfig('last_month'), date("d", time()), date('Y', time()));
 $SQL = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
-$SQL = "SELECT userid, email FROM `"._MYSQL_PREFIX."_user_data` WHERE (beg_ral_notify ";
-switch ($_CONFIG['beg_rallye'])
+$SQL = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (beg_ral_notify ";
+switch (getConfig('beg_rallye'))
 {
-case 'Y': // Begging rallye is activated
-       if ($_CONFIG['beg_ral_en_notify'] == "Y")
+case "Y": // Begging rallye is activated
+       if (getConfig('beg_ral_en_notify') == "Y")
        {
                // Okay, let's check for member accounts
                $SQL .= "= 0 OR (beg_ral_notify > 0 AND beg_ral_en_notify < beg_ral_di_notify)";
@@ -65,8 +65,8 @@ case 'Y': // Begging rallye is activated
        }
        break;
 
-case 'N': // Begging rallye is deactivated
-       if ($_CONFIG['beg_ral_di_notify'] == "Y")
+case "N": // Begging rallye is deactivated
+       if (getConfig('beg_ral_di_notify') == "Y")
        {
                // Okay, let's check for member accounts
                $SQL .= " > 0 AND beg_ral_di_notify < beg_ral_en_notify";
@@ -82,13 +82,13 @@ case 'N': // Begging rallye is deactivated
 
 if (!empty($SQL)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
-       $SQL .= ") AND status='CONFIRMED' ORDER BY last_online ASC";
+       $SQL .= ") AND `status`='CONFIRMED' ORDER BY last_online ASC";
 
        // Prepare data for the template
-       define('__BEG_MIN_POINTS' , TRANSLATE_COMMA($_CONFIG['beg_points']));
-       define('__BEG_MAX_POINTS' , TRANSLATE_COMMA($_CONFIG['beg_points_max']));
-       define('__BEG_MAX_WINNERS', round($_CONFIG['beg_ranks']));
-       if ($_CONFIG['beg_ip_timeout'] == 0)
+       define('__BEG_MIN_POINTS' , TRANSLATE_COMMA(getConfig('beg_points')));
+       define('__BEG_MAX_POINTS' , TRANSLATE_COMMA(getConfig('beg_points_max')));
+       define('__BEG_MAX_WINNERS', round(getConfig('beg_ranks')));
+       if (getConfig('beg_ip_timeout') == 0)
        {
                // No IP locking setuped!
                define('__BEG_IP_LOCKER', BEG_NO_LIMITATION);
@@ -96,14 +96,14 @@ if (!empty($SQL)) {
         else
        {
                // Create timemark
-               define('__BEG_IP_LOCKER', CREATE_FANCY_TIME($_CONFIG['beg_ip_timeout']));
+               define('__BEG_IP_LOCKER', CREATE_FANCY_TIME(getConfig('beg_ip_timeout')));
        }
 
        // Check for accounts to be notified
        $result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                // Normal notification mails or bonus mails?
-               $MAIL_MODE = (($_CONFIG['beg_notify_bonus'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
+               $MAIL_MODE = ((getConfig('beg_notify_bonus') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
                // Generate subject line
                $SUBJECT = constant('BEG_RALLYE_'.strtoupper($MODE).'_NOTIFY');
@@ -113,11 +113,13 @@ if (!empty($SQL)) {
                $RECEIVER = ""; $UIDs = array();
 
                // Okay lets notify all users!
-               while(list($uid, $email) = SQL_FETCHROW($result_main)) {
+               while (list($uid, $email) = SQL_FETCHROW($result_main)) {
                        // Update account
-                       $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
-SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
- array(time(), $MODE, time(), $uid), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+SET beg_ral_notify='%s', beg_ral_%s_notify='%s'
+WHERE userid=%s
+LIMIT 1",
+                               array(time(), $MODE, time(), $uid), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
                        if ($MAIL_MODE) {
@@ -136,10 +138,10 @@ SET beg_ral_notify='%s', beg_ral_%s_notify='%s' WHERE userid=%s LIMIT 1",
                        $RECEIVER = implode(";", $UIDs);
 
                        // Prepare URL
-                       $url = URL."/modules.php?module=index&what=login";
+                       $URL = "modules.php?module=index&amp;what=login";
 
                        // Insert mail
-                       ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, $_CONFIG['beg_notify_bonus'], $_CONFIG['beg_notify_wait'], $url, 0, "normal", SQL_NUMROWS($result_main));
+                       ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, getConfig('beg_notify_bonus'), getConfig('beg_notify_wait'), $URL, 0, "normal", SQL_NUMROWS($result_main));
                } // END - if
        } // END - if