Wrapper getBonusRanks() more used

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 085c941d54a8dd3723e07357ead14bb727081370..9f339426f8a787832a3c4ccc8de1c20687181fa5 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -105,7 +105,7 @@ ORDER BY
 
                        // Generate array fore the dynamic template
                        $WIN1 = ''; $WIN2 = '';
-                       if ($count <= getConfig('bonus_ranks')) {
+                       if ($count <= getBonusRanks()) {
                                // Maybe he can win his active bonus?
                                $WIN1 = '<strong>';
                                $WIN2 = '</strong>';

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index b505ddd0abe13e90cc0b38a1c492ed98577e5bfc..00fa5ac33bffff4ccc6ac2a900d3e174e5a96491 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -69,7 +69,9 @@ if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) {
 
 // Let's check if there are some points left we can 'pay'...
 $result = SQL_QUERY_ESC("SELECT
-       `userid`, ".$USE." AS `points`,`last_online`
+       `userid`,
+       ".$USE." AS `points`,
+       `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -78,8 +80,8 @@ WHERE
        " . $lastOnline . "
 ORDER BY
        `points` DESC,
-       last_online DESC,
-       userid ASC
+       `last_online` DESC,
+       `userid` ASC
 LIMIT {?bonus_ranks?}",
        array(
                $ONLINE

diff --git a/inc/monthly/monthly_bonus.php b/inc/monthly/monthly_bonus.php
index 0bde3fb1d48d45634b9c7ffdbdeb80a0a728417c..f41b0e4e9af7bced6f1c837f9c8a014b55d1cb81 100644 (file)
--- a/inc/monthly/monthly_bonus.php
+++ b/inc/monthly/monthly_bonus.php
@@ -49,7 +49,7 @@ if (!defined('__SECURITY')) {
 // Debug line
 //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-if ((getConfig('bonus_ranks') > 0) && (!isCssOutputMode())) {
+if ((getBonusRanks() > 0) && (!isCssOutputMode())) {
        // Extension 'autopurge' is inactive or purging of inactive accounts is deactivated
        $whereStatement = "WHERE `status`='CONFIRMED'";