X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=6418d1e5431e9c5cc50a9cba5f361abd1ba72f17;hb=76740e48546bb3fdb9fca65d8d205765f2bd4d68;hp=e9e982ff6eea67a825f157639b84ae9ad92c95e0;hpb=34297125f617f854d2cc009d3cc4f16b6581a1f5;p=mailer.git
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index e9e982ff6e..6418d1e543 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';
}
}
@@ -93,8 +95,8 @@ 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
@@ -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 . '%}
|
';
}
@@ -216,7 +209,7 @@ function handleBonusPoints ($mode) {
if (!isBonusRallyeActive()) return;
// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
- if ((getBonusMode() == 'UID') && (getBonusUserId() == '0') && (isExtensionActive('jackpot'))) {
+ if ((getBonusMode() == 'UID') && (getBonusUserid() == '0') && (isExtensionActive('jackpot'))) {
// Update database & config
updateConfiguration('bonus_mode', 'JACKPOT');
} // END - if
@@ -230,7 +223,7 @@ function handleBonusPoints ($mode) {
}
// Check his amount first
- $total = getTotalPoints(getBonusUserId());
+ $total = getTotalPoints(getBonusUserid());
// Subtract points from...
switch (getBonusMode()) {
@@ -239,10 +232,10 @@ function handleBonusPoints ($mode) {
break;
case 'JACKPOT': // ... jackpot
- if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserId()))) {
+ if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserid()))) {
if ($total >= $points) {
// Subtract points from userid's account
- subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserId(), $points);
+ subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserid(), $points);
} // END - if
} // END - if
break;
@@ -250,7 +243,7 @@ function handleBonusPoints ($mode) {
case 'UID': // ... userid's account
if ($total >= $points) {
// Subtract points from userid's account
- subtractPoints('bonus_payout_userid', getBonusUserId(), $points);
+ subtractPoints('bonus_payout_userid', getBonusUserid(), $points);
} elseif (isExtensionActive('jackpot')) {
// Try to subtract from jackpot
$dummy = subtractPointsFromJackpot($points);
@@ -266,7 +259,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
@@ -274,49 +267,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
//-----------------------------------------------------------------------------