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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 129d4b8d17..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 *
@@ -60,12 +55,6 @@ if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
 		$whereStatement .= ' AND (UNIX_TIMESTAMP() - `d`.`last_online`) < {?ap_inactive_since?}';
 	} // END - if
 
-	// Is ext-holiday installed?
-	if (isExtensionActive('holiday')) {
-		// Exclude those as well
-		$whereStatement .= " AND `d`.`holiday_active`='N'";
-	} // END - if
-
 	// Add more bonus points here by running a filter
 	$add = runFilterChain('add_bonus_points_user_columns', '');
 
@@ -75,21 +64,21 @@ if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
 	} // END - if
 
 	// Run SQL string to check for accounts
-	$result_main = SQL_QUERY('SELECT
+	$result_main = sqlQuery('SELECT
 	`d`.`userid`,
 	(0' . $add . ') AS `points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 ' . $whereStatement . '
 ORDER BY
-	`d`.`points` DESC,
+	`points` DESC,
 	`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
@@ -103,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,
@@ -113,7 +102,7 @@ SET
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_main);
+	sqlFreeResult($result_main);
 } // END - if
 
 // Debug line