Really delete blogs - tables and wp_blogs record.

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

3 files changed, 32 insertions, 5 deletions

diff --git a/wp-inst/wp-admin/menu.php b/wp-inst/wp-admin/menu.php
index 8d56446..2dc7a34 100644
--- a/wp-inst/wp-admin/menu.php
+++ b/wp-inst/wp-admin/menu.php
@@ -61,11 +61,11 @@ $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
 
 get_currentuserinfo();
 if( is_site_admin() ) {
-	$menu[1] = array(__('Site Admin'), 'subscriber', 'wpmu-admin.php' );
-	$submenu[ 'wpmu-admin.php' ][5] = array( 'Blogs', 'subscriber', 'wpmu-blogs.php' );
-	$submenu[ 'wpmu-admin.php' ][10] = array( 'Users', 'subscriber', 'wpmu-users.php' );
-	$submenu[ 'wpmu-admin.php' ][15] = array( 'Feeds', 'subscriber', 'wpmu-feeds.php' );
-	$submenu[ 'wpmu-admin.php' ][20] = array( 'Options', 'subscriber', 'wpmu-options.php' );
+	$menu[1] = array(__('Site Admin'), '10', 'wpmu-admin.php' );
+	$submenu[ 'wpmu-admin.php' ][5] = array( 'Blogs', '10', 'wpmu-blogs.php' );
+	$submenu[ 'wpmu-admin.php' ][10] = array( 'Users', '10', 'wpmu-users.php' );
+	$submenu[ 'wpmu-admin.php' ][15] = array( 'Feeds', '10', 'wpmu-feeds.php' );
+	$submenu[ 'wpmu-admin.php' ][20] = array( 'Options', '10', 'wpmu-options.php' );
 }
 
 // Create list of page plugin hook names.
diff --git a/wp-inst/wp-admin/wpmu-blogs.php b/wp-inst/wp-admin/wpmu-blogs.php
index 64e7cb5..6d79220 100644
--- a/wp-inst/wp-admin/wpmu-blogs.php
+++ b/wp-inst/wp-admin/wpmu-blogs.php
@@ -222,6 +222,7 @@ $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 $posts_columns['control_view']      = '';
 $posts_columns['control_edit']      = '';
 $posts_columns['control_backend']   = '';
+$posts_columns['control_deactivate']    = '';
 $posts_columns['control_delete']    = '';
 
 ?>
@@ -297,6 +298,12 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 		<?php
 		break;
 
+	case 'control_deactivate':
+		?>
+		<td valign='top'><?php echo "<a href='wpmu-edit.php?action=deactivateblog&amp;id=".$blog[ 'blog_id' ]."' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to deactivate this blog?\\n  \'OK\' to delete, \'Cancel\' to stop.") ) . "')\">" . __('Deactivate') . "</a>"; ?></td>
+		<?php
+		break;
+
 	case 'control_delete':
 		?>
 		<td valign='top'><?php echo "<a href='wpmu-edit.php?action=deleteblog&amp;id=".$blog[ 'blog_id' ]."' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this blog?\\n  \'OK\' to delete, \'Cancel\' to stop.") ) . "')\">" . __('Delete') . "</a>"; ?></td>
diff --git a/wp-inst/wp-admin/wpmu-edit.php b/wp-inst/wp-admin/wpmu-edit.php
index 89335cd..544be37 100644
--- a/wp-inst/wp-admin/wpmu-edit.php
+++ b/wp-inst/wp-admin/wpmu-edit.php
@@ -132,10 +132,30 @@ switch( $_GET[ 'action' ] ) {
     header( "Location: wpmu-blogs.php?action=editblog&id=".$id."&updated=true" );
     break;
     case "deleteblog":
+	$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' ]."'" );
+	header( "Location: wpmu-blogs.php?updated=true" );
+    break;
+    case "deactivateblog":
 	$query = "UPDATE ".$wpdb->blogs."
 	          SET    is_public = 'archived'
 	          WHERE  blog_id = '".$_GET[ 'id' ]."'";
         $wpdb->query( $query );
+	header( "Location: wpmu-blogs.php?updated=true" );
     break;
     case "updateuser":
     unset( $_POST[ 'option' ][ 'ID' ] );