Rewrote reset and some extensions:

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

diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 1014e7497fed9a9bb3f83cf029ec7d5acb1bff1c..4cab32d50b64124bf35a62fc095018aa4a2481c7 100644 (file)
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -47,14 +47,14 @@ if (!defined('__SECURITY')) {
 }
 
 // Create timemark from saved month
-$mark = mktime(0, 0, 0, getLastMonth(), getDay(), getYear());
+$mark = mktime(0, 0, 0, getLastMonthly(), getDay(), getYear());
 $sql = ''; $mode = '';
 
 // Shall I sent activation or deactivation mail?
 $sql = "SELECT `userid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE (`bonus_rallye_enable_notify` ";
-switch (getConfig('bonus_active')) {
+switch (getBonusActive()) {
        case 'Y': // Active rallye is activated
-               if (getConfig('bonus_enable_notify') == 'Y') {
+               if (getBonusEnableNotify() == 'Y') {
                        // Okay, let's check for member accounts
                        $sql .= '= 0 OR (`bonus_rallye_enable_notify` > 0 AND `bonus_rallye_enable_notify` < `bonus_rallye_disable_notify`)';
                        $mode = 'enable';
@@ -65,7 +65,7 @@ switch (getConfig('bonus_active')) {
                break;
 
        case 'N': // Active rallye is deactivated
-               if (getConfig('bonus_disable_notify') == 'Y') {
+               if (getBonusDisableNotify() == 'Y') {
                        // Okay, let's check for member accounts
                        $sql .= ' > 0 AND `bonus_rallye_disable_notify` < `bonus_rallye_enable_notify`';
                        $mode = 'disable';
@@ -81,7 +81,7 @@ if (!empty($sql)) {
        $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')));
+       $sentBonusMails = ((getBonusNotifyPoints() > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
 
        // Load message body for bonus mails
        $message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
@@ -106,7 +106,7 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
 
                        // Load email template and send it to the user!
-                       if ($sentBonusMails === true) {
+                       if ($sentBonusMails === TRUE) {
                                // Add userid to queue
                                array_push($userids, $content['userid']);
                        } else {
@@ -117,7 +117,7 @@ LIMIT 1",
                } // END - while
 
                // Shall I send out bonus mails?
-               if ($sentBonusMails === true) {
+               if ($sentBonusMails === TRUE) {
                        // Okay, make array to string
                        $receiver = implode(';', $userids);
 
@@ -125,7 +125,7 @@ LIMIT 1",
                        $url = 'modules.php?module=index&amp;what=login';
 
                        // Insert mail
-                       addBonusMailToQueue('{--MEMBER_BONUS_RALLYE_' . strtoupper($mode) . '_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, getBonusNotifyPoints(), getConfig('bonus_notify_wait'), $url, 0, 'normal', SQL_NUMROWS($result_main));
                } // END - if
        } // END - if