X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=fa34df7d042891c64866fb3c7170e034014ceed3;hb=330dbb3e2b34450cd1665497506455e195a0a166;hp=6b3d1ad13f09bdc8ec33ecf0e051ab4cdd02f8a2;hpb=995488beda665a1fc3de65df95f2d1ae236d1245;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 6b3d1ad13f..fa34df7d04 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,68 +38,68 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) {
-	// Do not execute when script is in CSS mode or no daily reset
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no hourly reset
 	return;
-} elseif (!isExtensionActive('beg')) {
+} elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
 	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Get current month (2 digits)
-$curr = date('m', time());
+// 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) && (getOutputMode() != 1)) {
+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') && (getConfig('beg_userid') > 0)) {
+	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 ((getConfig('ap_inactive_since') > 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`, `email`, `gender`, `surname`, `family`, `beg_points`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='CONFIRMED'" . $whereStatement1 . " AND
+	`status`='CONFIRMED'" . $whereStatement . " AND
 	`beg_points` > 0
 ORDER BY
 	`beg_points` DESC,
 	`userid` ASC
 LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Add points to user's account directly
-			addPointsDirectly('monthly_beg', $content['userid'], $content['points']);
+			addPointsDirectly('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'], getMessage('BEG_MONTHLY_RALLYE'), $message);
+			sendEmail($content['email'], '{--BEG_MONTHLY_RALLYE--}', $message);
 		} // END - while
 
 		// Reset accounts
-		$result = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0", __FILE__, __LINE__);
+		$result = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0', __FILE__, __LINE__);
 	} // END - if
 
 	// Free memory
 	SQL_FREERESULT($result_main);
 } // END - if
 
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
+
 // [EOF]
 ?>