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

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 55fb01e9ce..fae8d5f93f 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -65,7 +65,7 @@ function addTurboBonus ($mid, $userid, $type) {
 		default:
 			logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid type %s detected.", $type));
 			break;
-	}
+	} // END - switch
 
 	// Is a column name set?
 	if (empty($column)) {
@@ -128,7 +128,7 @@ function addBonusRanks ($data, $type, $userid) {
 		array(
 			$type,
 			$data,
-			$userid
+			bigintval($userid)
 		), __FUNCTION__, __LINE__);
 
 	// Entry found?
@@ -140,9 +140,7 @@ function addBonusRanks ($data, $type, $userid) {
 		$self  = true;
 
 		// Transfer data to template
-		$GLOBALS['ranking_content']['yr_level']  = $GLOBALS['ranking_content']['level'];
-		$GLOBALS['ranking_content']['yr_points'] = translateComma($GLOBALS['ranking_content']['points']);
-		$GLOBALS['ranking_content']['yr_tmark']  = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
+		$GLOBALS['ranking_content']['timemark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
 
 		// Load template
 		$GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', true, $GLOBALS['ranking_content']);
@@ -199,14 +197,14 @@ LIMIT 1",
 
 		if ($self === false) {
 			// If current user was not found set constant
-			$GLOBALS['ranking_content']['rankings'] = '{--BONUS_RANK_YOU_ARE_404--}';
+			$GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}';
 		} // END - if
 	} else {
 		// No entries found!
 		// @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>
+    <div class="guest_failed">' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '</div>
   </td>
 </tr>';
 	}
@@ -221,7 +219,7 @@ function handleBonusPoints ($mode) {
 	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'))) {
+	if ((getConfig('bonus_mode') == 'UID') && (getBonusUserId() == '0') && (isExtensionActive('jackpot'))) {
 		// Update database & config
 		updateConfiguration('bonus_mode', 'JACKPOT');
 	} // END - if
@@ -235,15 +233,15 @@ function handleBonusPoints ($mode) {
 	}
 
 	// Check his amount first
-	$total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
+	$total = getTotalPoints(getBonusUserId());
 
 	// Subtract points from...
 	switch (getConfig('bonus_mode')) {
 		case 'JACKPOT': // ... jackpot
-			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getConfig('bonus_userid')))) {
+			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserId()))) {
 				if ($total >= $points) {
 					// Subtract points from userid's account
-					subtractPointsFromJackpot('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
+					subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserId(), $points);
 				} // END - if
 			} // END - if
 			break;
@@ -251,7 +249,7 @@ function handleBonusPoints ($mode) {
 		case 'UID': // ... userid's account
 			if ($total >= $points) {
 				// Subtract points from userid's account
-				subtractPoints('bonus_payout_userid', getConfig('bonus_userid'), $points);
+				subtractPoints('bonus_payout_userid', getBonusUserId(), $points);
 			} elseif (isExtensionActive('jackpot')) {
 				// Try to subtract from jackpot
 				$dummy = subtractPointsFromJackpot($points);
@@ -263,7 +261,7 @@ function handleBonusPoints ($mode) {
 // Purges expired fast-click bonus entries
 function purgeExpiredTurboBonus() {
 	// Remove entries
-	$result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `timemark` < (UNIX_TIMESTAMP() - {?bonus_timeout?})", __FUNCTION__, __LINE__);
+	$result = SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `timemark` < (UNIX_TIMESTAMP() - {?bonus_timeout?})', __FUNCTION__, __LINE__);
 
 	if (SQL_AFFECTEDROWS() > 0) {
 		// Send out email to admin
@@ -285,7 +283,7 @@ function FILTER_ADD_LOGIN_BONUS () {
 
 	// Bonus is not given by default ;-)
 	$bonus = false;
-	if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (ifBonusRallyeActive()) && (getConfig('bonus_login_yn') == 'Y')) {
+	if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (isBonusRallyeActive()) && (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
@@ -307,13 +305,17 @@ LIMIT 1',
 
 	if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
 		// Output message with added points
-		$GLOBALS['message'] .= '<div class="tiny">{--BONUS_LOGIN_BONUS_ADDED--}</div>';
+		$GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
 	} elseif (isExtensionActive('bonus')) {
 		// No login bonus added!
-		$GLOBALS['message'] .= '<div class="member_failed">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';
+		$GLOBALS['message'] .= '<div class="member_failed">{--MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';
 	}
 }
 
+///////////////////////////////////////////////////////////////////////////////
+//                             Wrapper functions                             //
+///////////////////////////////////////////////////////////////////////////////
+
 // Determines wether the "bonus rallye" is active
 function isBonusRallyeActive () {
 	// Do we have cache?
@@ -326,5 +328,17 @@ function isBonusRallyeActive () {
 	return $GLOBALS['bonus_rallye_active'];
 }
 
+// Determines wether the "bonus new_member_notify" is active
+function isBonusNewMemberNotifyEnabled () {
+	// Do we have cache?
+	if (!isset($GLOBALS['bonus_new_member_notify_active'])) {
+		// Just determine it
+		$GLOBALS['bonus_new_member_notify_active'] = (getConfig('bonus_new_member_notify') == 'Y');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS['bonus_new_member_notify_active'];
+}
+
 // [EOF]
 ?>