Heavy rewrite:

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 026bbd20a22cfb7e52e958403944f8c3102568ef..06ea9acb00de05ef4664f3b0253364ee0b7e4eba 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -54,7 +54,7 @@ $curr = date('m', time());
 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) && (get
                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__);