X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=9e8e2d636191b7f8ce1761f574a620dd4b6614e6;hp=c663790830b35e5198ace5cb4a30c4350708f517;hb=4373e155854012d687fdfcae4c69d1a940883fab;hpb=c26f6e1ccd30d9db4bda085fa5bc377da7da3066

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index c663790830..9e8e2d6361 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Monatlicher Bonus von Klick-Verguetung           *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,8 +33,8 @@
 // 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()) || (!isMonthlyResetEnabled())) {
+	// Do not execute when script is in non-HTML mode or no hourly reset
 	return;
 } elseif (!isExtensionActive('bonus')) {
 	if (isDebugModeEnabled()) logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension ext-bonus disabled.');
@@ -50,13 +45,14 @@ if (!defined('__SECURITY')) {
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
 if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
-	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
+	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated\
 	$whereStatement = runFilterChain('user_exclusion_sql', "WHERE `status`='CONFIRMED'");
 
 	// Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
+	// @TODO Rewrite these if() blocks to a filter
 	if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
 		// Okay, include last online timestamp
-		$whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
+		$whereStatement .= ' AND (UNIX_TIMESTAMP() - `d`.`last_online`) < {?ap_inactive_since?}';
 	} // END - if
 
 	// Add more bonus points here by running a filter
@@ -68,21 +64,21 @@ if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
 	} // END - if
 
 	// Run SQL string to check for accounts
-	$result_main = SQL_QUERY('SELECT
-	`userid`,
+	$result_main = sqlQuery('SELECT
+	`d`.`userid`,
 	(0' . $add . ') AS `points`
 FROM
-	`{?_MYSQL_PREFIX?}_user_data`
+	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 ' . $whereStatement . '
 ORDER BY
 	`points` DESC,
-	`userid` ASC
+	`d`.`userid` ASC
 LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
 
 	// Some entries were found?
-	if (!SQL_HASZERONUMS($result_main)) {
+	if (!ifSqlHasZeroNums($result_main)) {
 		// Load our winners...
-		while ($content = SQL_FETCHARRAY($result_main)) {
+		while ($content = sqlFetchArray($result_main)) {
 			// Make sure zero points are not mailed
 			if ($content['points'] > 0) {
 				// Add points to user's account directly
@@ -96,7 +92,7 @@ LIMIT {?bonus_ranks?}', __FILE__, __LINE__);
 		} // END - while
 
 		// Reset all accounts
-		$result = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data`
+		$result = sqlQuery('UPDATE `{?_MYSQL_PREFIX?}_user_data`
 SET
 	`turbo_bonus`=0,
 	`login_bonus`=0,
@@ -106,7 +102,7 @@ SET
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_main);
+	sqlFreeResult($result_main);
 } // END - if
 
 // Debug line