New-line added

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index edd37ab9176c3770b4849c8955659a8bd4bd9e9d..5f0cee83710322b70382d8a5a593e2fdb0abfc4e 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/22/2005 *
- * ===============                              Last change: 11/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 11/22/2005 *
+ * ===================                          Last change: 11/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : bonus_mails.php                                  *
@@ -57,7 +57,7 @@ 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!
@@ -68,7 +68,7 @@ switch (getConfig('bonus_active'))
        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!
@@ -89,7 +89,7 @@ if (!empty($sql)) {
 
        // Load message body for bonus mails
        $message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}');
-       $RECEIVER = ''; $UIDs = array();
+       $receiver = ''; $userids = array();
 
        // Check for accounts to be notified
        $result_main = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -98,18 +98,24 @@ if (!empty($sql)) {
                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
+SET
+       `bonus_ral_notify`=UNIX_TIMESTAMP(),
+       `bonus_ral_%s_notify`=UNIX_TIMESTAMP()
+WHERE
+       `userid`=%s
 LIMIT 1",
-                       array(time(), $mode, time(), $content['userid']), __FILE__, __LINE__);
+                               array(
+                                       $mode,
+                                       $content['userid']
+                               ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
                        if ($sentBonusMails === true) {
                                // Add userid to queue
-                               $UIDs[] = $content['userid'];
+                               $userids[] = $content['userid'];
                        } else {
                                // Send normal notification mail to the members
-                               $message = loadEmailTemplate('bonus_' . $mode . '_notify', array(), $content['userid']);
+                               $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
                                sendEmail($content['email'], $subject, $message);
                        }
                } // END - while
@@ -117,13 +123,13 @@ LIMIT 1",
                // Shall I send out bonus mails?
                if ($sentBonusMails === true) {
                        // Okay, make array to string
-                       $RECEIVER = implode(';', $UIDs);
+                       $receiver = implode(';', $userids);
 
                        // Prepare URL
                        $URL = 'modules.php?module=index&amp;what=login';
 
                        // Insert mail
-                       addBonusMailToQueue($subject, $message, $RECEIVER, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
+                       addBonusMailToQueue($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $URL, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if