Notification mails rewritten

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 50726857f9c473296c3df3e462286b394f0b4c77..ee2e1b7b578d5b393eb7cf62db5361d69ca83ee7 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
 
 // Do not execute when script is in CSS mode
 global $CSS;
-if (($CSS == 1) || (!defined('__DAILY_RESET')))  return;
+if ($CSS == 1) return;
 
 // Create timemark from saved month
 $mark = mktime(0, 0, 0, $_CONFIG['last_month'], date("d", time()), date('Y', time()));
@@ -52,36 +52,29 @@ $SQL = "SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE (bonus_ral_n
 switch ($_CONFIG['bonus_active'])
 {
 case 'Y': // Active rallye is activated
-       if ($_CONFIG['bonus_en_notify'] == "Y")
-       {
+       if ($_CONFIG['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)";
                $MODE = "en";
-       }
-        else
-       {
+       } else {
                // Do not notify!
                $SQL = "";
        }
        break;
 
 case 'N': // Active rallye is deactivated
-       if ($_CONFIG['bonus_di_notify'] == "Y")
-       {
+       if ($_CONFIG['bonus_di_notify'] == "Y") {
                // Okay, let's check for member accounts
                $SQL .= " > 0 AND bonus_ral_di_notify < bonus_ral_en_notify";
                $MODE = "di";
-       }
-        else
-       {
+       } else {
                // Do not notify!
                $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";
 
@@ -89,8 +82,7 @@ if (!empty($SQL))
        $MAIL_MODE = (($_CONFIG['bonus_notify_points'] > 0) && ($MODE == "en") && (EXT_IS_ACTIVE("bonus")));
 
        // Generate subject line
-       $eval = "\$SUBJECT = BONUS_RALLYE_".strtoupper($MODE)."_NOTIFY;";
-       eval($eval);
+       $SUBJECT = constant('BONUS_RALLYE_'.strtoupper($MODE).'_NOTIFY');
 
        // Load message body for bonus mails
        $MSG = LOAD_EMAIL_TEMPLATE("bonus_en_notify_body", "", "{PER}uid{PER}");
@@ -98,54 +90,41 @@ if (!empty($SQL))
 
        // Check for accounts to be notified
        $result_main = SQL_QUERY($SQL, __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_main) > 0)
-       {
+       if (SQL_NUMROWS($result_main) > 0) {
                // 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 bonus_ral_notify='%s', bonus_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)
-                       {
+                       if ($MAIL_MODE) {
                                // Add userid to queue
                                $UIDs[] = $uid;
-                       }
-                        else
-                       {
+                       } else {
                                // Send normal notification mail to the members
                                $MSG = LOAD_EMAIL_TEMPLATE("bonus_".$MODE."_notify", array(), $uid);
-                               SEND_EMAIL($email, $SUBJECT, $MSG);
+                               SEND_EMAIL($uid, $SUBJECT, $MSG);
                        }
-               }
+               } // END - while
 
                // Shall I send out bonus mails?
-               if ($MAIL_MODE)
-               {
+               if ($MAIL_MODE) {
                        // Okay, make array to string
                        $RECEIVER = implode(";", $UIDs);
-                       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_bonus
-(subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, mails_sent, is_notify)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(), '%s','%s','%s','%s','Y')",
- array(
-       $SUBJECT,
-       $MSG,
-       $RECEIVER,
-       $_CONFIG['bonus_notify_points'],
-       $_CONFIG['bonus_notify_wait'],
-       URL."/modules.php?module=index&what=login",
-       0,
-       SELECTION_COUNT(explode(";", $RECEIVER)),
-       SQL_NUMROWS($result_main),
-), __FILE__, __LINE__);
-               }
-       }
+
+                       // Prepare URL
+                       $url = URL."/modules.php?module=index&what=login";
+
+                       // Insert mail
+                       ADD_BONUS_MAIL_TO_QUEUE($SUBJECT, $MSG, $RECEIVER, $_CONFIG['bonus_notify_points'], $_CONFIG['bonus_notify_wait'], $url, 0, "normal", SQL_NUMROWS($result_main));
+               } // END - if
+       } // END - if
 
        // Free memory
        SQL_FREERESULT($result_main);
-}
+} // END - if
+
 //
 ?>