X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=7236987cad24dd561544159c2843e86fade70b03;hb=00e734ff1236dc875952f5b34dada9892568e7cd;hp=a4a9c2189560f8815a21cdbfbe550801bcee7851;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index a4a9c21895..7236987cad 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -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';
}
}
@@ -93,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),
@@ -108,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
}
@@ -124,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,
@@ -154,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
@@ -171,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
@@ -197,11 +190,11 @@ 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 = '
|
- ' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '
+ {%message,MEMBER_BONUS_NO_RANKS=' . $data . '%}
|
';
}
@@ -210,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
@@ -230,7 +228,7 @@ function handleBonusPoints ($mode) {
}
// Check his amount first
- $total = getTotalPoints(getBonusUserId());
+ $total = getTotalPoints($userid);
// Subtract points from...
switch (getBonusMode()) {
@@ -239,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;
@@ -250,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;
@@ -261,12 +259,15 @@ 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
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
@@ -274,49 +275,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'] .= '{--MEMBER_BONUS_LOGIN_BONUS_ADDED--}
';
- } elseif (isExtensionActive('bonus')) {
- // No login bonus added!
- $GLOBALS['message'] .= '{--MEMBER_BONUS_LOGIN_BONUS_NOT_ADDED--}
';
- }
-}
-
//-----------------------------------------------------------------------------
// Wrapper Functions
//-----------------------------------------------------------------------------