Extension ext-network continued:

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 5cc27ce3b207666350ad654de5fa27ffd709d581..1d4f8ad0d0d7fbee70cf08d6a5e9c1b885c29dec 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -49,7 +49,7 @@ 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'";
 
@@ -59,14 +59,8 @@ if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
                $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 . '