X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Flibs%2Fbonus_functions.php;h=17736e92928eaf3137403c87d37d14d1cb70a440;hb=241acfbd7e38ff9916100dac9d88892713f85c7f;hp=72b6b2e24d47c57dcca4ddbd237100a2b3bb4f55;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;p=mailer.git
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 72b6b2e24d..17736e9292 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -44,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 = '';
@@ -64,7 +65,7 @@ function addTurboBonus ($mid, $userid, $type) {
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid type %s detected.", $type));
break;
- }
+ } // END - switch
// Is a column name set?
if (empty($column)) {
@@ -108,7 +109,7 @@ function addTurboBonus ($mid, $userid, $type) {
$points
), __FUNCTION__, __LINE__);
- if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != "ADD") && ($points > 0)) handleBonusPoints($points);
+ if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD') && ($points > 0)) handleBonusPoints($points);
}
//
@@ -127,7 +128,7 @@ function addBonusRanks ($data, $type, $userid) {
array(
$type,
$data,
- $userid
+ bigintval($userid)
), __FUNCTION__, __LINE__);
// Entry found?
@@ -139,24 +140,19 @@ function addBonusRanks ($data, $type, $userid) {
$self = true;
// Transfer data to template
- $GLOBALS['ranking_content']['yr_level'] = $GLOBALS['ranking_content']['level'];
- $GLOBALS['ranking_content']['yr_points'] = translateComma($GLOBALS['ranking_content']['points']);
- $GLOBALS['ranking_content']['yr_tmark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
+ $GLOBALS['ranking_content']['timemark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1);
// Load template
$GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', true, $GLOBALS['ranking_content']);
} // 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) {
+ if (!SQL_HASZERONUMS($result)) {
// 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
@@ -187,9 +183,6 @@ LIMIT 1",
// Is it not empty? Then use it
if (!empty($nick)) $rows['userid'] = $nick;
} // END - if
-
- // Translate comma
- $rows['points'] = translateComma($rows['points']);
} // END - if
// Free result
@@ -197,31 +190,23 @@ LIMIT 1",
// Add more
$rows['rank'] = $rank;
- $rows['sw'] = $SW;
-
- // Output row
- $OUT .= "
- ".$rows['rank'].". |
- ".$rows['userid']." |
- ".$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
@@ -231,10 +216,10 @@ 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'))) {
+ if ((getConfig('bonus_mode') == 'UID') && (getBonusUserId() == '0') && (isExtensionActive('jackpot'))) {
// Update database & config
updateConfiguration('bonus_mode', 'JACKPOT');
} // END - if
@@ -248,15 +233,15 @@ function handleBonusPoints ($mode) {
}
// Check his amount first
- $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
+ $total = getTotalPoints(getBonusUserId());
// Subtract points from...
switch (getConfig('bonus_mode')) {
case 'JACKPOT': // ... jackpot
- if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (getConfig('bonus_userid') > 0)) {
+ if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (isValidUserId(getBonusUserId()))) {
if ($total >= $points) {
// Subtract points from userid's account
- subtractPointsFromJackpot('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
+ subtractPointsFromJackpot('bonus_payout_jackpot', getBonusUserId(), $points);
} // END - if
} // END - if
break;
@@ -264,7 +249,7 @@ function handleBonusPoints ($mode) {
case 'UID': // ... userid's account
if ($total >= $points) {
// Subtract points from userid's account
- subtractPoints('bonus_payout_userid', getConfig('bonus_userid'), $points);
+ subtractPoints('bonus_payout_userid', getBonusUserId(), $points);
} elseif (isExtensionActive('jackpot')) {
// Try to subtract from jackpot
$dummy = subtractPointsFromJackpot($points);
@@ -280,7 +265,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
}
@@ -293,39 +278,67 @@ function FILTER_ADD_LOGIN_BONUS () {
// Is the user data valid?
if (!isMember()) {
// Do only run for logged in members
- debug_report_bug('Please only run this filter for logged in users.');
+ 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')) && (getConfig('bonus_active') == 'Y') && (getConfig('bonus_login_yn') == 'Y')) {
+ 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
+ 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()
- ), __FILE__, __LINE__
+ ), __FUNCTION__, __LINE__
);
// Updated entry?
$bonus = (SQL_AFFECTEDROWS() == 1);
} // END - if
- if (($bonus === true) && (getRequestElement('mode') == 'bonus')) {
+ if (($bonus === true) && (getRequestParameter('mode') == 'bonus')) {
// Output message with added points
- $GLOBALS['message'] .= '' . getMessage('BONUS_LOGIN_BONUS_ADDED') . '
';
+ $GLOBALS['message'] .= '{--BONUS_LOGIN_BONUS_ADDED--}
';
} elseif (isExtensionActive('bonus')) {
// No login bonus added!
$GLOBALS['message'] .= '{--BONUS_LOGIN_BONUS_NOT_ADDED--}
';
}
}
+///////////////////////////////////////////////////////////////////////////////
+// Wrapper functions //
+///////////////////////////////////////////////////////////////////////////////
+
+// 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'];
+}
+
+// Determines wether the "bonus new_member_notify" is active
+function isBonusNewMemberNotifyEnabled () {
+ // Do we have cache?
+ if (!isset($GLOBALS['bonus_new_member_notify_active'])) {
+ // Just determine it
+ $GLOBALS['bonus_new_member_notify_active'] = (getConfig('bonus_new_member_notify') == 'Y');
+ } // END - if
+
+ // Return cache
+ return $GLOBALS['bonus_new_member_notify_active'];
+}
+
// [EOF]
?>