Next wave of lesser getMessage() usage and more EL

[mailer.git] / inc / libs / bonus_functions.php

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index 21ef2d6d1b2dcbefc3e2aa155f0a8498496dcc7c..d89df55f3090735b11eb4c2b2359fda4ac78564b 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -149,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
@@ -197,12 +197,8 @@ LIMIT 1",
                        $rows['rank'] = $rank;
                        $rows['sw']   = $SW;
 
-                       // Output row
-                       $OUT .= "<tr>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\">".$rows['rank'].".</td>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">".$rows['userid']."</td>
-  <td class=\"bonus_rank_".$rows['rank']." bottom switch_sw".$rows['sw']."\" align=\"center\">{%pipe,translateComma=".$rows['points']."%}</td>
-</tr>\n";
+                       // Load row template
+                       $OUT .= loadTemplate('member_bonus_turbo_row', true, $rows);
 
                        // Switch color
                        $SW = 3 - $SW;
@@ -210,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 = "<tr>
-  <td colspan=\"3\" align=\"center\" height=\"30\" class=\"bottom\">
-    <div class=\"guest_failed\">".getMaskedMessage('BONUS_NO_RANKS', $data)."</div>
+               // @TODO Move this HTML to a template
+               $OUT = '<tr>
+  <td colspan="3" align="center" height="30" class="bottom">
+    <div class="guest_failed">' . getMaskedMessage('BONUS_NO_RANKS', $data) . '</div>
   </td>
-</tr>\n";
+</tr>';
        }
 
        // Retutn content
@@ -291,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 ;-)
@@ -299,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?