Naming convention further applied: _ral_ is replaced by _rallye_ to make it clear...

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 80c2558a52b32de4a5066f2f4e011bb42bdcfeb3..99f47d66a7125e04b1fda182fb1c005d9320a617 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-} elseif (!isExtensionActive('bonus')) {
+} elseif ((!isExtensionActive('bonus')) || (isExtensionInstalledAndOlder('bonus', '0.9.2'))) {
        return;
 }
 
@@ -52,13 +52,12 @@ $mark = mktime(0, 0, 0, getConfig('last_month'), date('d', time()), date('Y', ti
 $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_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_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!)
@@ -101,8 +100,8 @@ if (!empty($sql)) {
                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_user_data`
 SET
-       `bonus_ral_notify`=UNIX_TIMESTAMP(),
-       `bonus_ral_%s_notify`=UNIX_TIMESTAMP()
+       `bonus_rallye_notify`=UNIX_TIMESTAMP(),
+       `bonus_rallye_%s_notify`=UNIX_TIMESTAMP()
 WHERE
        `userid`=%s
 LIMIT 1",