Fixes for filter 'load_includes'

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

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index c11ad3c823703cee6d2a9e64e5cd969416ddeacf..c3440470b3012f9aac04df0c0304e131e3426247 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -46,28 +46,28 @@ if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
 // Get current month (2 digits)
 $curr = date("m", time());
 
-if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS != 1)) {
+if (($curr != getConfig('last_month')) && (getConfig('bonus_ranks') > 0) && ($CSS != 1)) {
        // Extension "autopurge" is inactive or purging of inactive accounts is deactivated
        $whereStatement1 = "WHERE status='CONFIRMED'";
-       $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
+       $whereStatement2 = bigintval(getConfig('bonus_ranks'));
 
        // Shall I keep inactive members away from here? (mostly wanted in an "active-rallye" ...)
        if (EXT_IS_ACTIVE("autopurge")) {
                // Use last online stamp only when autopurge for inactive members is activated
-               if ($_CONFIG['ap_inactive_since'] > 0) {
+               if (getConfig('ap_inactive_since') > 0) {
                        // Okay, include last online timestamp
-                       $whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']);
-                       $whereStatement2 = bigintval($_CONFIG['bonus_ranks']);
+                       $whereStatement1 = sprintf("WHERE status='CONFIRMED' AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
+                       $whereStatement2 = bigintval(getConfig('bonus_ranks'));
                } // END - if
        } // END - if
 
        // Add more bonus points here
        $ADD = "";
-       if ($_CONFIG['bonus_click_yn'] == "Y") $ADD .= " + turbo_bonus";
-       if ($_CONFIG['bonus_login_yn'] == "Y") $ADD .= " + login_bonus";
-       if ($_CONFIG['bonus_order_yn'] == "Y") $ADD .= " + bonus_order";
-       if ($_CONFIG['bonus_stats_yn'] == "Y") $ADD .= " + bonus_stats";
-       if ($_CONFIG['bonus_ref_yn']   == "Y") $ADD .= " + bonus_ref";
+       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)) {
@@ -78,7 +78,8 @@ if (($curr != $_CONFIG['last_month']) && ($_CONFIG['bonus_ranks'] > 0) && ($CSS
        $result_main = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, (0".$ADD.") AS points
 FROM "._MYSQL_PREFIX."_user_data
 ".$whereStatement1."".$ADD."
-ORDER BY active_bonus DESC, userid LIMIT %s",
+ORDER BY points DESC, userid
+LIMIT %s",
                array($whereStatement2), __FILE__, __LINE__);
 
        // Some entries were found?
@@ -88,10 +89,10 @@ ORDER BY active_bonus DESC, userid LIMIT %s",
                        // Make sure zero points are not mailed
                        if ($content['points'] > 0) {
                                // Add points to user's account directly
-                               ADD_POINTS_REFSYSTEM($content['uid'], $content['points'], false, "0", false, "direct");
+                               ADD_POINTS_REFSYSTEM("monthly_bonus", $content['uid'], $content['points'], false, "0", false, "direct");
 
                                // Translate gender/points
-                               $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                               $content['gender']       = TRANSLATE_GENDER($content['gender']);
                                $content['points'] = TRANSLATE_COMMA($content['points']);
 
                                // Load email template and email it away