A lot CSS classes rewritten, please update all your themes.

[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 36bff36b2c4597b2f8c70078480536df74175905..6f88dcfa5dac98f8651cdd73b50497f543ce1d9c 100644 (file)
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -52,7 +52,7 @@ if ((!isExtensionActive('bonus')) && (!isAdmin())) {
        return;
 } // END - if
 
-if (getExtensionVersion('bonus') >= '0.6.9') {
+if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
        // Add more bonus points here
        // @TODO Rewrite this to a filter
        $USE = '(0';
@@ -68,12 +68,11 @@ if (getExtensionVersion('bonus') >= '0.6.9') {
 }
 
 // Autopurge installed?
-$lastOnline = "%s"; $ONLINE = '';
+$lastOnline = '%s'; $ONLINE = '';
 if (isExtensionActive('autopurge')) {
        // Use last online timestamp to keep inactive members away from here
-       $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
-       $ONLINE = getConfig('ap_inactive_since');
-}
+       $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
+} // END - if
 
 // Let's check if there are some points left we can 'pay'...
 $result = SQL_QUERY_ESC("SELECT
@@ -81,38 +80,38 @@ $result = SQL_QUERY_ESC("SELECT
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       ".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline."
+       " . $USE . " > 0 AND
+       `status`='CONFIRMED'
+       " . $lastOnline . "
 ORDER BY
        `points` DESC,
        last_online DESC,
        userid ASC
-LIMIT %s",
+LIMIT {?bonus_ranks?}",
        array(
-               $ONLINE,
-               getConfig('bonus_ranks')
+               $ONLINE
        ), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = '';
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        // Load our winners...
-       $SW = 2; $cnt = 1;
+       $cnt = 1;
        while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
                $content = array(
-                       'sw'     => $SW,
-                       'cnt'    => $cnt,
-                       'userid'    => bigintval($content['userid']),
-                       'points' => translateComma($content['points']),
-                       'last_online'   => generateDateTime($content['last_online'], 2)
+                       'cnt'         => $cnt,
+                       'userid'      => $content['userid'],
+                       'points'      => $content['points'],
+                       'last_online' => generateDateTime($content['last_online'], 2)
                );
 
                // Load row template
                $OUT .= loadTemplate('member_bonus_row', true, $content);
 
-               // Count one up and switch colors
-               $cnt++; $SW = 3 - $SW;
-       }
+               // Count one up
+               $cnt++;
+       } // END - while
 } else {
        // No one is interested in our "active rallye" ! :-(
        $OUT = loadTemplate('member_bonus_404', true);