X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_bonus.php;h=d90c75d387780533a12b0463efc635b359b2d173;hp=459afa67a00f32bc1e7ead0cd9a7b32db5844d6f;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=40d8e4727d119455f13fb91bb47adc3d9587ef9c

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 459afa67a0..d90c75d387 100644
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -46,50 +46,53 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 // Get current month (2 digits)
 $curr = date("m", time());
 
-if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && ($CSS != 1)) {
 	// Extension "autopurge" is inactive or purging of inactive accounts is deactivated
-	$whereStatement1 = "WHERE status='CONFIRMED'";
-	$whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
+	$whereStatement1 = "WHERE `status`='CONFIRMED'";
+	$whereStatement2 = bigintval(getConfig('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_inactive_since'] > 0) {
+		if (getConfig('ap_inactive_since') > 0) {
 			// Okay, include last online timestamp
-			$whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
-			$whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
+			$whereStatement1 = sprintf("WHERE `status`='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
+			$whereStatement2 = bigintval(getConfig('bonus_ranks'));
 		} // END - if
 	} // END - if
 
 	// Add more bonus points here
 	$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 (getConfig('bonus_click_yn') == "Y") $ADD .= " + turbo_bonus";
+	if (getConfig('bonus_login_yn') == "Y") $ADD .= " + login_bonus";
+	if (getConfig('bonus_order_yn') == "Y") $ADD .= " + bonus_order";
+	if (getConfig('bonus_stats_yn') == "Y") $ADD .= " + bonus_stats";
+	if (getConfig('bonus_ref_yn')   == "Y") $ADD .= " + bonus_ref";
 
+	// Shall we add some entries?
 	if (!empty($ADD)) {
-		$ADD .= " AND (0".$ADD.") > 0";
+		$whereStatement1 .= " AND (0".$ADD.") > 0";
 	} // END - if
 
-	// SQL string to check for accounts
-	$result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (turbo_bonus + login_bonus + bonus_order + bonus_stats + bonus_ref) AS points
-FROM "._MYSQL_PREFIX."_user_data
+	// Run SQL string to check for accounts
+	$result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (0".$ADD.") AS points
+FROM `{!_MYSQL_PREFIX!}_user_data`
 ".$whereStatement1."".$ADD."
-ORDER BY active_bonus DESC, userid LIMIT %s",
- array($whereStatement2), __FILE__, __LINE__);
+ORDER BY points DESC, userid
+LIMIT %s",
+		array($whereStatement2), __FILE__, __LINE__);
 
+	// Some entries were found?
 	if (SQL_NUMROWS($result_main) > 0) {
 		// Load our winners...
 		while ($content = SQL_FETCHARRAY($result_main)) {
 			// Make sure zero points are not mailed
 			if ($content['points'] > 0) {
 				// Add points to user's account directly
-				ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");
+				ADD_POINTS_REFSYSTEM("monthly_bonus", $content['uid'], $content['points'], false, "0", false, "direct");
 
 				// Translate gender/points
-				$content['gender'] = TRANSLATE_GENDER($content['gender']);
+				$content['gender']       = TRANSLATE_GENDER($content['gender']);
 				$content['points'] = TRANSLATE_COMMA($content['points']);
 
 				// Load email template and email it away
@@ -99,7 +102,7 @@ ORDER BY active_bonus DESC, userid LIMIT %s",
 		} // END - while
 
 		// Reset accounts
-		$result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_user_data
+		$result = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET turbo_bonus=0, login_bonus=0, bonus_order=0, bonus_stats=0, bonus_ref=0", __FILE__, __LINE__);
 	} // END - if