More constant rewrites

[mailer.git] / inc / modules / member / what-bonus.php

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 13f45b08d5cb6492920077c0fea1bf13f4f69656..ee9965faafac13e0fb95628ef8cdcc88a4c19f6a 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -38,16 +38,16 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
 } elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) {
-       addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "bonus");
        return;
 }
 
 // Add description as navigation point
 ADD_DESCR("member", __FILE__);
 
-if (GET_EXT_VERSION("bonus") >= "0.6.9")
-{
+if (GET_EXT_VERSION("bonus") >= "0.6.9") {
        // Add more bonus points here
+       // @TODO Rewrite this to a filter
        $USE = "(0";
        if (getConfig('bonus_click_yn') == "Y") $USE .= " + turbo_bonus";
        if (getConfig('bonus_login_yn') == "Y") $USE .= " + login_bonus";
@@ -55,24 +55,22 @@ if (GET_EXT_VERSION("bonus") >= "0.6.9")
        if (getConfig('bonus_stats_yn') == "Y") $USE .= " + bonus_stats";
        if (getConfig('bonus_ref_yn')   == "Y") $USE .= " + bonus_ref";
        $USE .= ")";
-}
- else
-{
+} else {
        // Old version ???
        $USE = "turbo_bonus";
 }
 
 // Autopurge installed?
-$LAST = "%s"; $ONLINE = "";
+$lastOnline = "%s"; $ONLINE = "";
 if (EXT_IS_ACTIVE("autopurge")) {
        // Use last online timestamp to keep inactive members away from here
-       $LAST   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+       $lastOnline   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
        $ONLINE = getConfig('ap_inactive_since');
 }
 
 // Let's check if there are some points left we can "pay"...
-$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM "._MYSQL_PREFIX."_user_data
-WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST."
+$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE ".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline."
 ORDER BY points DESC, last_online DESC, userid
 LIMIT %s",
        array($ONLINE, getConfig('bonus_ranks')), __FILE__, __LINE__);