Legacy comments removed, description for ext-network expanded:

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 80c2558a52b32de4a5066f2f4e011bb42bdcfeb3..2b9ff117c477fa7130f3fc476e62017a78633f18 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -40,25 +40,24 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (!isExtensionActive('bonus')) {
+} elseif ((!isExtensionActive('bonus')) || (isExtensionInstalledAndOlder('bonus', '0.9.2'))) {
        return;
 }
 
 // Do not execute when script is in CSS mode
-if (getOutputMode() != 0) return;
+if (getScriptOutputMode() != 0) return;
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', time()));
+$mark = mktime(0, 0, 0, getConfig('last_month'), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
-$sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_ral_notify` ";
-switch (getConfig('bonus_active'))
-{
+$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_ral_notify` > 0 AND `bonus_ral_enable_notify` < `bonus_ral_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!
@@ -69,14 +68,14 @@ switch (getConfig('bonus_active'))
        case 'N': // Active rallye is deactivated
                if (getConfig('bonus_disable_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= ' > 0 AND `bonus_ral_disable_notify` < `bonus_ral_enable_notify`';
+                       $sql .= ' > 0 AND `bonus_rallye_disable_notify` < `bonus_rallye_enable_notify`';
                        $mode = 'disable';
                } else {
                        // Do not notify!
                        $sql = '';
                }
                break;
-}
+} // END - switch
 
 if (!empty($sql)) {
        // The SQL command needs to be finisched here (only confirmed accounts!)
@@ -86,7 +85,7 @@ if (!empty($sql)) {
        $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
        // Generate subject line
-       $subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
+       $subject = '{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_SUBJECT--}';
 
        // Load message body for bonus mails
        $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
@@ -94,15 +93,14 @@ if (!empty($sql)) {
 
        // Check for accounts to be notified
        $result_main = SQL_QUERY($sql, __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_main) > 0) {
+       if (!SQL_HASZERONUMS($result_main)) {
                // Okay lets notify all users!
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Update account
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `bonus_ral_notify`=UNIX_TIMESTAMP(),
-       `bonus_ral_%s_notify`=UNIX_TIMESTAMP()
+       `bonus_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
        `userid`=%s
 LIMIT 1",