X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=d89df55f3090735b11eb4c2b2359fda4ac78564b;hp=c348118bbfd3169eccee73e8fac7e9c800984bd1;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=b5cc7a564aee39e995b64c3db502b02ef20379bd
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index c348118bbf..d89df55f30 100644
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -1,7 +1,7 @@
= '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);
}
//
@@ -121,7 +125,13 @@ function addBonusRanks ($data, $type, $userid) {
// 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",
- array($type, $data, $userid), __FUNCTION__, __LINE__);
+ array(
+ $type,
+ $data,
+ $userid
+ ), __FUNCTION__, __LINE__);
+
+ // Entry found?
if (SQL_NUMROWS($result) == 1) {
// Load data
$GLOBALS['ranking_content'] = merge_array($GLOBALS['ranking_content'], SQL_FETCHARRAY($result));
@@ -132,15 +142,15 @@ function addBonusRanks ($data, $type, $userid) {
// 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']['yr_tmark'] = 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 %s",
- array($type, $data, getConfig('bonus_lines')), __FUNCTION__, __LINE__);
+ $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);
@@ -176,11 +186,8 @@ LIMIT 1",
$nick = getNickname($rows['userid']);
// Is it not empty? Then use it
- if (!empty($nick)) $rows['userid'] = $nick . '(' . $rows['userid'] . ')';
+ if (!empty($nick)) $rows['userid'] = $nick;
} // END - if
-
- // Translate comma
- $rows['points'] = translateComma($rows['points']);
} // END - if
// Free result
@@ -190,12 +197,8 @@ LIMIT 1",
$rows['rank'] = $rank;
$rows['sw'] = $SW;
- // Output row
- $OUT .= "
- | ".$rows['rank'].". |
- ".$rows['userid']." |
- ".$rows['points']." |
-
\n";
+ // Load row template
+ $OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
// Switch color
$SW = 3 - $SW;
@@ -203,16 +206,16 @@ LIMIT 1",
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 = "
- |
- ".sprintf(getMessage('BONUS_NO_RANKS'), $data)."
+ // @TODO Move this HTML to a template
+ $OUT = ' |
+ |
+ ' . getMaskedMessage('BONUS_NO_RANKS', $data) . '
|
-
\n";
+';
}
// Retutn content
@@ -238,22 +241,21 @@ function handleBonusPoints ($mode) {
$points = $mode;
}
+ // Check his amount first
+ $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
+
// Subtract points from...
switch (getConfig('bonus_mode')) {
case 'JACKPOT': // ... jackpot
if ((isExtensionActive('jackpot')) && (subtractPointsFromJackpot($points) == -1) && (getConfig('bonus_userid') > 0)) {
- // Check points amount first...
- $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
if ($total >= $points) {
// Subtract points from userid's account
- subtractPoints('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
+ subtractPointsFromJackpot('bonus_payout_jackpot', getConfig('bonus_userid'), $points);
} // END - if
} // END - if
break;
case 'UID': // ... userid's account
- // Check his amount first
- $total = countSumTotalData(getConfig('bonus_userid'), 'user_points', 'points') - countSumTotalData(getConfig('bonus_userid'), 'user_data', 'used_points');
if ($total >= $points) {
// Subtract points from userid's account
subtractPoints('bonus_payout_userid', getConfig('bonus_userid'), $points);
@@ -262,7 +264,7 @@ function handleBonusPoints ($mode) {
$dummy = subtractPointsFromJackpot($points);
}
break;
- }
+ } // END - switch
}
// Purges expired fast-click bonus entries
@@ -272,9 +274,52 @@ function purgeExpiredTurboBonus() {
if (SQL_AFFECTEDROWS() > 0) {
// Send out email to admin
- sendAdminNotification(getMessage('AUTOPURGE_ADMIN_TURBO_SUBJECT'), 'admin_autopurge_turbo', SQL_AFFECTEDROWS(), '');
+ sendAdminNotification(getMessage('AUTOPURGE_ADMIN_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')) && (getConfig('bonus_active') == 'Y') && (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'] .= '{--BONUS_LOGIN_BONUS_ADDED--}
';
+ } elseif (isExtensionActive('bonus')) {
+ // No login bonus added!
+ $GLOBALS['message'] .= '{--BONUS_LOGIN_BONUS_NOT_ADDED--}
';
+ }
+}
+
+// [EOF]
?>