X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmonthly%2Fmonthly_beg.php;h=eeabf6493ceedaa29d94fa0bf1e69dac60277349;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hp=3b16482c33e36e4f0152358a7178a534a5b12fa4;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 3b16482c33..eeabf6493c 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Monatliche Bettelrallye                          *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -67,31 +62,24 @@ if ((getBegRanks() > 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
-
 	// SQL string to check for accounts
-	$result_main = SQL_QUERY("SELECT
+	$result_main = sqlQuery("SELECT
 	`d`.`userid`,
 	`d`.`beg_points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
 	`d`.`status`='CONFIRMED'
-	" . $whereStatement . "
-	" . runFilterChain('user_exclusion_sql', ' ') . " AND
+	" . runFilterChain('user_exclusion_sql', $whereStatement) . " AND
 	`d`.`beg_points` > 0
 ORDER BY
 	`d`.`beg_points` DESC,
 	`d`.`userid` ASC
 LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
-	if (!SQL_HASZERONUMS($result_main)) {
+	if (!ifSqlHasZeroNumRows($result_main)) {
 		// Load our winners...
-		while ($content = SQL_FETCHARRAY($result_main)) {
+		while ($content = sqlFetchArray($result_main)) {
 			// Add points to user's account directly
 			initReferralSystem();
 			addPointsThroughReferralSystem('monthly_beg', $content['userid'], $content['beg_points']);
@@ -102,11 +90,11 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 		} // END - while
 
 		// Reset accounts
-		$result = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0', __FILE__, __LINE__);
+		$result = sqlQuery('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0', __FILE__, __LINE__);
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result_main);
+	sqlFreeResult($result_main);
 } // END - if
 
 // Debug line