X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=dfe22f5b08a3c21676158b6eb65078e3f1936683;hb=9bc2a494fae1a98f0873a6f3bd8c878b09124b9f;hp=08a4d619b52a99753a5bff25a086db8e439ef7ac;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 08a4d619b5..dfe22f5b08 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -109,7 +109,7 @@ function addTurboBonus ($mid, $userid, $type) {
 			$points
 		), __FUNCTION__, __LINE__);
 
-	if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != "ADD") && ($points > 0)) handleBonusPoints($points);
+	if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD') && ($points > 0)) handleBonusPoints($points);
 }
 
 //
@@ -149,15 +149,12 @@ 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
 		$max = SQL_NUMROWS($result);
 
-		// Init variables
-		$SW = 2;
-
 		// Output all ranks (levels)
 		for ($rank = 1; $rank <= $max; $rank++) {
 			// Load data
@@ -188,9 +185,6 @@ LIMIT 1",
 					// Is it not empty? Then use it
 					if (!empty($nick)) $rows['userid'] = $nick;
 				} // END - if
-
-				// Translate comma
-				$rows['points'] = translateComma($rows['points']);
 			} // END - if
 
 			// Free result
@@ -198,31 +192,23 @@ LIMIT 1",
 
 			// Add more
 			$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\">".$rows['points']."</td>
-</tr>\n";
-
-			// Switch color
-			$SW = 3 - $SW;
+			// Load row template
+			$OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
 		} // END - for
 
 		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
@@ -281,7 +267,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
 }
 
@@ -294,7 +280,7 @@ function FILTER_ADD_LOGIN_BONUS () {
 	// Is the user data valid?
 	if (!isMember()) {
 		// Do only run for logged in members
-		debug_report_bug('Please only run this filter for logged in users.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
 	} // END - if
 
 	// Bonus is not given by default ;-)
@@ -302,17 +288,17 @@ 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()
-			), __FILE__, __LINE__
+			), __FUNCTION__, __LINE__
 		);
 
 		// Updated entry?
@@ -321,7 +307,7 @@ LIMIT 1",
 
 	if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
 		// Output message with added points
-		$GLOBALS['message'] .= '<div class="tiny">' . getMessage('BONUS_LOGIN_BONUS_ADDED') . '</div>';
+		$GLOBALS['message'] .= '<div class="tiny">{--BONUS_LOGIN_BONUS_ADDED--}</div>';
 	} elseif (isExtensionActive('bonus')) {
 		// No login bonus added!
 		$GLOBALS['message'] .= '<div class="member_failed">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';