X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=f7719b9a3227789d97ef047cbe85d673d15414c5;hp=c6b44cf930fd63d3f4ac9274cd849d398dd13500;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=ee715f8d4c903b61f943df392b93acb6ad9c2602

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index c6b44cf930..f7719b9a32 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -40,25 +40,24 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if ($_CONFIG['bonus_active'] == "Y") {
+if (getConfig('bonus_active') == "Y") {
 	// Shall I withdraw now?
 	if (isset($_POST['withdraw'])) {
 		// Okay, let's prepare...
 		$curr = date("m", time()) - 1;
 		if (strlen($curr) == 1) $curr = "0".$curr;
 		UPDATE_CONFIG("last_month", $curr);
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
-		OUTPUT_HTML("<br />");
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
 	}
 
 	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 {
 		// Old version ???
@@ -70,13 +69,13 @@ if ($_CONFIG['bonus_active'] == "Y") {
 	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');
 	}
 
 	// Check if at least one is in the active rallye
-	$result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS points, last_online
-FROM "._MYSQL_PREFIX."_user_data
-WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
+	$result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `status`='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY points DESC, last_online DESC, userid",
 	 array($ONLINE), __FILE__, __LINE__);
 
@@ -89,13 +88,14 @@ ORDER BY points DESC, last_online DESC, userid",
 
 			// Generate array fore the dynamic template
 			$WIN1 = ""; $WIN2 = "";
-			if ($cnt <= $_CONFIG['bonus_ranks']) {
+			if ($cnt <= getConfig('bonus_ranks')) {
 				// Maybe he can win his active bonus?
-				$WIN1 = "<STRONG>";
-				$WIN2 = "</STRONG>";
+				$WIN1 = "<strong>";
+				$WIN2 = "</strong>";
 			}
 
 			// Prepare content
+			$content['uid']    = ADMIN_USER_PROFILE_LINK($content['uid']);
 			$content['email']  = CREATE_EMAIL_LINK($content['email'], "user_data");
 			$content['gender'] = TRANSLATE_GENDER($content['gender']);
 			$content['points'] = TRANSLATE_COMMA($content['points']);
@@ -103,7 +103,7 @@ ORDER BY points DESC, last_online DESC, userid",
 			$content['sw']     = $SW;
 			$content['win1']   = $WIN1;
 			$content['win2']   = $WIN2;
-			$content['cnt'     = $cnt;
+			$content['cnt']    = $cnt;
 
 			// Load template and add it
 			$OUT .= LOAD_TEMPLATE("admin_list_bonus_rows", true, $content);
@@ -113,37 +113,30 @@ ORDER BY points DESC, last_online DESC, userid",
 		define('__TOTAL', TRANSLATE_COMMA($total));
 
 		// Check if we need to display form or not with manuel withdraw
-		if ($_CONFIG['last_month'] == date("m", time()))
-		{
+		if (getConfig('last_month') == date("m", time())) {
 			// Load form
 			define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
-		}
-		 else
-		{
+		} else {
 			// Display message "no manual withdraw possible"
-			define('__BONUS_WITHDRAW_FORM', "<FONT class=\"admin_failed\">".ADMIN_BONUS_ALREADY_WITHDRAW."</FONT>");
+			define('__BONUS_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BONUS_ALREADY_WITHDRAW--}</div>");
 		}
 
 		// Prepare constant for timemark
 		if (EXT_IS_ACTIVE("autopurge")) {
-			define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - $_CONFIG['ap_inactive_since'], "2"));
+			define('__AUTOPURGE_TIMEOUT', MAKE_DATETIME(time() - getConfig('ap_inactive_since'), "2"));
 		} else {
-			define('__AUTOPURGE_TIMEOUT', sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "autopurge"));
+			define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "autopurge"));
 		}
 
 		// Load final template
 		LOAD_TEMPLATE("admin_list_bonus");
-	}
-	 else
-	{
+	} else {
 		// No one has become an "activity bonus"...
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_NO_ACTIVE_RALLYE);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE'));
 	}
-}
- else
-{
+} else {
 	// Aktive-Rallye not activated
-	LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_RALLYE_DEACTIVATED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));
 }
 
 //