X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_beg.php;h=be310f4d047ba26fa8c4102d4a01607ffdf36a1e;hp=7b5780dfb66df35169f5dfabd3ab80b9424fde24;hb=e521a48cf5d2a3090bd8d7a9cb21dfbc2dfda257;hpb=75ad748a68473ace540251427a74fb781b1145e9

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 7b5780dfb6..be310f4d04 100644
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -32,63 +32,58 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
 	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
 	return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+if (($CSS == 1) || (!isBooleanConstantAndTrue('__DAILY_RESET')) || ($_CONFIG['beg_rallye'] == "N")) return;
 
 // Get current month (2 digits)
 $curr = date("m", time());
 
 // Check if month is done
-if (($curr != $CONFIG['beg_month']) && ($CONFIG['beg_month'] > 0) && ($CONFIG['beg_ranks'] > 0) && ($CSS != 1))
+if (($curr != $_CONFIG['last_month']) && ($_CONFIG['last_month'] > 0) && ($_CONFIG['beg_ranks'] > 0) && ($CSS != 1))
 {
 	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
-	$WHERE1 = "";
-	$WHERE2 = 0;
-	$WHERE3 = bigintval($CONFIG['beg_ranks']);
+	$whereStatement1 = "";
+	$whereStatement2 = bigintval($_CONFIG['beg_ranks']);
 
 	// Let's check if there are some points left we can "pay"...
 	if (EXT_IS_ACTIVE("autopurge"))
 	{
 		// Use last online stamp only when autopurge for inactive members is activated
-		if (($CONFIG['ap_in_since'] > 0) && ($CONFIG['beg_active'] == "Y"))
+		if (($_CONFIG['ap_inactive_since'] > 0) && ($_CONFIG['beg_active'] == "Y"))
 		{
 			// Okay, include last online timestamp
-			$WHERE1 = "AND last_online >=";
-			$WHERE2 = bigintval(time() - $CONFIG['ap_in_since']);
-			$WHERE3 = bigintval($CONFIG['beg_ranks']);
+			$whereStatement1 = sprintf("AND last_online >= (UNIX_TIMESTAMP() - %s)", bigintval($_CONFIG['ap_inactive_since']));;
+			$whereStatement2 = bigintval($_CONFIG['beg_ranks']);
 		}
 	}
 
 	// SQL string to check for accounts
 	$result_main = SQL_QUERY_ESC("SELECT userid, email, beg_points
-FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' ".$WHERE1." %s AND beg_points > 0 ORDER BY beg_points DESC, userid LIMIT %s",
- array($WHERE2, $WHERE3), __FILE__, __LINE__);
+FROM "._MYSQL_PREFIX."_user_data
+WHERE status='CONFIRMED' ".$whereStatement1." AND beg_points > 0
+ORDER BY beg_points DESC, userid
+LIMIT %s",
+		array($whereStatement2), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_main) > 0)
-	{
+	if (SQL_NUMROWS($result_main) > 0) {
 		// Load our winners...
 		$UIDs = "";
-		while(list($uid, $email, $points) = SQL_FETCHROW($result_main))
-		{
+		while(list($uid, $email, $points) = SQL_FETCHROW($result_main)) {
 			// Add points to user's account directly
 			$result_data = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_points
-SET points=points+%s WHERE ref_depth='0' AND userid=%d LIMIT 1",
+SET points=points+%s WHERE ref_depth=0 AND userid=%s LIMIT 1",
  array($points, bigintval($uid)), __FILE__, __LINE__);
 
 			// Update mediadata as well
-			if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-			{
+			if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
 				// Update database
 				MEDIA_UPDATE_ENTRY(array("total_points"), "add", $points);
 			}
@@ -107,19 +102,12 @@ SET points=points+%s WHERE ref_depth='0' AND userid=%d LIMIT 1",
 		if ($curr == "00") $curr = "12";
 
 		// 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__);
 	}
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-
-	// Finally update database and config array
-	$CONFIG['beg_month'] = $curr;
-	$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET beg_month='%s' WHERE config='0' LIMIT 1",
-	 array($curr), __FILE__, __LINE__);
-
-	// Destroy cache
 }
+
 //
 ?>