A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[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 d2eca69e263c3bf4ce337f8ef168223771de121e..78573eef5cecaebbd8f61a1aa1828446019d30c2 100644 (file)
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -32,65 +32,55 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_MEMBER())
-{
+} elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN()))
-{
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "beg");
+} elseif ((!EXT_IS_ACTIVE("beg")) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "beg");
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Autopurge installed?
-$LAST = "%s"; $ONLINE = "";
-if (EXT_IS_ACTIVE("autopurge"))
-{
+$lastOnline = "%s"; $ONLINE = "";
+if (EXT_IS_ACTIVE("autopurge")) {
        // Use last online timestamp to keep inactive members away from here
-       $LAST   = " AND last_online >= %s";
-       $ONLINE = bigintval(time() - $_CONFIG['ap_in_since']);
+       $lastOnline   = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+       $ONLINE = getConfig('ap_inactive_since');
 }
 
 // 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'".$LAST."
+$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, $_CONFIG['beg_ranks']), __FILE__, __LINE__);
+       array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = "";
-if (SQL_NUMROWS($result) > 0)
-{
+if (SQL_NUMROWS($result) > 0) {
        // Load our winners...
        $SW = 2; $cnt = 1;
-       while(list($uid, $turbo, $last) = SQL_FETCHROW($result))
-       {
+       while ($content = SQL_FETCHARRAY($result)) {
                // Prepare data for the template
                $content = array(
                        'sw'     => $SW,
                        'cnt'    => $cnt,
-                       'uid'    => bigintval($uid),
-                       'points' => TRANSLATE_COMMA($turbo),
-                       'last'   => MAKE_DATETIME($last, "2"),
+                       'uid'    => bigintval($content['userid']),
+                       'points' => TRANSLATE_COMMA($content['beg']),
+                       'last'   => MAKE_DATETIME($content['last_online'], "2"),
                );
 
                // Load row template
                $OUT .= LOAD_TEMPLATE("member_list_beg_row", true, $content);
 
                // Count one up and switch colors
-               $cnt++;$SW = 3 - $SW;
+               $cnt++; $SW = 3 - $SW;
        }
-}
- else
-{
+} else {
        // No one is interested in our "active rallye" ! :-(
        $OUT = LOAD_TEMPLATE("member_beg_404", true);
 }