X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fbonus_functions.php;h=d89df55f3090735b11eb4c2b2359fda4ac78564b;hp=cc09410198506487fe651b1fb82d5f16296a77df;hb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;hpb=a28637f0eb7975f2240c42d349e5f08a9722d9bb
diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index cc09410198..d89df55f30 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 *
@@ -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);
}
//
@@ -148,7 +149,7 @@ 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
@@ -187,9 +188,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
@@ -199,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;
@@ -212,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 = "
-
- ".getMaskedMessage('BONUS_NO_RANKS', $data)."
+ // @TODO Move this HTML to a template
+ $OUT = ' |
+
+ ' . getMaskedMessage('BONUS_NO_RANKS', $data) . '
|
-
\n";
+';
}
// Retutn content
@@ -293,7 +287,7 @@ 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 ;-)
@@ -301,17 +295,17 @@ function FILTER_ADD_LOGIN_BONUS () {
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
+ 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?
@@ -320,7 +314,7 @@ LIMIT 1",
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--}
';