X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=172d4427e63dd5d09476888c185821172599f8f8;hb=f2edf32502b2774dc17ef419a2e6a1c60e361c0a;hp=43f6a24111ab09193fc828cb510fec6531fdd5d2;hpb=7831e749e7590c640837bda20512fd6dbc5bb966;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 43f6a24111..172d4427e6 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.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 *
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
-	// Do not execute when script is in CSS mode or no daily reset
+	// Do not execute when script is in CSS mode or no hourly reset
 	return;
 } elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
 	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
@@ -52,30 +52,30 @@ if (!defined('__SECURITY')) {
 // Check if month is done
 if ((getBegRanks() > 0) && (!isCssOutputMode())) {
 	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
-	$whereStatement1 = '';
+	$whereStatement = '';
 
 	// Shall we exclude webmaster's own userid?
 	if ((!isBegIncludeOwnEnabled()) && (isValidUserId(getBegUserid()))) {
 		// Exclude it
-		$whereStatement1 = " AND `userid` != {?beg_userid?}";
+		$whereStatement .= ' AND `userid` != {?beg_userid?}';
 	} // END - if
 
 	// Let's check if there are some points left we can pay...
-	if (isExtensionActive('autopurge')) {
-		// Use last online stamp only when autopurge for inactive members is activated
-		if ((getApInactiveSince() > 0) && (isBegActiveEnabled())) {
-			// Okay, include last online timestamp
-			$whereStatement1 .= " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
-		} // END - if
+	if ((isExtensionActive('autopurge')) && (isBegActiveEnabled()) && ((getApInactiveSince() > 0))) {
+		// Okay, include last online timestamp
+		$whereStatement .= ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}';
 	} // END - if
 
 	// SQL string to check for accounts
 	$result_main = SQL_QUERY("SELECT
-	`userid`, `email`, `gender`, `surname`, `family`, `beg_points` AS points
+	`userid`,
+	`beg_points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='CONFIRMED'" . $whereStatement1 . " AND
+	`status`='CONFIRMED'
+	" . $whereStatement . "
+	" . runFilterChain('user_exclusion_sql', ' ') . " AND
 	`beg_points` > 0
 ORDER BY
 	`beg_points` DESC,
@@ -86,11 +86,12 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Add points to user's account directly
-			addPointsDirectly('monthly_beg', $content['userid'], $content['points']);
+			initReferralSystem();
+			addPointsThroughReferralSystem('monthly_beg', $content['userid'], $content['beg_points']);
 
 			// Load email template and email it away
 			$message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
-			sendEmail($content['email'], '{--BEG_MONTHLY_RALLYE--}', $message);
+			sendEmail($content['userid'], '{--BEG_MONTHLY_RALLYE--}', $message);
 		} // END - while
 
 		// Reset accounts