X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=8570debddff4212e612b400c22f323179dddd851;hb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;hp=5c99bb2e47dae5cfc4a58541cdc0a55591f6ecfd;hpb=ad30a667fd8abeb576c04026b62c2e8a29d86f52;p=mailer.git
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 5c99bb2e47..8570debddf 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
// This function must be run *BEFORE* a link is removed from table 'mxchange_user_links' !
function addTurboBonus ($mid, $userid, $type) {
// Shall we add bonus points?
- if (getConfig('bonus_active') != 'Y') return false;
+ if (!isBonusRallyeActive()) return false;
// Init variables
$sql = ''; $bonus = '0'; $mail = '0'; $column = '';
@@ -149,15 +149,12 @@ function addBonusRanks ($data, $type, $userid) {
} // END - if
// Load rankings
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE %s=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}",
+ $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_NUMROWS($result) > 0) {
// Start generating the ranking list
$max = SQL_NUMROWS($result);
- // Init variables
- $SW = 2;
-
// Output all ranks (levels)
for ($rank = 1; $rank <= $max; $rank++) {
// Load data
@@ -195,31 +192,23 @@ LIMIT 1",
// Add more
$rows['rank'] = $rank;
- $rows['sw'] = $SW;
-
- // Output row
- $OUT .= "
- ".$rows['rank'].". |
- ".$rows['userid']." |
- {%pipe,translateComma=".$rows['points']."%} |
-
\n";
- // Switch color
- $SW = 3 - $SW;
+ // Load row template
+ $OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
} // END - for
if ($self === false) {
// If current user was not found set constant
- // @TODO Try to find a way for rewriting this constant
- $GLOBALS['ranking_content']['rankings'] = getMessage('BONUS_RANK_YOU_ARE_404');
+ $GLOBALS['ranking_content']['rankings'] = '{--BONUS_RANK_YOU_ARE_404--}';
} // END - if
} else {
// No entries found!
- $OUT = "
-
- ".getMaskedMessage('BONUS_NO_RANKS', $data)."
+ // @TODO Move this HTML to a template
+ $OUT = ' |
+
+ ' . getMaskedMessage('BONUS_NO_RANKS', $data) . '
|
-
\n";
+';
}
// Retutn content
@@ -229,7 +218,7 @@ LIMIT 1",
//
function handleBonusPoints ($mode) {
// Shall we add bonus points?
- if (getConfig('bonus_active') != 'Y') return;
+ if (!isBonusRallyeActive()) return;
// Switch to jackpot-mode when no UID is supplied but userid-mode is selected
if ((getConfig('bonus_mode') == 'UID') && (getConfig('bonus_userid') == '0') && (isExtensionActive('jackpot'))) {
@@ -278,7 +267,7 @@ function purgeExpiredTurboBonus() {
if (SQL_AFFECTEDROWS() > 0) {
// Send out email to admin
- sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
+ sendAdminNotification('{--ADMIN_AUTOPURGE_TURBO_SUBJECT--}', 'admin_autopurge_turbo', SQL_AFFECTEDROWS());
} // END - if
}
@@ -296,17 +285,17 @@ function FILTER_ADD_LOGIN_BONUS () {
// Bonus is not given by default ;-)
$bonus = false;
- if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (getConfig('bonus_active') == 'Y') && (getConfig('bonus_login_yn') == 'Y')) {
+ if ((isExtensionInstalledAndNewer('sql_patches', '0.2.8')) && (ifBonusRallyeActive()) && (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
+ 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",
+LIMIT 1',
array(
getMemberId()
), __FUNCTION__, __LINE__
@@ -325,5 +314,17 @@ LIMIT 1",
}
}
+// Determines wether the "bonus rallye" is active
+function isBonusRallyeActive () {
+ // Do we have cache?
+ if (!isset($GLOBALS['bonus_rallye_active'])) {
+ // Just determine it
+ $GLOBALS['bonus_rallye_active'] = (getConfig('bonus_active') == 'Y');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS['bonus_rallye_active'];
+}
+
// [EOF]
?>