X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=eb640a1bac8ae30cfbc5c5092b7702a69aa5c710;hb=3fde507d3c67e007a83dde7eb3b35746ed5e868b;hp=5cc27ce3b207666350ad654de5fa27ffd709d581;hpb=63044571585ba4535feef1ed3216b4d43d630990;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 5cc27ce3b2..eb640a1bac 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -38,20 +38,20 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-	// Do not execute when script is in CSS mode or no hourly reset
+} elseif ((!isHtmlOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in non-HTML mode or no hourly reset
 	return;
 } elseif (!isExtensionActive('bonus')) {
-	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
+	if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.');
 	return;
 }
 
 // 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'";
+	$whereStatement = runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'");
 
 	// Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
 	if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
@@ -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,8 @@ 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`,
+	(0' . $add . ') AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 ' . $whereStatement . '
@@ -91,8 +86,8 @@ LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
 			// Make sure zero points are not mailed
 			if ($content['points'] > 0) {
 				// Add points to user's account directly
-				initReferalSystem();
-				addPointsThroughReferalSystem('monthly_bonus', $content['userid'], $content['points']);
+				initReferralSystem();
+				addPointsThroughReferralSystem('monthly_bonus', $content['userid'], $content['points']);
 
 				// Load email template and email it away
 				$message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));