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 0bc9f191ec2bce77a58f324fd3c7cbe55929662d..80c2558a52b32de4a5066f2f4e011bb42bdcfeb3 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,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 = '';
@@ -66,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 = '';
@@ -82,14 +83,14 @@ 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}');
-       $RECEIVER = ''; $UIDs = array();
+       $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
+       $receiver = ''; $userids = array();
 
        // Check for accounts to be notified
        $result_main = SQL_QUERY($sql, __FILE__, __LINE__);
@@ -97,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()
@@ -112,7 +114,7 @@ LIMIT 1",
                        // Load email template and send it to the user!
                        if ($sentBonusMails === true) {
                                // Add userid to queue
-                               $UIDs[] = $content['userid'];
+                               $userids[] = $content['userid'];
                        } else {
                                // Send normal notification mail to the members
                                $message = loadEmailTemplate('bonus_' . $mode . '_notify', $content, $content['userid']);
@@ -123,13 +125,13 @@ LIMIT 1",
                // Shall I send out bonus mails?
                if ($sentBonusMails === true) {
                        // Okay, make array to string
-                       $RECEIVER = implode(';', $UIDs);
+                       $receiver = implode(';', $userids);
 
                        // Prepare URL
-                       $URL = 'modules.php?module=index&amp;what=login';
+                       $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($subject, $message, $receiver, getConfig('bonus_notify_points'), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if