Sort columns by colum IDs, fixes #291

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@943 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 28 insertions, 28 deletions

diff --git a/wp-admin/wpmu-blogs.php b/wp-admin/wpmu-blogs.php
index 3ea0891..b7d3f3b 100644
--- a/wp-admin/wpmu-blogs.php
+++ b/wp-admin/wpmu-blogs.php
@@ -230,15 +230,15 @@ switch( $_GET[ 'action' ] ) {
 				AND   wp_registration_log.IP LIKE ('%".$_GET[ 'ip_address' ]."%')";
 		}
 		if( isset( $_GET[ 'sortby' ] ) == false ) {
-			$_GET[ 'sortby' ] = 'ID';
+			$_GET[ 'sortby' ] = 'id';
 		}
-		if( $_GET[ 'sortby' ] == 'Registered' ) {
+		if( $_GET[ 'sortby' ] == 'registered' ) {
 			$query .= ' ORDER BY registered ';
-		} elseif( $_GET[ 'sortby' ] == 'ID' ) {
+		} elseif( $_GET[ 'sortby' ] == 'id' ) {
 			$query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
-		} elseif( $_GET[ 'sortby' ] == 'LastUpdated' ) {
+		} elseif( $_GET[ 'sortby' ] == 'lastupdated' ) {
 			$query .= ' ORDER BY last_updated ';
-		} elseif( $_GET[ 'sortby' ] == 'BlogName' ) {
+		} elseif( $_GET[ 'sortby' ] == 'blogname' ) {
 			$query .= ' ORDER BY domain ';
 		}
 		if( $_GET[ 'order' ] == 'DESC' ) {
@@ -329,7 +329,7 @@ function check_all_rows() {
 $posts_columns = array(
   'id'           => __('ID'),
   'blogname'     => __('Blog Name'),
-  'last_updated' => __('Last Updated'),
+  'lastupdated'  => __('Last Updated'),
   'registered'   => __('Registered'),
   'users'        => __('Users'),
   'plugins'      => __('Actions')
@@ -353,8 +353,8 @@ $sortby_url = "s=" . $_GET[ 's' ] . "&ip_address=" . $_GET[ 'ip_address' ];
 <table width="100%" cellpadding="3" cellspacing="3"> 
 	<tr>
 
-<?php foreach($posts_columns as $column_display_name) { ?>
-	<th scope="col"><a href="wpmu-blogs.php?<?php echo $sortby_url ?>&sortby=<?php echo urlencode( str_replace( ' ', '', $column_display_name ) ) ?>&<?php if( $_GET[ 'sortby' ] == str_replace( ' ', '', $column_display_name ) ) { if( $_GET[ 'order' ] == 'DESC' ) { echo "order=ASC&" ; } else { echo "order=DESC&"; } } ?>start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th>
+<?php foreach($posts_columns as $column_id => $column_display_name) { ?>
+	<th scope="col"><a href="wpmu-blogs.php?<?php echo $sortby_url ?>&sortby=<?php echo $column_id ?>&<?php if( $_GET[ 'sortby' ] == $column_id ) { if( $_GET[ 'order' ] == 'DESC' ) { echo "order=ASC&" ; } else { echo "order=DESC&"; } } ?>start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th>
 <?php } ?>
 
 	</tr>
@@ -395,7 +395,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 		<?php
 		break;
 
-	case 'last_updated':
+	case 'lastupdated':
 		?>
 		<td valign='top'><?php echo $blog[ 'last_updated' ] == '0000-00-00 00:00:00' ? __("Never") : $blog[ 'last_updated' ] ?></td>
 		<?php
diff --git a/wp-admin/wpmu-users.php b/wp-admin/wpmu-users.php
index f67773f..8f2db82 100644
--- a/wp-admin/wpmu-users.php
+++ b/wp-admin/wpmu-users.php
@@ -133,17 +133,17 @@ switch( $_GET[ 'action' ] ) {
 			$query .= " WHERE user_login LIKE '$search' OR user_email LIKE '$search'";
 		}
 		if( isset( $_GET[ 'sortby' ] ) == false ) {
-			$_GET[ 'sortby' ] = 'ID';
+			$_GET[ 'sortby' ] = 'id';
 		}
-		if( $_GET[ 'sortby' ] == 'Email' ) {
+		if( $_GET[ 'sortby' ] == 'email' ) {
 			$query .= ' ORDER BY user_email ';
-		} elseif( $_GET[ 'sortby' ] == 'ID' ) {
+		} elseif( $_GET[ 'sortby' ] == 'id' ) {
 			$query .= ' ORDER BY ID ';
-		} elseif( $_GET[ 'sortby' ] == 'Login' ) {
+		} elseif( $_GET[ 'sortby' ] == 'login' ) {
 			$query .= ' ORDER BY user_login ';
-		} elseif( $_GET[ 'sortby' ] == 'Name' ) {
+		} elseif( $_GET[ 'sortby' ] == 'name' ) {
 			$query .= ' ORDER BY display_name ';
-		} elseif( $_GET[ 'sortby' ] == 'Registered' ) {
+		} elseif( $_GET[ 'sortby' ] == 'registered' ) {
 			$query .= ' ORDER BY user_registered ';
 		}
 		if( $_GET[ 'order' ] == 'DESC' ) {
@@ -203,12 +203,12 @@ switch( $_GET[ 'action' ] ) {
 
 // define the columns to display, the syntax is 'internal name' => 'display name'
 $posts_columns = array(
-  'ID'              => __('ID'),
-  'user_login'      => __('Login'),
-  'user_email'      => __('Email'),
-  'display_name'    => __('Name'),
-  'user_registered' => __('Registered'),
-  'blogs'           => __('Blogs')
+  'id'         => __('ID'),
+  'login'      => __('Login'),
+  'remail'     => __('Email'),
+  'name'       => __('Name'),
+  'registered' => __('Registered'),
+  'blogs'      => __('Blogs')
 );
 $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 
@@ -243,8 +243,8 @@ function check_all_rows() {
 <table width="100%" cellpadding="3" cellspacing="3"> 
 	<tr>
 
-<?php foreach($posts_columns as $column_display_name) { ?>
-	<th scope="col"><?php if( $column_display_name == 'Blogs' ) { echo "Blogs"; } else { ?><a href="wpmu-users.php?sortby=<?php echo urlencode( $column_display_name ) ?>&<?php if( $_GET[ 'sortby' ] == $column_display_name ) { if( $_GET[ 'order' ] == 'DESC' ) { echo "order=ASC&" ; } else { echo "order=DESC&"; } } ?>start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th><?php } ?>
+<?php foreach($posts_columns as $column_id => $column_display_name) { ?>
+	<th scope="col"><?php if( $column_display_name == 'Blogs' ) { echo "Blogs"; } else { ?><a href="wpmu-users.php?sortby=<?php echo $column_id ?>&<?php if( $_GET[ 'sortby' ] == $column_id ) { if( $_GET[ 'order' ] == 'DESC' ) { echo "order=ASC&" ; } else { echo "order=DESC&"; } } ?>start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th><?php } ?>
 <?php } ?>
 
 	</tr>
@@ -262,32 +262,32 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	switch($column_name) {
 	
-	case 'ID':
+	case 'id':
 		?>
 		<th scope="row"><input type='checkbox' id='<?php echo $user[ 'ID' ] ?>' name='allusers[]' value='<?php echo $user[ 'ID' ] ?>' /> <label for='<?php echo $user[ 'ID' ] ?>'><?php echo $user[ 'ID' ] ?></label></th>
 		<?php
 		break;
 
-	case 'user_login':
+	case 'login':
 		?>
 		<td><label for='<?php echo $user[ 'ID' ] ?>'><?php echo $user[ 'user_login' ] ?></label>
 		</td>
 		<?php
 		break;
 
-	case 'display_name':
+	case 'name':
 		?>
 		<td><?php echo $user[ 'display_name' ] ?></td>
 		<?php
 		break;
 
-	case 'user_email':
+	case 'email':
 		?>
 		<td><?php echo $user[ 'user_email' ] ?></td>
 		<?php
 		break;
 
-	case 'user_registered':
+	case 'registered':
 		?>
 		<td><?php echo $user[ 'user_registered' ] ?></td>
 		<?php