X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=516e3a7ec6313f468c0ed9a3a4817cbf22511286;hb=d3ea83baa3f2607db46c26f7d8527c84b994f116;hp=950b94884e94f10cb1305e007083c13fabadcf81;hpb=71c07e991fc7f5393317f4d9adf4ecdbc26b9aa3;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 950b94884e..516e3a7ec6 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 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 *
@@ -41,43 +39,42 @@
 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.');
 	return;
 }
 
-// Get current month (2 digits)
-$curr = getMonth();
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (!isCssOutputMode())) {
+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 ((getConfig('beg_include_own') != 'Y') && (isValidUserId(getConfig('beg_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) && (getConfig('beg_active') == 'Y')) {
-			// Okay, include last online timestamp
-			$whereStatement1 .= " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
-		} // END - if
+	// Let's check if there are some points left we can pay...
+	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,
@@ -88,11 +85,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
@@ -103,5 +101,8 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 	SQL_FREERESULT($result_main);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>