Changeset 12801 for trunk/wp-admin/ms-users.php

Timestamp:

01/22/2010 10:27:26 PM (17 years ago)

Author:

ryan

Message:

Fix warnings. see #11644

File:

• trunk/wp-admin/ms-users.php (modified) (5 diffs)

trunk/wp-admin/ms-users.php

@@ -15 +15 @@
         wp_die( __('You do not have permission to access this page.') );
 
-if ( $_GET['updated'] == 'true' ) {
+if ( isset($_GET['updated']) && $_GET['updated'] == 'true' ) {
         ?>
         <div id="message" class="updated fade"><p>
@@ -46 +46 @@
         $apage = isset( $_GET['apage'] ) ? intval( $_GET['apage'] ) : 1;
         $num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : 15;
-        $s = wp_specialchars( trim( $_GET[ 's' ] ) );
+        $s = isset($_GET[ 's' ]) ? esc_attr( trim( $_GET[ 's' ] ) ) : '';
 
         $query = "SELECT * FROM {$wpdb->users}";
@@ -55 +55 @@
         }
 
-        if ( !isset($_GET['sortby']) )
-                $_GET['sortby'] = 'id';
-
-        if ( $_GET['sortby'] == 'email' )
+        $order_by = isset( $_GET['sortby'] ) ? $_GET['sortby'] : 'id';
+
+        if ( $order_by == 'email' ) {
                 $query .= ' ORDER BY user_email ';
-        elseif ( $_GET['sortby'] == 'id' )
+        } elseif ( $order_by == 'login' ) {
+                $query .= ' ORDER BY user_login ';
+        } elseif ( $order_by == 'name' ) {
+                $query .= ' ORDER BY display_name ';
+        } elseif ( $order_by == 'registered' ) {
+                $query .= ' ORDER BY user_registered ';
+        } else {
+                $order_by = 'id';
                 $query .= ' ORDER BY ID ';
-        elseif ( $_GET['sortby'] == 'login' )
-                $query .= ' ORDER BY user_login ';
-        elseif ( $_GET['sortby'] == 'name' )
-                $query .= ' ORDER BY display_name ';
-        elseif ( $_GET['sortby'] == 'registered' )
-                $query .= ' ORDER BY user_registered ';
-
-        $query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
+        }
+
+        $order = isset($_GET['order']) ? $_GET['order'] : 'ASC';
+        $order = ( 'DESC' == $order ) ? 'DESC' : 'ASC';
+        $query .= $order;
 
         if ( !empty( $s ) )
@@ -147 +150 @@
                                                 echo '<th scope="col" class="check-column"><input type="checkbox" /></th>';
                                         } else { ?>
-                                                <th scope="col"><a href="ms-users.php?sortby=<?php echo $column_id ?>&amp;<?php if ( $_GET['sortby'] == $column_id ) { if ( $_GET['order'] == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th>
+                                                <th scope="col"><a href="ms-users.php?sortby=<?php echo $column_id ?>&amp;<?php if ( $order_by == $column_id ) { if ( $order == 'DESC' ) { echo "order=ASC&amp;" ; } else { echo "order=DESC&amp;"; } } ?>apage=<?php echo $apage ?>"><?php echo $column_display_name; ?></a></th>
                                         <?php } ?>
                                 <?php } ?>
@@ -155 +158 @@
                         <?php if ($user_list) {
                                 $bgcolor = '';
+                                $class = '';
                                 foreach ( (array) $user_list as $user) {
                                         $class = ('alternate' == $class) ? '' : 'alternate';