X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=e405e625a30ed40721b2b7dc7d548ff6299a4433;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hp=bd2ee2fe93ce27fc07336a3b7d2dcaa7fdce5fd7;hpb=357b2ca133fc1f89db74097955c366cb4bee6996;p=mailer.git

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index bd2ee2fe93..e405e625a3 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
 	LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
 	return;
 }
 
@@ -49,11 +49,11 @@ if (GET_EXT_VERSION("bonus") >= "0.6.9")
 {
 	// Add more bonus points here
 	$USE = "(0";
-	if ($_CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
-	if ($_CONFIG['bonus_login_yn'] == "Y") $USE .= " + login_bonus";
-	if ($_CONFIG['bonus_order_yn'] == "Y") $USE .= " + bonus_order";
-	if ($_CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
-	if ($_CONFIG['bonus_ref_yn']   == "Y") $USE .= " + bonus_ref";
+	if (getConfig('bonus_click_yn') == "Y") $USE .= " + turbo_bonus";
+	if (getConfig('bonus_login_yn') == "Y") $USE .= " + login_bonus";
+	if (getConfig('bonus_order_yn') == "Y") $USE .= " + bonus_order";
+	if (getConfig('bonus_stats_yn') == "Y") $USE .= " + bonus_stats";
+	if (getConfig('bonus_ref_yn')   == "Y") $USE .= " + bonus_ref";
 	$USE .= ")";
 }
  else
@@ -67,31 +67,29 @@ $LAST = "%s"; $ONLINE = "";
 if (EXT_IS_ACTIVE("autopurge")) {
 	// Use last online timestamp to keep inactive members away from here
 	$LAST   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
-	$ONLINE = $_CONFIG['ap_inactive_since'];
+	$ONLINE = getConfig('ap_inactive_since');
 }
 
 // Let's check if there are some points left we can "pay"...
-$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS active_bonus, last_online FROM "._MYSQL_PREFIX."_user_data
-WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST."
-ORDER BY active_bonus DESC, last_online DESC, userid LIMIT %s",
- array($ONLINE, $_CONFIG['bonus_ranks']), __FILE__, __LINE__);
+$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE ".$USE." > 0 AND `status`='CONFIRMED'".$LAST."
+ORDER BY points DESC, last_online DESC, userid
+LIMIT %s",
+	array($ONLINE, getConfig('bonus_ranks')), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = "";
-if (SQL_NUMROWS($result) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
 	// Load our winners...
 	$SW = 2; $cnt = 1;
-	while(list($uid, $turbo, $last) = SQL_FETCHROW($result))
-	{
+	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the template
 		$content = array(
-			'sw'     => $SW,
-			'cnt'    => $cnt,
-			'uid'    => bigintval($uid),
-			'points' => TRANSLATE_COMMA($turbo),
-			'last'   => MAKE_DATETIME($last, "2"),
-		);
+		$content['sw']     = $SW;
+		$content['cnt']    = $cnt;
+		$content['uid']    = bigintval($content['uid']);
+		$content['points'] = TRANSLATE_COMMA($content['points']);
+		$content['last']   = MAKE_DATETIME($content['last'], "2");
 
 		// Load row template
 		$OUT .= LOAD_TEMPLATE("member_bonus_row", true, $content);
@@ -99,9 +97,7 @@ if (SQL_NUMROWS($result) > 0)
 		// Count one up and switch colors
 		$cnt++;$SW = 3 - $SW;
 	}
-}
- else
-{
+} else {
 	// No one is interested in our "active rallye" ! :-(
 	$OUT = LOAD_TEMPLATE("member_bonus_404", true);
 }