More misc fixes and rewrites (sorry, lame description)

[mailer.git] / inc / monthly / monthly_bonus.php

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 1d6026ebb48cdc0622c03c5bb0984a10f859ea71..d18b95c6cd7502f437945d6d7bc4b663d7809dd7 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -45,16 +45,16 @@ if (!defined('__SECURITY')) {
 }
 
 // Do not execute when script is in CSS mode or no daily reset
-if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled())) return;
+if ((getOutputMode() == 1) || (!isResetModeEnabled())) return;
 //* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
 $curr = date('m', time());
 
-if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && ($GLOBALS['output_mode'] != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && (getOutputMode() != 1)) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE `status`='CONFIRMED'";
-       $whereStatement2 = getConfig(('bonus_ranks'));
+       $whereStatement2 = getConfig('bonus_ranks');
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (EXT_IS_ACTIVE('autopurge')) {
@@ -62,28 +62,32 @@ if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && ($GL
                if (getConfig('ap_inactive_since') > 0) {
                        // Okay, include last online timestamp
                        $whereStatement1 = sprintf("WHERE `status`='CONFIRMED' AND `last_online` >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
-                       $whereStatement2 = getConfig(('bonus_ranks'));
+                       $whereStatement2 = getConfig('bonus_ranks');
                } // END - if
        } // END - if
 
        // Add more bonus points here
        $add = '';
-       if (getConfig('bonus_click_yn') == 'Y') $add .= " + turbo_bonus";
-       if (getConfig('bonus_login_yn') == 'Y') $add .= " + login_bonus";
-       if (getConfig('bonus_order_yn') == 'Y') $add .= " + bonus_order";
-       if (getConfig('bonus_stats_yn') == 'Y') $add .= " + bonus_stats";
-       if (getConfig('bonus_ref_yn')   == 'Y') $add .= " + bonus_ref";
+       // @TODO Rewrite this to a filter
+       if (getConfig('bonus_click_yn') == 'Y') $add .= " + `turbo_bonus`";
+       if (getConfig('bonus_login_yn') == 'Y') $add .= " + `login_bonus`";
+       if (getConfig('bonus_order_yn') == 'Y') $add .= " + `bonus_order`";
+       if (getConfig('bonus_stats_yn') == 'Y') $add .= " + `bonus_stats`";
+       if (getConfig('bonus_ref_yn')   == 'Y') $add .= " + `bonus_ref`";
 
        // Shall we add some entries?
        if (!empty($add)) {
-               $whereStatement1 .= " AND (0".$add.") > 0";
+               $whereStatement1 .= " AND (0" . $add . ") > 0";
        } // END - if
 
        // Run SQL string to check for accounts
-       $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (0".$add.") AS points
-FROM `{!_MYSQL_PREFIX!}_user_data`
+       $result_main = SQL_QUERY_ESC("SELECT `userid`, `email`, `gender`, `surname`, `family`, (0".$add.") AS points
+FROM
+       `{!_MYSQL_PREFIX!}_user_data`
 ".$whereStatement1."".$add."
-ORDER BY points DESC, userid
+ORDER BY
+       `points` DESC,
+       `userid` ASC
 LIMIT %s",
        array($whereStatement2), __FILE__, __LINE__);
 
@@ -101,8 +105,8 @@ LIMIT %s",
                                $content['points'] = translateComma($content['points']);
 
                                // Load email template and email it away
-                               $msg = LOAD_EMAIL_TEMPLATE("member_bonus", $content['points'], bigintval($content['uid']));
-                               sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $msg);
+                               $message = LOAD_EMAIL_TEMPLATE('member_bonus', $content['points'], bigintval($content['uid']));
+                               sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
                        } // END - if
                } // END - while