Mailer project continued:

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index c236c76b44acf66ef528890cfc8d9e17bb71ea80..1014e7497fed9a9bb3f83cf029ec7d5acb1bff1c 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -14,12 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,23 +39,24 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif ((!isExtensionActive('bonus')) || (isExtensionInstalledAndOlder('bonus', '0.9.2'))) {
+       // Do not execute script on missing/out-dated extension ext-bonus
+       return;
+} elseif (!isHtmlOutputMode()) {
+       // Do not execute script if not in HTML mode
        return;
 }
 
-// Do not execute when script is in CSS mode
-if (getScriptOutputMode() != 0) return;
-
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_notify` ";
+$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` ";
 switch (getConfig('bonus_active')) {
        case 'Y': // Active rallye is activated
                if (getConfig('bonus_enable_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= '= 0 OR (`bonus_rallye_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)';
+                       $sql .= '= 0 OR (`bonus_rallye_enable_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)';
                        $mode = 'enable';
                } else {
                        // Do not notify!
@@ -79,14 +78,11 @@ switch (getConfig('bonus_active')) {
 
 if (!empty($sql)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
-       $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
+       $sql .= ')' . runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'") . ' ORDER BY `last_online` ASC';
 
        // Normal notification mails or bonus mails?
        $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
-       // Generate subject line
-       $subject = '{--BONUS_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
-
        // Load message body for bonus mails
        $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
        $receiver = ''; $userids = array();
@@ -100,7 +96,6 @@ if (!empty($sql)) {
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `bonus_rallye_notify`=UNIX_TIMESTAMP(),
        `bonus_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
        `userid`=%s
@@ -113,11 +108,11 @@ LIMIT 1",
                        // Load email template and send it to the user!
                        if ($sentBonusMails === true) {
                                // Add userid to queue
-                               $userids[] = $content['userid'];
+                               array_push($userids, $content['userid']);
                        } else {
                                // Send normal notification mail to the members
                                $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
-                               sendEmail($content['email'], $subject, $message);
+                               sendEmail($content['userid'], '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message);
                        }
                } // END - while
 
@@ -130,7 +125,7 @@ LIMIT 1",
                        $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('{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}', $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if