X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=6b97b99b4450691652279140ae71323e9f88d022;hb=1db892c666b0b70bf87cb9582eae38c95548a2ef;hp=63440b567a33a198e2963cc3f88b5777ded38934;hpb=acfb401fcf545c211ed51b8644d0965e35fdad07;p=mailer.git

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 63440b567a..6b97b99b44 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -40,10 +38,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif ((getOutputMode() == 1) || (!isResetModeEnabled())) {
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
 	// Do not execute when script is in CSS mode or no daily reset
 	return;
-} elseif ((!isExtensionActive('beg')) || (getConfig('beg_rallye') != 'Y')) {
+} elseif ((!isExtensionActive('beg')) || (!isBegRallyeEnabled())) {
 	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
@@ -52,12 +50,12 @@ if (!defined('__SECURITY')) {
 $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) && (!isCssOutputMode())) {
 	// 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 +63,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,7 +82,7 @@ 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
@@ -96,7 +94,7 @@ 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 = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `beg_points`=0.00000 WHERE `beg_points` > 0', __FILE__, __LINE__);
 	} // END - if
 
 	// Free memory