Heavy rewrite:

[mailer.git] / inc / modules / member / what-beg2.php

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index cee62bc19af883a0b1c75703724ccddd91353674..99ffbfe1cc581cbeb2c7b585a70430508d5bb3b7 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('beg')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'beg'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('beg'));
        return;
 }
 
@@ -51,18 +51,28 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 
 // Autopurge installed?
-$lastOnline = "%s"; $ONLINE = '';
+$lastOnline = "%s";
+$ONLINE = '';
+
 if (EXT_IS_ACTIVE('autopurge')) {
        // Use last online timestamp to keep inactive members away from here
        $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
        $ONLINE = getConfig('ap_inactive_since');
-}
+} // END - if
 
-// Let's check if there are some points left we can "pay"...
-$result = SQL_QUERY_ESC("SELECT userid, beg_points AS beg, last_online FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE beg_points > 0 AND `status`='CONFIRMED'".$lastOnline."
-ORDER BY beg_points DESC, last_online DESC, userid LIMIT %s",
-       array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
+// Let's check if there are some points left we can 'pay'...
+$result = SQL_QUERY_ESC("SELECT
+       `userid`, `beg_points` AS beg, `last_online`
+FROM
+       `{!_MYSQL_PREFIX!}_user_data`
+WHERE
+       `beg_points` > 0 AND `status`='CONFIRMED'".$lastOnline."
+ORDER BY
+       `beg_points` DESC, `last_online` DESC, `userid` ASC LIMIT %s",
+       array(
+               $ONLINE,
+               getConfig('beg_ranks')
+       ), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = '';
@@ -76,18 +86,18 @@ if (SQL_NUMROWS($result) > 0) {
                        'cnt'    => $cnt,
                        'uid'    => bigintval($content['userid']),
                        'points' => translateComma($content['beg']),
-                       'last'   => generateDateTime($content['last_online'], "2"),
+                       'last'   => generateDateTime($content['last_online'], '2'),
                );
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE("member_list_beg_row", true, $content);
+               $OUT .= LOAD_TEMPLATE('member_list_beg_row', true, $content);
 
                // Count one up and switch colors
                $cnt++; $SW = 3 - $SW;
        }
 } else {
        // No one is interested in our "active rallye" ! :-(
-       $OUT = LOAD_TEMPLATE("member_beg_404", true);
+       $OUT = LOAD_TEMPLATE('member_beg_404', true);
 }
 
 // Free memory
@@ -97,7 +107,7 @@ SQL_FREERESULT($result);
 define('__BEG_ROWS', $OUT);
 
 // Load final template
-LOAD_TEMPLATE("member_list_beg");
+LOAD_TEMPLATE('member_list_beg');
 
 //
 ?>