Better ordering support - click colum to reverse order

Mass delete checkboxes in


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

3 files changed, 95 insertions, 43 deletions

diff --git a/wp-inst/wp-admin/wpmu-blogs.php b/wp-inst/wp-admin/wpmu-blogs.php
index ce475d5..6dc3edd 100644
--- a/wp-inst/wp-admin/wpmu-blogs.php
+++ b/wp-inst/wp-admin/wpmu-blogs.php
@@ -232,14 +232,15 @@ switch( $_GET[ 'action' ] ) {
 			$_GET[ 'sortby' ] = 'ID';
 		}
 		if( $_GET[ 'sortby' ] == 'Registered' ) {
-			$query .= ' ORDER BY registered DESC';
+			$query .= ' ORDER BY registered ';
 		} elseif( $_GET[ 'sortby' ] == 'ID' ) {
-			$query .= ' ORDER BY blog_id';
+			$query .= ' ORDER BY blog_id ';
 		} elseif( $_GET[ 'sortby' ] == 'Last Updated' ) {
-			$query .= ' ORDER BY last_updated DESC';
+			$query .= ' ORDER BY last_updated ';
 		} elseif( $_GET[ 'sortby' ] == 'Blog Name' ) {
-			$query .= ' ORDER BY domain';
+			$query .= ' ORDER BY domain ';
 		}
+		$query .= $_GET[ 'order' ];
 
 		$query .= " LIMIT $start, $num";
 		$blog_list = $wpdb->get_results( $query, ARRAY_A );
@@ -302,11 +303,12 @@ $posts_columns['control_delete']    = '';
 
 ?>
 
+<form action='wpmu-edit.php?action=allblogs' method='POST'>
 <table width="100%" cellpadding="3" cellspacing="3"> 
 	<tr>
 
 <?php foreach($posts_columns as $column_display_name) { ?>
-	<th scope="col"><a href="wpmu-blogs.php?sortby=<?php echo urlencode( $column_display_name ) ?>&start=<?php echo $start ?>"><?php echo $column_display_name; ?></a></th>
+	<th scope="col"><a href="wpmu-blogs.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 } ?>
 
 	</tr>
@@ -326,13 +328,13 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 	
 	case 'id':
 		?>
-		<th scope="row"><?php echo $blog[ 'blog_id' ] ?></th>
+		<th scope="row"><input type='checkbox' id='<?php echo $blog[ 'blog_id' ] ?>' name='allblogs[]' value='<?php echo $blog[ 'blog_id' ] ?>'> <label for='<?php echo $blog[ 'blog_id' ] ?>'><?php echo $blog[ 'blog_id' ] ?></label></th>
 		<?php
 		break;
 
 	case 'blogname':
 		?>
-		<td valign='top'><?php echo str_replace( '.' . $current_site->domain, '', $blog[ 'domain' ] ) ?>
+		<td valign='top'><label for='<?php echo $blog[ 'blog_id' ] ?>'><?php echo str_replace( '.' . $current_site->domain, '', $blog[ 'domain' ] ) ?></label>
 		</td>
 		<?php
 		break;
@@ -393,7 +395,7 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 	}
 }
 ?>
-	</tr> 
+	</tr>
 <?php
 }
 } else {
@@ -403,16 +405,16 @@ foreach($posts_columns as $column_name=>$column_display_name) {
   </tr> 
 <?php
 } // end if ($blogs)
-print "</table>";
+?>
+</table>
+<p>Selected Blogs:<ul><li><input type='checkbox' name='blogfunction' value='delete'> Delete</li></ul>
+<input type='submit' value='Apply Changes'></p>
+</form>
+<?php
 
 break;
 } // end switch( $action )
 ?> 
 
-<div class="navigation">
-<div class="alignleft"><?php //next_posts_link(__('&laquo; Previous Entries')) ?></div>
-<div class="alignright"><?php //previous_posts_link(__('Next Entries &raquo;')) ?></div>
-</div>
-
 </div>
 <?php include('admin-footer.php'); ?>
diff --git a/wp-inst/wp-admin/wpmu-edit.php b/wp-inst/wp-admin/wpmu-edit.php
index 676ab99..c5c112c 100644
--- a/wp-inst/wp-admin/wpmu-edit.php
+++ b/wp-inst/wp-admin/wpmu-edit.php
@@ -3,6 +3,26 @@ require_once('admin.php');
 
 do_action( "wpmuadminedit", "" );
 
