Several template fixes/cleanups, naming convention applied:

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index a2d715f7ead7a94bba2b33e88c61b83f20ac4c8d..80c2558a52b32de4a5066f2f4e011bb42bdcfeb3 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -56,10 +56,10 @@ $sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonu
 switch (getConfig('bonus_active'))
 {
        case 'Y': // Active rallye is activated
-               if (getConfig('bonus_en_notify') == 'Y') {
+               if (getConfig('bonus_enable_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';
+                       $sql .= '= 0 OR (`bonus_ral_notify` > 0 AND `bonus_ral_enable_notify` < `bonus_ral_disable_notify`)';
+                       $mode = 'enable';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -67,10 +67,10 @@ switch (getConfig('bonus_active'))
                break;
 
        case 'N': // Active rallye is deactivated
-               if (getConfig('bonus_di_notify') == 'Y') {
+               if (getConfig('bonus_disable_notify') == 'Y') {
                        // Okay, let's check for member accounts
-                       $sql .= ' > 0 AND `bonus_ral_di_notify` < `bonus_ral_en_notify`';
-                       $mode = 'di';
+                       $sql .= ' > 0 AND `bonus_ral_disable_notify` < `bonus_ral_enable_notify`';
+                       $mode = 'disable';
                } else {
                        // Do not notify!
                        $sql = '';
@@ -83,13 +83,13 @@ if (!empty($sql)) {
        $sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
 
        // Normal notification mails or bonus mails?
-       $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == "en") && (isExtensionActive('bonus')));
+       $sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
        // Generate subject line
        $subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
 
        // Load message body for bonus mails
-       $message = loadEmailTemplate('bonus_en_notify_body', '', '{PER}userid{PER}');
+       $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
        $receiver = ''; $userids = array();
 
        // Check for accounts to be notified
@@ -98,7 +98,8 @@ if (!empty($sql)) {
                // Okay lets notify all users!
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Update account
-                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data`
+                       SQL_QUERY_ESC("UPDATE
+       `{?_MYSQL_PREFIX?}_user_data`
 SET
        `bonus_ral_notify`=UNIX_TIMESTAMP(),
        `bonus_ral_%s_notify`=UNIX_TIMESTAMP()