X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=7236987cad24dd561544159c2843e86fade70b03;hb=00e734ff1236dc875952f5b34dada9892568e7cd;hp=9033627032e8fa88e1a83ae2ef46af2fa7ccaf7e;hpb=964a3b539e335f6d70e7779630fd3d25fd38398d;p=mailer.git

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 9033627032..7236987cad 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -95,12 +95,12 @@ function addTurboBonus ($mid, $userid, $type) {
 	// Add points to his account directly
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `turbo_bonus`=`turbo_bonus`+%s WHERE `userid`=%s LIMIT 1",
 		array(
-			bigintval($userid),
-			$points
+			$points,
+			bigintval($userid)
 		), __FUNCTION__, __LINE__);
 
 	// Rember this whole data for displaying ranking list
-	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus_turbo` (`userid`, `mail_id`, `bonus_id`, `level`, `points`, `timemark`) VALUES (%s, %s, %s, %s, %s, UNIX_TIMESTAMP())",
+	SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus_turbo` (`userid`,`mail_id`,`bonus_id`,`level`,`points`,`timemark`) VALUES (%s, %s, %s, %s, %s, UNIX_TIMESTAMP())",
 		array(
 			bigintval($userid),
 			bigintval($mail),
@@ -110,7 +110,7 @@ function addTurboBonus ($mid, $userid, $type) {
 		), __FUNCTION__, __LINE__);
 
 	if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) {
-		handleBonusPoints($points);
+		handleBonusPoints($points, $userid);
 	} // END - if
 }
 
@@ -126,7 +126,7 @@ function addBonusRanks ($data, $type, $userid) {
 	$ranks = count(explode(';', getConfig('turbo_rates'))) + 1;
 
 	// Load current user's data
-	$result = SQL_QUERY_ESC("SELECT `level`, `points`, `timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `level`,`points`,`timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1",
 		array(
 			$type,
 			$data,
@@ -156,7 +156,7 @@ function addBonusRanks ($data, $type, $userid) {
 		for ($rank = 1; $rank <= SQL_NUMROWS($result); $rank++) {
 			// Load data
 			$result_users = SQL_QUERY_ESC("SELECT
-	`userid`, `points`
+	`userid`,`points`
 FROM
 	`{?_MYSQL_PREFIX?}_bonus_turbo`
 WHERE
@@ -173,15 +173,6 @@ LIMIT 1",
 			if (SQL_NUMROWS($result_users) == 1) {
 				// Load data
 				$rows = merge_array($rows, SQL_FETCHARRAY($result_users));
-
-				// Is ext-nickname active?
-				if (isExtensionActive('nickname')) {
-					// Then get the nickname
-					$nick = getNickname($rows['userid']);
-
-					// Is it not empty? Then use it
-					if (!empty($nick)) $rows['userid'] = $nick;
-				} // END - if
 			} // END - if
 
 			// Free result
@@ -203,7 +194,7 @@ LIMIT 1",
 		// @TODO Move this HTML to a template
 		$OUT = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">
-    <div class="notice">' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '</div>
+    <div class="notice">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
   </td>
 </tr>';
 	}
@@ -212,13 +203,18 @@ LIMIT 1",
 	return $OUT;
 }
 
-//
-function handleBonusPoints ($mode) {
+// Hanle any bonus points the given user shall become
+function handleBonusPoints ($mode, $userid) {
 	// Shall we add bonus points?
-	if (!isBonusRallyeActive()) return;
+	if (!isBonusRallyeActive()) {
+		return;
+	} // END - if
+
+	// Default is not working
+	$return = false;
 
 	// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
-	if ((getBonusMode() == 'UID') && (getBonusUserid() == '0') && (isExtensionActive('jackpot'))) {
+	if ((getBonusMode() == 'UID') && ($userid == '0') && (isExtensionActive('jackpot'))) {
 		// Update database & config
 		updateConfiguration('bonus_mode', 'JACKPOT');
 	} // END - if
@@ -232,7 +228,7 @@ function handleBonusPoints ($mode) {
 	}
 
 	// Check his amount first
-	$total = getTotalPoints(getBonusUserid());
+	$total = getTotalPoints($userid);
 
 	// Subtract points from...
 	switch (getBonusMode()) {
@@ -241,10 +237,10 @@ function handleBonusPoints ($mode) {
 			break;
 
 		case 'JACKPOT': // ... jackpot
-			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserid()))) {
+			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === false) && (isValidUserId($userid))) {
 				if ($total >= $points) {
 					// Subtract points from userid's account
-					subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserid(), $points);
+					$return = subtractPointsFromJackpot('bonus_payout_jackpot', $userid, $points);
 				} // END - if
 			} // END - if
 			break;
@@ -252,10 +248,10 @@ function handleBonusPoints ($mode) {
 		case 'UID': // ... userid's account
 			if ($total >= $points) {
 				// Subtract points from userid's account
-				subtractPoints('bonus_payout_userid', getBonusUserid(), $points);
+				$return = subtractPoints('bonus_payout_userid', $userid, $points);
 			} elseif (isExtensionActive('jackpot')) {
 				// Try to subtract from jackpot
-				$dummy = subtractPointsFromJackpot($points);
+				$return = subtractPointsFromJackpot($points);
 			}
 			break;
 
@@ -263,6 +259,9 @@ function handleBonusPoints ($mode) {
 			debug_report_bug(__FUNCTION__, __LINE__, 'Invalid bonus-mode ' . getBonusMode() . ' detected.');
 			break;
 	} // END - switch
+
+	// Return status
+	return $return;
 }
 
 // Purges expired fast-click bonus entries