X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=55fb01e9cef71f0766f41a5fcd32eba84d6dd84e;hp=cc09410198506487fe651b1fb82d5f16296a77df;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=a28637f0eb7975f2240c42d349e5f08a9722d9bb

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index cc09410198..55fb01e9ce 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,7 +45,7 @@ if (!defined('__SECURITY')) {
 // This function must be run *BEFORE* a link is removed from table 'mxchange_user_links' !
 function addTurboBonus ($mid, $userid, $type) {
 	// Shall we add bonus points?
-	if (getConfig('bonus_active') != 'Y') return false;
+	if (!isBonusRallyeActive()) return false;
 
 	// Init variables
 	$sql = ''; $bonus = '0'; $mail = '0'; $column = '';
@@ -108,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);
 }
 
 //
@@ -148,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) {
+	if (!SQL_HASZERONUMS($result)) {
 		// 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
@@ -187,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
@@ -197,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
@@ -231,7 +218,7 @@ LIMIT 1",
 //
 function handleBonusPoints ($mode) {
 	// Shall we add bonus points?
-	if (getConfig('bonus_active') != 'Y') return;
+	if (!isBonusRallyeActive()) return;
 
 	// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
 	if ((getConfig('bonus_mode') == 'UID') && (getConfig('bonus_userid') == '0') && (isExtensionActive('jackpot'))) {
@@ -253,7 +240,7 @@ function handleBonusPoints ($mode) {
 	// Subtract points from...
 	switch (getConfig('bonus_mode')) {
 		case 'JACKPOT': // ... jackpot
-			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (getConfig('bonus_userid') > 0)) {
+			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getConfig('bonus_userid')))) {
 				if ($total >= $points) {
 					// Subtract points from userid's account
 					subtractPointsFromJackpot('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
@@ -280,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
 }
 
@@ -293,25 +280,25 @@ 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 ;-)
 	$bonus = false;
-	if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (getConfig('bonus_active') == 'Y') && (getConfig('bonus_login_yn') == 'Y')) {
+	if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (ifBonusRallyeActive()) && (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?
@@ -320,12 +307,24 @@ 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>';
 	}
 }
 
+// Determines wether the "bonus rallye" is active
+function isBonusRallyeActive () {
+	// Do we have cache?
+	if (!isset($GLOBALS['bonus_rallye_active'])) {
+		// Just determine it
+		$GLOBALS['bonus_rallye_active'] = (getConfig('bonus_active') == 'Y');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS['bonus_rallye_active'];
+}
+
 // [EOF]
 ?>