X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=42cfdeb3e4f3baa5e30172d5e1939693cee4e25d;hb=7f104f6fe558bb56b4205241435a2357c2feece1;hp=689b1462a47fe90e9812c0d406a9f486fbf63219;hpb=60494e212a67fe360bfbb481eb4928480a6f379b;p=mailer.git

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 689b1462a4..42cfdeb3e4 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -32,13 +32,10 @@
  ************************************************************************/
 
 // 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("bonus")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
 	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
 	return;
 }
@@ -49,41 +46,42 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 // Get current month (2 digits)
 $curr = date("m", time());
 
-if (($curr != $_CONFIG['bonus_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1))
+if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1))
 {
 	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
 	$whereStatement1 = "WHERE status='CONFIRMED'";
-	$whereStatement2 = 0;
-	$whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
+	$whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
 
 	// Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
 	if (EXT_IS_ACTIVE("autopurge"))
 	{
 		// Use last online stamp only when autopurge for inactive members is activated
-		if ($_CONFIG['ap_in_since'] > 0)
+		if ($_CONFIG['ap_inactive_since'] > 0)
 		{
 			// Okay, include last online timestamp
-			$whereStatement1 = "WHERE status='CONFIRMED' AND last_online >=";
-			$whereStatement2 = bigintval(time() - $_CONFIG['ap_in_since']);
-			$whereStatement3 = bigintval($_CONFIG['bonus_ranks']);
+			$whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
+			$whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
 		}
 	}
 
 	// Add more bonus points here
-	$ADD = " AND (0";
-	if ($_CONFIG['bonus_click_yn'] == 'Y') $ADD .= " + turbo_bonus";
-	if ($_CONFIG['bonus_login_yn'] == 'Y') $ADD .= " + login_bonus";
-	if ($_CONFIG['bonus_order_yn'] == 'Y') $ADD .= " + bonus_order";
-	if ($_CONFIG['bonus_stats_yn'] == 'Y') $ADD .= " + bonus_stats";
-	if ($_CONFIG['bonus_ref_yn']   == 'Y') $ADD .= " + bonus_ref";
-	$ADD .= ") > 0";
+	$ADD = "";
+	if ($_CONFIG['bonus_click_yn'] == "Y") $ADD .= " + turbo_bonus";
+	if ($_CONFIG['bonus_login_yn'] == "Y") $ADD .= " + login_bonus";
+	if ($_CONFIG['bonus_order_yn'] == "Y") $ADD .= " + bonus_order";
+	if ($_CONFIG['bonus_stats_yn'] == "Y") $ADD .= " + bonus_stats";
+	if ($_CONFIG['bonus_ref_yn']   == "Y") $ADD .= " + bonus_ref";
+
+	if (!empty($ADD)) {
+		$ADD .= "AND (0".$ADD.") > 0";
+	} // END - if
 
 	// SQL string to check for accounts
 	$result_main = SQL_QUERY_ESC("SELECT userid, email, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS active_bonus
 FROM "._MYSQL_PREFIX."_user_data
 ".$whereStatement1." %s".$ADD."
 ORDER BY active_bonus DESC, userid LIMIT %s",
- array($whereStatement2, $whereStatement3), __FILE__, __LINE__);
+ array($whereStatement2), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result_main) > 0)
 	{
@@ -96,7 +94,7 @@ ORDER BY active_bonus DESC, userid LIMIT %s",
 
 			// 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
@@ -126,13 +124,7 @@ SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __
 
 	// Free memory
 	SQL_FREERESULT($result_main);
-
-	// Finally update database and config array
-	$_CONFIG['bonus_month'] = $curr;
-	$result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET last_bonus_month='%s' WHERE config='0' LIMIT 1",
-	 array($curr), __FILE__, __LINE__);
-
-	// Destroy cache
 }
+
 //
 ?>