X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=c74ea9f6c53734e8dce632f95b73aa27fff4b620;hp=67fecfc51473196d2ae2dc8755c2c2ba55744277;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 67fecfc514..c74ea9f6c5 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 10/22/2005 *
- * ===================                          Last change: 10/22/2005 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_beg.php                                  *
@@ -40,24 +40,24 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (!isExtensionActive('beg')) {
+} elseif ((getScriptOutputMode() == 1) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no daily reset
+	return;
+} elseif ((!isExtensionActive('beg')) || (getConfig('beg_rallye') != 'Y')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if ((getOutputMode() == 1) || (!isResetModeEnabled()) || (getConfig('beg_rallye') != 'Y')) return;
-//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
-
 // Get current month (2 digits)
-$curr = date('m', time());
+$curr = getMonth();
 
 // Check if month is done
-if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getOutputMode() != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getConfig('beg_ranks') > 0) && (getScriptOutputMode() != 1)) {
 	// Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = '';
 
 	// Shall we exclude webmaster's own userid?
-	if ((getConfig('beg_include_own') != 'Y') && (getConfig('beg_userid') > 0)) {
+	if ((getConfig('beg_include_own') != 'Y') && (isValidUserId(getConfig('beg_userid')))) {
 		// Exclude it
 		$whereStatement1 = " AND `userid` != {?beg_userid?}";
 	} // END - if
@@ -65,7 +65,7 @@ if (($curr != getConfig('last_month')) && (getConfig('last_month') > 0) && (getC
 	// 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')) {
+		if ((getApInactiveSince() > 0) && (getConfig('beg_active') == 'Y')) {
 			// Okay, include last online timestamp
 			$whereStatement1 .= " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
 		} // END - if
@@ -84,19 +84,15 @@ ORDER BY
 	`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']);
 
-			// Translate gender/points
-			$content['gender'] = translateGender($content['gender']);
-			$content['points'] = translateComma($content['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
@@ -107,5 +103,5 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 	SQL_FREERESULT($result_main);
 } // END - if
 
-//
+// [EOF]
 ?>