X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=0ef95848f653e01244321f0f89915468935ea42a;hb=b6c301dece2d7a3375321d4f3c0498ceaeb5a2a6;hp=fae8d5f93f7497ba7b524e315922c80cffef51fc;hpb=67f53c107d5b68f6e735407b98803fc83e12d7b4;p=mailer.git
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index fae8d5f93f..0ef95848f6 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -14,11 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* 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 *
@@ -87,7 +85,7 @@ function addTurboBonus ($mid, $userid, $type) {
// Level found
$points = $test[$rank - 2];
} else {
- // Level not found!
+ // Level not found
$points = '0.00000';
}
}
@@ -109,7 +107,9 @@ function addTurboBonus ($mid, $userid, $type) {
$points
), __FUNCTION__, __LINE__);
- if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD') && ($points > 0)) handleBonusPoints($points);
+ if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) {
+ handleBonusPoints($points);
+ } // END - if
}
//
@@ -150,11 +150,8 @@ function addBonusRanks ($data, $type, $userid) {
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
array($type, $data), __FUNCTION__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
- // Start generating the ranking list
- $max = SQL_NUMROWS($result);
-
// Output all ranks (levels)
- for ($rank = 1; $rank <= $max; $rank++) {
+ for ($rank = 1; $rank <= SQL_NUMROWS($result); $rank++) {
// Load data
$result_users = SQL_QUERY_ESC("SELECT
`userid`, `points`
@@ -200,11 +197,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) . '
+ ' . getMaskedMessage('MEMBER_BONUS_NO_RANKS', $data) . '
|
';
}
@@ -219,7 +216,7 @@ function handleBonusPoints ($mode) {
if (!isBonusRallyeActive()) return;
// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
- if ((getConfig('bonus_mode') == 'UID') && (getBonusUserId() == '0') && (isExtensionActive('jackpot'))) {
+ if ((getBonusMode() == 'UID') && (getBonusUserId() == '0') && (isExtensionActive('jackpot'))) {
// Update database & config
updateConfiguration('bonus_mode', 'JACKPOT');
} // END - if
@@ -236,7 +233,11 @@ function handleBonusPoints ($mode) {
$total = getTotalPoints(getBonusUserId());
// Subtract points from...
- switch (getConfig('bonus_mode')) {
+ 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) {
@@ -255,6 +256,10 @@ function handleBonusPoints ($mode) {
$dummy = subtractPointsFromJackpot($points);
}
break;
+
+ default: // This should not happen
+ debug_report_bug(__FUNCTION__, __LINE__, 'Invalid bonus-mode ' . getBonusMode() . ' detected.');
+ break;
} // END - switch
}
@@ -263,58 +268,15 @@ function purgeExpiredTurboBonus() {
// Remove entries
$result = SQL_QUERY('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `timemark` < (UNIX_TIMESTAMP() - {?bonus_timeout?})', __FUNCTION__, __LINE__);
- if (SQL_AFFECTEDROWS() > 0) {
+ if (!SQL_HASZEROAFFECTED()) {
// Send out email to admin
sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
} // END - if
}
-///////////////////////////////////////////////////////////////////////////////
-// Only 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_AFFECTEDROWS() == 1);
- } // 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 //
-///////////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+// Wrapper Functions
+//-----------------------------------------------------------------------------
// Determines wether the "bonus rallye" is active
function isBonusRallyeActive () {
@@ -340,5 +302,41 @@ function isBonusNewMemberNotifyEnabled () {
return $GLOBALS['bonus_new_member_notify_active'];
}
+// Getter for bonus_timeout
+function getBonusTimeout () {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Determine it
+ $GLOBALS[__FUNCTION__] = getConfig('bonus_timeout');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for bonus_mode
+function getBonusMode () {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Determine it
+ $GLOBALS[__FUNCTION__] = getConfig('bonus_mode');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for bonus_ranks
+function getBonusRanks () {
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Determine it
+ $GLOBALS[__FUNCTION__] = getConfig('bonus_ranks');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
// [EOF]
?>