+function wpmu_delete_blog( $id ) {
+	global $wpdb, $wpmuBaseTablePrefix;
+	$drop_tables = array( $wpmuBaseTablePrefix . $id . "_categories",
+			$wpmuBaseTablePrefix . $id . "_comments",
+			$wpmuBaseTablePrefix . $id . "_linkcategories",
+			$wpmuBaseTablePrefix . $id . "_links",
+			$wpmuBaseTablePrefix . $id . "_options",
+			$wpmuBaseTablePrefix . $id . "_post2cat",
+			$wpmuBaseTablePrefix . $id . "_postmeta",
+			$wpmuBaseTablePrefix . $id . "_posts",
+			$wpmuBaseTablePrefix . $id . "_referer_visitLog",
+			$wpmuBaseTablePrefix . $id . "_referer_blacklist" );
+	reset( $drop_tables );
+	while( list( $key, $val ) = each( $drop_tables  ) ) 
+	{ 
+		$wpdb->query( "DROP TABLE $val" );
+	}
+	$wpdb->query( "DELETE FROM ".$wpdb->blogs." WHERE blog_id = '".$id."'" );
+}
+
 $id = $_POST[ 'id' ];
 switch( $_GET[ 'action' ] ) {
 	case "siteoptions":
@@ -156,22 +176,22 @@ switch( $_GET[ 'action' ] ) {
 		if( is_site_admin() == false ) {
 			die( __('<p>You do not have permission to access this page.</p>') );
 		}
-		$drop_tables = array( $wpmuBaseTablePrefix . $_GET[ 'id' ] . "_categories",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_comments",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_linkcategories",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_links",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_options",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_post2cat",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_postmeta",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_posts",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_referer_visitLog",
-			      	$wpmuBaseTablePrefix . $_GET[ 'id' ] . "_referer_blacklist" );
-		reset( $drop_tables );
-		while( list( $key, $val ) = each( $drop_tables  ) ) 
-		{ 
-			$wpdb->query( "DROP TABLE $val" );
-		}
-		$wpdb->query( "DELETE FROM ".$wpdb->blogs." WHERE blog_id = '".$_GET[ 'id' ]."'" );
+		if( $id != '0' && $id != '1' )
+			wpmu_delete_blog( $id );
+		header( "Location: wpmu-blogs.php?updated=true" );
+	break;
+	case "allblogs":
+		if( is_site_admin() == false ) {
+			die( __('<p>You do not have permission to access this page.</p>') );
+		}
+		if( $_POST[ 'blogfunction' ] == 'delete' ) {
+			if( is_array( $_POST[ 'allblogs' ] ) ) {
+				while( list( $key, $val ) = each( $_POST[ 'allblogs' ] ) )
+					if( $val != '0' && $val != '1' )
+						wpmu_delete_blog( $val );
+			}
+		}
+
 		header( "Location: wpmu-blogs.php?updated=true" );
 	break;
 	case "deactivateblog":
diff --git a/wp-inst/wp-admin/wpmu-users.php b/wp-inst/wp-admin/wpmu-users.php
index 1d1f449..591cbd7 100644
--- a/wp-inst/wp-admin/wpmu-users.php
+++ b/wp-inst/wp-admin/wpmu-users.php
@@ -65,6 +65,22 @@ switch( $_GET[ 'action' ] ) {
     </p>
     <?php
     break;
+    case "allusers":
+	if( is_site_admin() == false ) {
+		die( __('<p>You do not have permission to access this page.</p>') );
+	}
+    	if( $_POST[ 'userfunction' ] == 'delete' ) {
+		if( is_array( $_POST[ 'allusers' ] ) ) {
+			while( list( $key, $val ) = each( $_POST[ 'allusers' ] ) ) {
+				if( $val != '' && $val != '0' && $val != '1' ) {
+					$wpdb->query( "DELETE FROM {$wpdb->users} WHERE ID = '$val'" );
+					$wpdb->query( "DELETE FROM {$wpdb->usermeta} WHERE user_id = '$val'" );
+				}
+			}
+		}
+	}
+    header( "Location: wpmu-users.php?updated=true" );
+    break;
     default:
 		if( isset( $_GET[ 'start' ] ) == false ) {
 			$start = 0;
@@ -77,12 +93,26 @@ switch( $_GET[ 'action' ] ) {
 			$num = intval( $_GET[ 'num' ] );
 		}
 
-	$query = "SELECT * 
-	          FROM ".$wpdb->users;
-	if( $_GET[ 's' ] != '' ) {
-	    $query .= " WHERE user_login LIKE '%".$_GET[ 's' ]."%'";
-	}
-	$query .= " ORDER BY ID";
+		$query = "SELECT * 
+			FROM ".$wpdb->users;
+		if( $_GET[ 's' ] != '' ) {
+			$query .= " WHERE user_login LIKE '%".$_GET[ 's' ]."%'";
+		}
+		if( isset( $_GET[ 'sortby' ] ) == false ) {
+			$_GET[ 'sortby' ] = 'ID';
+		}
+		if( $_GET[ 'sortby' ] == 'Email' ) {
+			$query .= ' ORDER BY user_email ';
+		} elseif( $_GET[ 'sortby' ] == '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 registered ';
+		}
+		$query .= $_GET[ 'order' ];
 	$query .= " LIMIT $start, $num";
 	$user_list = $wpdb->get_results( $query, ARRAY_A );
 	if( count( $user_list ) < $num ) {
@@ -142,11 +172,12 @@ $posts_columns['control_delete'] = '';
 
 ?>
 
+<form action='wpmu-users.php?action=allusers' method='POST'>
 <table width="100%" cellpadding="3" cellspacing="3"> 
 	<tr>
 
 <?php foreach($posts_columns as $column_display_name) { ?>
-	<th scope="col"><?php echo $column_display_name; ?></th>
+	<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 } ?>
 
 	</tr>
@@ -166,13 +197,13 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 	
 	case 'ID':
 		?>
-		<th scope="row"><?php echo $user[ 'ID' ] ?></th>
+		<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':
 		?>
-		<td><?php echo $user[ 'user_login' ] ?>
+		<td><label for='<?php echo $user[ 'ID' ] ?>'><?php echo $user[ 'user_login' ] ?></label>
 		</td>
 		<?php
 		break;
@@ -233,11 +264,10 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 } // end if ($users)
 ?> 
 </table> 
+<p>Selected Users:<ul><li><input type='checkbox' name='userfunction' value='delete'> Delete</li></ul>
+<input type='submit' value='Apply Changes'></p>
+</form>
 
-<div class="navigation">
-<div class="alignleft"><?php //next_posts_link(__('&laquo; Previous Entries')) ?></div>
-<div class="alignright"><?php //previous_posts_link(__('Next Entries &raquo;')) ?></div>
-</div>
 <?php
 }