Wrapper getBonusRanks() more used

[mailer.git] / inc / monthly / monthly_bonus.php

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index a4b8f85652420ac6e163c4a203929edef8d6fb42..f41b0e4e9af7bced6f1c837f9c8a014b55d1cb81 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -49,24 +49,18 @@ if (!defined('__SECURITY')) {
 // Debug line
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
+if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement = "WHERE `status`='CONFIRMED'";
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
                // Okay, include last online timestamp
-               $whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
+               $whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
        } // END - if
 
-       // Add more bonus points here
-       $add = '';
-       // @TODO Rewrite this to a filter
-       if (getConfig('bonus_click_yn') == 'Y') $add .= ' + `turbo_bonus`';
-       if (getConfig('bonus_login_yn') == 'Y') $add .= ' + `login_bonus`';
-       if (getConfig('bonus_order_yn') == 'Y') $add .= ' + `bonus_order`';
-       if (getConfig('bonus_stats_yn') == 'Y') $add .= ' + `bonus_stats`';
-       if (getConfig('bonus_ref_yn')   == 'Y') $add .= ' + `bonus_ref`';
+       // Add more bonus points here by running a filter
+       $add = runFilterChain('add_bonus_points_user_columns', '');
 
        // Shall we add some entries?
        if (!empty($add)) {
@@ -75,7 +69,7 @@ if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
 
        // Run SQL string to check for accounts
        $result_main = SQL_QUERY('SELECT
-       `userid`, `email`, `gender`, `surname`, `family`, (0' . $add . ') AS `points`
+       `userid`,`email`,`gender`,`surname`,`family`, (0' . $add . ') AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 ' . $whereStatement . '
@@ -91,11 +85,12 @@ LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
                        // Make sure zero points are not mailed
                        if ($content['points'] > 0) {
                                // Add points to user's account directly
-                               addPointsDirectly('monthly_bonus', $content['userid'], $content['points']);
+                               initReferalSystem();
+                               addPointsThroughReferalSystem('monthly_bonus', $content['userid'], $content['points']);
 
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-                               sendEmail($content['email'], '{--MEMBER_MONTHLY_BONUS_WON_SUBJECT--}', $message);
+                               sendEmail($content['userid'], '{--MEMBER_MONTHLY_BONUS_WON_SUBJECT--}', $message);
                        } // END - if
                } // END - while