Some fixes for surfbar extension (#123), double->single, misc cleanups/fixes

[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 a0143e28a06c820d230a694c4240fc994bb8c862..52d2998e15abc677b5e247ad7448b3a85e3cecc0 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -54,9 +54,9 @@ $listHeader = getMessage('ADMIN_ALL_ACCOUNTS');
 if (REQUEST_ISSET_GET(('status'))) {
        // Set title according to the 'status'
        $listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(REQUEST_GET(('status')))));
-} elseif (REQUEST_ISSET_GET(('mode'))) {
+} elseif (REQUEST_ISSET_GET('mode')) {
        // Set title according to the "mode"
-       $listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(REQUEST_GET(('mode')))));
+       $listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(REQUEST_GET('mode'))));
 }
 
 // Remember it
@@ -89,9 +89,9 @@ if (EXT_IS_ACTIVE('country')) {
        $MORE .= ", country";
 }
 
-// Init unset data (bad that we change $_GET here!)
-if (!REQUEST_ISSET_GET(('letter'))) { REQUEST_SET_GET('letter', getMessage('_ALL2')); }
-if (!REQUEST_ISSET_GET(('sortby'))) { REQUEST_SET_GET('sortby', 'userid');            }
+// Init unset data
+if (!REQUEST_ISSET_GET('letter')) { REQUEST_SET_GET('letter', getMessage('_ALL2')); }
+if (!REQUEST_ISSET_GET('sortby')) { REQUEST_SET_GET('sortby', 'userid');            }
 if (!REQUEST_ISSET_GET('page'))   { REQUEST_SET_GET('page'  , '1');                 }
 
 // Set base URL
@@ -112,9 +112,9 @@ LIMIT 1",
                $DATA  = SQL_FETCHARRAY($result_user);
 
                // Get count/sum of refs, selected categories, unconfirmed mails
-               $REFS  = GET_TOTAL_DATA($uid, "refsystem", "counter");
-               $CATS  = GET_TOTAL_DATA($uid, "user_cats", 'id', 'userid', true);
-               $LINKS = GET_TOTAL_DATA($uid, "user_links", 'id', 'userid', true);
+               $REFS  = GET_TOTAL_DATA($uid, 'refsystem', 'counter');
+               $CATS  = GET_TOTAL_DATA($uid, 'user_cats', 'id', 'userid', true);
+               $LINKS = GET_TOTAL_DATA($uid, 'user_links', 'id', 'userid', true);
 
                // Add links to the numbers
                if ($LINKS > 0) $LINKS = $base."&amp;what=list_links&amp;uid=".$uid."\">".$LINKS."</a>]";
@@ -192,7 +192,7 @@ LIMIT 1",
                }
 
                // Load user-details template
-               LOAD_TEMPLATE("admin_user_details", false, $uid);
+               LOAD_TEMPLATE('admin_user_details', false, $uid);
        } else {
                // Account does not exist!
                LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $uid));
@@ -202,11 +202,11 @@ LIMIT 1",
        SQL_FREERESULT($result_user);
 } else {
        $whereStatement = '';
-       if ((REQUEST_GET('letter') != getMessage('_ALL2')) && (REQUEST_GET('letter') != getMessage('_OTHERS')) && (REQUEST_ISSET_GET(('letter')))) {
+       if ((REQUEST_GET('letter') != getMessage('_ALL2')) && (REQUEST_GET('letter') != getMessage('_OTHERS')) && (REQUEST_ISSET_GET('letter'))) {
                // List only persons w
-               $whereStatement = " WHERE family LIKE '".REQUEST_GET('letter')."%'";
+               $whereStatement = " WHERE family LIKE '".REQUEST_GET('letter') . "%'";
        } // END - if
-       if (REQUEST_GET('sortby') == "family_name") REQUEST_SET_GET('sortby', "family");
+       if (REQUEST_GET('sortby') == 'family_name') REQUEST_SET_GET('sortby', 'family');
 
        // Parse the status or mode parameter
        if (REQUEST_ISSET_GET(('status'))) {
@@ -218,7 +218,7 @@ LIMIT 1",
                        // Start a new one
                        $whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper(REQUEST_GET('status')))));
                }
-       } elseif (REQUEST_ISSET_GET(('mode'))) {
+       } elseif (REQUEST_ISSET_GET('mode')) {
                // Choose what we need to list
                switch (REQUEST_GET('mode')) {
                        case "norefs": // Users w/o refs
@@ -232,13 +232,13 @@ LIMIT 1",
                                break;
 
                        default: // Invalid list mode
-                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", REQUEST_GET(('mode'))));
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", REQUEST_GET('mode')));
                                break;
                }
        } // 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'));
+       $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)