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

[mailer.git] / inc / modules / admin / what-list_user.php

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index dfe81a2533b0400ef92019407b188e670e12524d..da272fda88862c89476832a9d4f8a72c26493233 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
        // Missing extension!
-       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
        return;
 }
 
@@ -233,8 +233,8 @@ LIMIT 1",
        } // END = if
 
        // Prepare SQL and run it
-       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM `{!_MYSQL_PREFIX!}_user_data`".$whereStatement." ORDER BY ".REQUEST_GET(('sortby'));
-       $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
+       $sql = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status, emails_sent, mails_confirmed, emails_received".$MORE." FROM `{!_MYSQL_PREFIX!}_user_data`".$whereStatement." ORDER BY ".REQUEST_GET(('sortby'));
+       $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
        if (getConfig('user_limit') == 0) {
@@ -249,8 +249,8 @@ LIMIT 1",
        if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', getConfig('user_limit'));
 
        // Add limitation to SQL string and run him again
-       $SQL .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
-       $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+       $sql .= " LIMIT ".(REQUEST_GET('offset') * REQUEST_GET('page') - REQUEST_GET('offset')).", ".REQUEST_GET('offset');
+       $result = SQL_QUERY($sql, __FILE__, __LINE__);
 
        $result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED'", __FILE__, __LINE__);
        $user_count = SQL_NUMROWS($result_user);
@@ -287,7 +287,7 @@ LIMIT 1",
                }
 
                // Load all users
-               $SW = 2; $OUT = "";
+               $OUT = ""; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Set refid link
                        if ($content['refid'] > 0) $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);