X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=3b3ad6a5fb1a2245225428cebc86499e8c601e84;hb=6b0b03e60c1ab6fbdee3c5c4477cb5bcbc2f03ae;hp=6418d1e5431e9c5cc50a9cba5f361abd1ba72f17;hpb=76740e48546bb3fdb9fca65d8d205765f2bd4d68;p=mailer.git

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 6418d1e543..3b3ad6a5fb 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 function addTurboBonus ($mid, $userid, $type) {
 	// Shall we add bonus points?
 	if (!isBonusRallyeActive()) {
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Init variables
@@ -70,11 +70,11 @@ function addTurboBonus ($mid, $userid, $type) {
 	// Is a column name set?
 	if (empty($column)) {
 		// No, then abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Check for entry
-	$rank = countSumTotalData($mid, 'bonus_turbo', 'id', $column, true) + 1;
+	$rank = countSumTotalData($mid, 'bonus_turbo', 'id', $column, TRUE) + 1;
 
 	// Which rank?
 	if ($rank == 1) {
@@ -82,7 +82,7 @@ function addTurboBonus ($mid, $userid, $type) {
 		$points = getConfig('turbo_bonus');
 	} else {
 		// Anything else so let's explode all entered rank points
-		$test = explode(';', getConfig('turbo_rates'));
+		$test = explode(';', getTurboRates());
 		if (!empty($test[$rank - 2])) {
 			// Level found
 			$points = $test[$rank - 2];
@@ -110,20 +110,20 @@ function addTurboBonus ($mid, $userid, $type) {
 		), __FUNCTION__, __LINE__);
 
 	if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) {
-		handleBonusPoints($points);
+		handleBonusPoints($points, $userid);
 	} // END - if
 }
 
 //
 function addBonusRanks ($data, $type, $userid) {
 	// Init variables
-	$self = false; $OUT = ''; $GLOBALS['ranking_content'] = array();
+	$self = FALSE; $OUT = ''; $GLOBALS['ranking_content'] = array();
 
 	// Clear rankings by default
 	$GLOBALS['ranking_content']['rankings'] = '';
 
 	// How many ranks do we have?
-	$ranks = count(explode(';', getConfig('turbo_rates'))) + 1;
+	$ranks = count(explode(';', getTurboRates())) + 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",
@@ -139,13 +139,13 @@ function addBonusRanks ($data, $type, $userid) {
 		$GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], SQL_FETCHARRAY($result));
 
 		// Remember all values for later use
-		$self  = true;
+		$self  = TRUE;
 
 		// Transfer data to template
 		$GLOBALS['ranking_content']['timemark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
 
 		// Load template
-		$GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', true, $GLOBALS['ranking_content']);
+		$GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', TRUE, $GLOBALS['ranking_content']);
 	} // END - if
 
 	// Load rankings
@@ -156,7 +156,8 @@ 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
@@ -182,10 +183,10 @@ LIMIT 1",
 			$rows['rank'] = $rank;
 
 			// Load row template
-			$OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
+			$OUT .= loadTemplate('member_bonus_turbo_row', TRUE, $rows);
 		} // END - for
 
-		if ($self === false) {
+		if ($self === FALSE) {
 			// If current user was not found set constant
 			$GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}';
 		} // END - if
@@ -194,7 +195,7 @@ LIMIT 1",
 		// @TODO Move this HTML to a template
 		$OUT = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">
-    <div class="notice">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
+    <div class="bad">{%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}</div>
   </td>
 </tr>';
 	}
@@ -203,13 +204,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
@@ -223,7 +229,7 @@ function handleBonusPoints ($mode) {
 	}
 
 	// Check his amount first
-	$total = getTotalPoints(getBonusUserid());
+	$total = getTotalPoints($userid);
 
 	// Subtract points from...
 	switch (getBonusMode()) {
@@ -232,10 +238,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;
@@ -243,17 +249,20 @@ 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;
 
 		default: // This should not happen
-			debug_report_bug(__FUNCTION__, __LINE__, 'Invalid bonus-mode ' . getBonusMode() . ' detected.');
+			reportBug(__FUNCTION__, __LINE__, 'Invalid bonus-mode ' . getBonusMode() . ' detected.');
 			break;
 	} // END - switch
+
+	// Return status
+	return $return;
 }
 
 // Purges expired fast-click bonus entries
@@ -271,9 +280,9 @@ function purgeExpiredTurboBonus() {
 //                             Wrapper Functions
 //-----------------------------------------------------------------------------
 
-// Determines wether the "bonus rallye" is active
+// Determines whether the "bonus rallye" is active
 function isBonusRallyeActive () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS['bonus_rallye_active'])) {
 		// Just determine it
 		$GLOBALS['bonus_rallye_active'] = (getConfig('bonus_active') == 'Y');
@@ -283,9 +292,9 @@ function isBonusRallyeActive () {
 	return $GLOBALS['bonus_rallye_active'];
 }
 
-// Determines wether the "bonus new_member_notify" is active
+// Determines whether the "bonus new_member_notify" is active
 function isBonusNewMemberNotifyEnabled () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS['bonus_new_member_notify_active'])) {
 		// Just determine it
 		$GLOBALS['bonus_new_member_notify_active'] = (getConfig('bonus_new_member_notify') == 'Y');
@@ -297,7 +306,7 @@ function isBonusNewMemberNotifyEnabled () {
 
 // Getter for bonus_timeout
 function getBonusTimeout () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('bonus_timeout');
@@ -309,7 +318,7 @@ function getBonusTimeout () {
 
 // Getter for bonus_mode
 function getBonusMode () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('bonus_mode');
@@ -321,7 +330,7 @@ function getBonusMode () {
 
 // Getter for bonus_ranks
 function getBonusRanks () {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
 		$GLOBALS[__FUNCTION__] = getConfig('bonus_ranks');
@@ -331,5 +340,41 @@ function getBonusRanks () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// Getter for turbo_rates
+function getTurboRates () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('turbo_rates');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for login_timeout
+function getLoginTimeout () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('login_timeout');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for bonus_ref
+function getBonusRef () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('bonus_ref');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>