X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=bb118906a0236de3714c53e885b94cc2404a512f;hp=befed20d39f3ca9c149ce41e8452636fc2067e68;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hpb=b4784eb7267921f162d2fa90d21fa20fad700962

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index befed20d39..bb118906a0 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 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,25 +41,28 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // This function must be run *BEFORE* a link is removed from table 'mailer_user_links' !
-function addTurboBonus ($mid, $userid, $type) {
+function addTurboBonus ($id, $userid, $type) {
 	// Shall we add bonus points?
 	if (!isBonusRallyeActive()) {
 		return FALSE;
 	} // END - if
 
 	// Init variables
-	$sql = ''; $bonus = '0'; $mail = '0'; $column = '';
+	$sql     = '';
+	$bonusId = 'NULL';
+	$mailId  = 'NULL';
+	$column  = '';
 
 	// Select SQL command
 	switch ($type) {
 		case 'bonusid':
 			$column = 'bonus_id';
-			$bonus = $mid;
+			$bonusId = $id;
 			break;
 
 		case 'mailid' :
 			$column = 'mail_id';
-			$mail = $mid;
+			$mailId = $id;
 			break;
 
 		default:
@@ -74,7 +77,7 @@ function addTurboBonus ($mid, $userid, $type) {
 	} // END - if
 
 	// Check for entry
-	$rank = countSumTotalData($mid, 'bonus_turbo', 'id', $column, TRUE) + 1;
+	$rank = countSumTotalData($id, 'bonus_turbo', 'id', $column, TRUE) + 1;
 
 	// Which rank?
 	if ($rank == 1) {
@@ -103,12 +106,13 @@ function addTurboBonus ($mid, $userid, $type) {
 	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),
-			bigintval($bonus),
+			$mailId,
+			$bonusId,
 			$rank,
 			$points
 		), __FUNCTION__, __LINE__);
 
+	// @TODO Rewrite this to a filter
 	if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) {
 		handleBonusPoints($points, $userid);
 	} // END - if
@@ -117,7 +121,9 @@ function addTurboBonus ($mid, $userid, $type) {
 //
 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'] = '';
@@ -139,7 +145,7 @@ 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);
@@ -215,7 +221,7 @@ function handleBonusPoints ($mode, $userid) {
 	$return = FALSE;
 
 	// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
-	if ((getBonusMode() == 'UID') && ($userid == '0') && (isExtensionActive('jackpot'))) {
+	if ((getBonusMode() == 'UID') && (!isValidId($userid)) && (isExtensionActive('jackpot'))) {
 		// Update database & config
 		updateConfiguration('bonus_mode', 'JACKPOT');
 	} // END - if
@@ -238,7 +244,7 @@ function handleBonusPoints ($mode, $userid) {
 			break;
 
 		case 'JACKPOT': // ... jackpot
-			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === FALSE) && (isValidUserId($userid))) {
+			if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) === FALSE) && (isValidId($userid))) {
 				if ($total >= $points) {
 					// Subtract points from userid's account
 					$return = subtractPointsFromJackpot('bonus_payout_jackpot', $userid, $points);
@@ -266,13 +272,13 @@ function handleBonusPoints ($mode, $userid) {
 }
 
 // Purges expired fast-click bonus entries
-function purgeExpiredTurboBonus() {
+function purgeExpiredTurboBonus () {
 	// Remove entries
 	$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
-		sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
+		sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_purge_turbo', SQL_AFFECTEDROWS());
 	} // END - if
 }