Even more variables renamed and login procedure prepared for filter

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index ff07609ab54c7bdf1b1fddb4186b102ef78a116d..daae83b501bc66d1860e05c3f4b165f81f30a048 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Versendet Erinnerungsmails                       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -44,74 +49,74 @@ if ($GLOBALS['output_mode'] == 1) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, getConfig('last_month'), date("d", time()), date('Y', time()));
-$SQL = ""; $MODE = "";
+$sql = ""; $MODE = "";
 
 // Shall I sent activation or deactivation mail?
-$SQL = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (bonus_ral_notify ";
+$sql = "SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE (bonus_ral_notify ";
 switch (getConfig('bonus_active'))
 {
 case "Y": // Active rallye is activated
        if (getConfig('bonus_en_notify') == "Y") {
                // Okay, let's check for member accounts
-               $SQL .= "= 0 OR (bonus_ral_notify > 0 AND bonus_ral_en_notify < bonus_ral_di_notify)";
+               $sql .= "= 0 OR (bonus_ral_notify > 0 AND bonus_ral_en_notify < bonus_ral_di_notify)";
                $MODE = "en";
        } else {
                // Do not notify!
-               $SQL = "";
+               $sql = "";
        }
        break;
 
 case "N": // Active rallye is deactivated
        if (getConfig('bonus_di_notify') == "Y") {
                // Okay, let's check for member accounts
-               $SQL .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
+               $sql .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
                $MODE = "di";
        } else {
                // Do not notify!
-               $SQL = "";
+               $sql = "";
        }
        break;
 }
 
-if (!empty($SQL)) {
+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";
 
        // Normal notification mails or bonus mails?
-       $MAIL_MODE = ((getConfig('bonus_notify_points') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
+       $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
        // Generate subject line
-       $SUBJECT = constant('BONUS_RALLYE_'.strtoupper($MODE).'_NOTIFY');
+       $subject = constant('BONUS_RALLYE_'.strtoupper($MODE).'_NOTIFY');
 
        // Load message body for bonus mails
-       $MSG = LOAD_EMAIL_TEMPLATE("bonus_en_notify_body", "", "{PER}uid{PER}");
+       $message = LOAD_EMAIL_TEMPLATE("bonus_en_notify_body", "", "{PER}uid{PER}");
        $RECEIVER = ""; $UIDs = array();
 
        // Check for accounts to be notified
-       $result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
+       $result_main = SQL_QUERY($sql, __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                // Okay lets notify all users!
-               while (list($uid, $email) = SQL_FETCHROW($result_main)) {
+               while ($content = SQL_FETCHARRAY($result_main)) {
                        // Update account
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET bonus_ral_notify='%s', bonus_ral_%s_notify='%s'
 WHERE userid=%s
 LIMIT 1",
-                               array(time(), $MODE, time(), $uid), __FILE__, __LINE__);
+                               array(time(), $MODE, time(), $content['userid']), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
-                       if ($MAIL_MODE) {
+                       if ($sentBonusMails === true) {
                                // Add userid to queue
-                               $UIDs[] = $uid;
+                               $UIDs[] = $content['userid'];
                        } else {
                                // Send normal notification mail to the members
-                               $MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $uid);
-                               SEND_EMAIL($uid, $SUBJECT, $MSG);
+                               $message = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $content['userid']);
+                               SEND_EMAIL($content['email'], $subject, $message);
                        }
                } // END - while
 
                // Shall I send out bonus mails?
-               if ($MAIL_MODE) {
+               if ($sentBonusMails === true) {
                        // Okay, make array to string
                        $RECEIVER = implode(";", $UIDs);
 
@@ -119,7 +124,7 @@ LIMIT 1",
                        $URL = "modules.php?module=index&amp;what=login";
 
                        // Insert mail
-                       ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, "normal", SQL_NUMROWS($result_main));
+                       ADD_BONUS_MAIL_TO_QUEUE($subject, $message, $RECEIVER, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, "normal", SQL_NUMROWS($result_main));
                } // END - if
        } // END - if