X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=bd3948445860d43f39270df080dfdb1f82804aee;hp=968002a3cdbad4dec09dadc437adae0b0858c5dc;hb=2e394cb5b8a6225a39a6942b1fcc17c37a17a175;hpb=22ba710434fb8b31e8961976ee4a31ae28b4509d

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 968002a3cd..bd39484458 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -40,10 +40,12 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
-// This function must be run *BEFORE* a link is removed from table 'mxchange_user_links' !
+// This function must be run *BEFORE* a link is removed from table 'mailer_user_links' !
 function addTurboBonus ($mid, $userid, $type) {
 	// Shall we add bonus points?
-	if (!isBonusRallyeActive()) return false;
+	if (!isBonusRallyeActive()) {
+		return false;
+	} // END - if
 
 	// Init variables
 	$sql = ''; $bonus = '0'; $mail = '0'; $column = '';
@@ -85,7 +87,7 @@ function addTurboBonus ($mid, $userid, $type) {
 			// Level found
 			$points = $test[$rank - 2];
 		} else {
-			// Level not found!
+			// Level not found
 			$points = '0.00000';
 		}
 	}
@@ -107,7 +109,9 @@ function addTurboBonus ($mid, $userid, $type) {
 			$points
 		), __FUNCTION__, __LINE__);
 
-	if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) handleBonusPoints($points);
+	if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) {
+		handleBonusPoints($points);
+	} // END - if
 }
 
 //
@@ -195,7 +199,7 @@ LIMIT 1",
 			$GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}';
 		} // END - if
 	} else {
-		// No entries found!
+		// No entries found
 		// @TODO Move this HTML to a template
 		$OUT = '<tr>
   <td colspan="3" align="center" height="30" class="bottom">
@@ -232,6 +236,10 @@ function handleBonusPoints ($mode) {
 
 	// Subtract points from...
 	switch (getBonusMode()) {
+		case 'ADD': // Only add them (no subtraction)
+			// Ignored
+			break;
+
 		case 'JACKPOT': // ... jackpot
 			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserId()))) {
 				if ($total >= $points) {
@@ -252,7 +260,7 @@ function handleBonusPoints ($mode) {
 			break;
 
 		default: // This should not happen
-			debug_report_bug(__FUNCTION__, __LINE__, 'Invalid config entry ' . getBonusMode() . ' detected.');
+			debug_report_bug(__FUNCTION__, __LINE__, 'Invalid bonus-mode ' . getBonusMode() . ' detected.');
 			break;
 	} // END - switch
 }
@@ -260,7 +268,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 (UNIX_TIMESTAMP() - `timemark`) >= {?bonus_timeout?}', __FUNCTION__, __LINE__);
 
 	if (!SQL_HASZEROAFFECTED()) {
 		// Send out email to admin
@@ -268,49 +276,6 @@ function purgeExpiredTurboBonus() {
 	} // END - if
 }
 
-//-----------------------------------------------------------------------------
-//                                Filter Functions
-//-----------------------------------------------------------------------------
-
-// Filter for adding login bonus to the user's account
-function FILTER_ADD_LOGIN_BONUS () {
-	// Is the user data valid?
-	if (!isMember()) {
-		// Do only run for logged in members
-		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')) && (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
-	`{?_MYSQL_PREFIX?}_user_data`
-SET
-	`last_login`=UNIX_TIMESTAMP()
-WHERE
-	`userid`=%s AND
-	`last_login` < (UNIX_TIMESTAMP() - {?login_timeout?})
-LIMIT 1',
-			array(
-				getMemberId()
-			), __FUNCTION__, __LINE__
-		);
-
-		// Updated entry?
-		$bonus = (!SQL_HASZEROAFFECTED());
-	} // END - if
-
-	if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
-		// Output message with added points
-		$GLOBALS['message'] .= '<div class="tiny">{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}</div>';
-	} elseif (isExtensionActive('bonus')) {
-		// No login bonus added!
-		$GLOBALS['message'] .= '<div class="notice">{--MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED--}</div>';
-	}
-}
-
 //-----------------------------------------------------------------------------
 //                             Wrapper Functions
 //-----------------------------------------------------------------------------