X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fbonus_functions.php;h=a24098887de088d14855bdc9575cb914b22d8747;hb=29385a0483bbcbbe940a32a49d488b1d5add15c5;hp=5c99bb2e47dae5cfc4a58541cdc0a55591f6ecfd;hpb=ad30a667fd8abeb576c04026b62c2e8a29d86f52;p=mailer.git

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 5c99bb2e47..a24098887d 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -149,7 +149,7 @@ function addBonusRanks ($data, $type, $userid) {
 	} // END - if
 
 	// Load rankings
-	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE %s=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
+	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
 		array($type, $data), __FUNCTION__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Start generating the ranking list
@@ -197,12 +197,8 @@ LIMIT 1",
 			$rows['rank'] = $rank;
 			$rows['sw']   = $SW;
 
-			// Output row
-			$OUT .= "<tr>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\">".$rows['rank'].".</td>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">".$rows['userid']."</td>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">{%pipe,translateComma=".$rows['points']."%}</td>
-</tr>\n";
+			// Load row template
+			$OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
 
 			// Switch color
 			$SW = 3 - $SW;
@@ -210,16 +206,16 @@ LIMIT 1",
 
 		if ($self === false) {
 			// If current user was not found set constant
-			// @TODO Try to find a way for rewriting this constant
-			$GLOBALS['ranking_content']['rankings'] = getMessage('BONUS_RANK_YOU_ARE_404');
+			$GLOBALS['ranking_content']['rankings'] = '{--BONUS_RANK_YOU_ARE_404--}';
 		} // END - if
 	} else {
 		// No entries found!
-		$OUT = "<tr>
-  <td colspan=\"3\" align=\"center\" height=\"30\" class=\"bottom\">
-    <div class=\"guest_failed\">".getMaskedMessage('BONUS_NO_RANKS', $data)."</div>
+		// @TODO Move this HTML to a template
+		$OUT = '<tr>
+  <td colspan="3" align="center" height="30" class="bottom">
+    <div class="guest_failed">' . getMaskedMessage('BONUS_NO_RANKS', $data) . '</div>
   </td>
-</tr>\n";
+</tr>';
 	}
 
 	// Retutn content
@@ -278,7 +274,7 @@ function purgeExpiredTurboBonus() {
 
 	if (SQL_AFFECTEDROWS() > 0) {
 		// Send out email to admin
-		sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
+		sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
 	} // END - if
 }
 
@@ -299,14 +295,14 @@ function FILTER_ADD_LOGIN_BONUS () {
 	if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (getConfig('bonus_active') == 'Y') && (getConfig('bonus_login_yn') == 'Y')) {
 		// Update last login if far enougth away
 		// @TODO This query isn't right, it will only update if the user was for a longer time away!
-		SQL_QUERY_ESC("UPDATE
+		SQL_QUERY_ESC('UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`last_login`=UNIX_TIMESTAMP()
 WHERE
 	`userid`=%s AND
 	`last_login` < (UNIX_TIMESTAMP() - {?login_timeout?})
-LIMIT 1",
+LIMIT 1',
 			array(
 				getMemberId()
 			), __FUNCTION__, __LINE__