Remove dupe/deprecated code from sites.php.

Props wonderboymusic
fixes #21553


git-svn-id: https://develop.svn.wordpress.org/trunk@22064 602fd350-edb4-49c9-b593-d223f7449a82

wp-admin/network/sites.php

@@ -16,13 +16,13 @@ if ( ! is_multisite() )
 if ( ! current_user_can( 'manage_sites' ) )
 	wp_die( __( 'You do not have permission to access this page.' ) );
 
-$wp_list_table = _get_list_table('WP_MS_Sites_List_Table');
+$wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
 $pagenum = $wp_list_table->get_pagenum();
 
 $title = __( 'Sites' );
 $parent_file = 'sites.php';
 
-add_screen_option( 'per_page', array('label' => _x( 'Sites', 'sites per page (screen options)' )) );
+add_screen_option( 'per_page', array( 'label' => _x( 'Sites', 'sites per page (screen options)' ) ) );
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -51,156 +51,10 @@ $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 if ( isset( $_GET['action'] ) ) {
 	do_action( 'wpmuadminedit' , '' );
 
-	switch ( $_GET['action'] ) {
+	if ( 'confirm' === $_GET['action'] ) {
-		case 'updateblog':
-			// No longer used.
-		break;
-
-		case 'deleteblog':
-			check_admin_referer('deleteblog');
-			if ( ! ( current_user_can( 'manage_sites' ) && current_user_can( 'delete_sites' ) ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
-				wpmu_delete_blog( $id, true );
-				wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'delete' ), wp_get_referer() ) );
-			} else {
-				wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'not_deleted' ), wp_get_referer() ) );
-			}
-
-			exit();
-		break;
-
-		case 'allblogs':
-			if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
-				check_admin_referer( 'bulk-sites' );
-
-				if ( ! current_user_can( 'manage_sites' ) )
-					wp_die( __( 'You do not have permission to access this page.' ) );
-
-				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
-				$blogfunction = '';
-
-				foreach ( (array) $_POST['allblogs'] as $key => $val ) {
-					if ( $val != '0' && $val != $current_site->blog_id ) {
-						switch ( $doaction ) {
-							case 'delete':
-								if ( ! current_user_can( 'delete_site', $val ) )
-									wp_die( __( 'You are not allowed to delete the site.' ) );
-								$blogfunction = 'all_delete';
-								wpmu_delete_blog( $val, true );
-							break;
-
-							case 'spam':
-								$blogfunction = 'all_spam';
-								update_blog_status( $val, 'spam', '1' );
-								set_time_limit( 60 );
-							break;
-
-							case 'notspam':
-								$blogfunction = 'all_notspam';
-								update_blog_status( $val, 'spam', '0' );
-								set_time_limit( 60 );
-							break;
-						}
-					} else {
-						wp_die( __( 'You are not allowed to change the current site.' ) );
-					}
-				}
-
-				wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $blogfunction ), wp_get_referer() ) );
-			} else {
-				wp_redirect( network_admin_url( 'sites.php' ) );
-			}
-			exit();
-		break;
-
-		case 'archiveblog':
-			check_admin_referer( 'archiveblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'archived', '1' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'archive' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'unarchiveblog':
-			check_admin_referer( 'unarchiveblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'archived', '0' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unarchive' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'activateblog':
-			check_admin_referer( 'activateblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'deleted', '0' );
-			do_action( 'activate_blog', $id );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'activate' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'deactivateblog':
-			check_admin_referer( 'deactivateblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			do_action( 'deactivate_blog', $id );
-			update_blog_status( $id, 'deleted', '1' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'deactivate' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'unspamblog':
-			check_admin_referer( 'unspamblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'spam', '0' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unspam' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'spamblog':
-			check_admin_referer( 'spamblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'spam', '1' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'spam' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'unmatureblog':
-			check_admin_referer( 'unmatureblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'mature', '0' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'unmature' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		case 'matureblog':
-			check_admin_referer( 'matureblog' );
-			if ( ! current_user_can( 'manage_sites' ) )
-				wp_die( __( 'You do not have permission to access this page.' ) );
-
-			update_blog_status( $id, 'mature', '1' );
-			wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'mature' ), wp_get_referer() ) );
-			exit();
-		break;
-
-		// Common
-		case 'confirm':
 		check_admin_referer( 'confirm' );
-			if ( !headers_sent() ) {
+		
+		if ( ! headers_sent() ) {
 			nocache_headers();
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
@@ -232,13 +86,102 @@ if ( isset( $_GET['action'] ) ) {
 		</html>
 		<?php
 		exit();	
+	}
+	
+	$updated_action = '';
+	
+	$manage_actions = array( 'deleteblog', 'allblogs', 'archiveblog', 'unarchiveblog', 'activateblog', 'deactivateblog', 'unspamblog', 'spamblog', 'unmatureblog', 'matureblog' );
+	if ( in_array( $_GET['action'], $manage_actions ) ) {		
+		$action = $_GET['action'];
+		if ( 'allblogs' === $action )
+			$action = 'bulk-sites';
+
+		check_admin_referer( $action );
+	} 
+		
+	switch ( $_GET['action'] ) {
+
+		case 'deleteblog':
+			if ( ! current_user_can( 'delete_sites' ) )
+				wp_die( __( 'You do not have permission to access this page.' ) );
+
+			$updated_action = 'not_deleted';
+			if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
+				wpmu_delete_blog( $id, true );
+				$updated_action = 'delete';	
+			}
 		break;
+
+		case 'allblogs':
+			if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
+				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
+				
+				foreach ( (array) $_POST['allblogs'] as $key => $val ) {
+					if ( $val != '0' && $val != $current_site->blog_id ) {
+						switch ( $doaction ) {
+							case 'delete':
+								if ( ! current_user_can( 'delete_site', $val ) )
+									wp_die( __( 'You are not allowed to delete the site.' ) );
+								
+								$updated_action = 'all_delete';
+								wpmu_delete_blog( $val, true );
+							break;
+
+							case 'spam':
+							case 'notspam':
+								$updated_action = ( 'spam' === $doaction ) ? 'all_spam' : 'all_notspam';
+								update_blog_status( $val, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
+								set_time_limit( 60 );
+							break;
+						}
+					} else {
+						wp_die( __( 'You are not allowed to change the current site.' ) );
+					}
+				}
+			} else {
+				wp_redirect( network_admin_url( 'sites.php' ) );
+				exit();
+			}
+		break;
+
+		case 'archiveblog':
+		case 'unarchiveblog':
+			update_blog_status( $id, 'archived', ( 'archiveblog' === $_GET['action'] ) ? '1' : '0' );
+		break;
+
+		case 'activateblog':
+			update_blog_status( $id, 'deleted', '0' );
+			do_action( 'activate_blog', $id );
+		break;
+
+		case 'deactivateblog':
+			do_action( 'deactivate_blog', $id );
+			update_blog_status( $id, 'deleted', '1' );
+		break;
+
+		case 'unspamblog':
+		case 'spamblog':
+			update_blog_status( $id, 'spam', ( 'spamblog' === $_GET['action'] ) ? '1' : '0' );
+		break;
+	
+		case 'unmatureblog':
+		case 'matureblog':
+			update_blog_status( $id, 'mature', ( 'matureblog' === $_GET['action'] ) ? '1' : '0' );
+		break;
+	}
+	
+	if ( empty( $updated_action ) && in_array( $_GET['action'], $manage_actions ) )
+		$updated_action = $_GET['action'];
+	
+	if ( ! empty( $updated_action ) ) {
+		wp_safe_redirect( add_query_arg( array( 'updated' => $updated_action ), wp_get_referer() ) );
+		exit();
 	}
 }
 
 $msg = '';
-if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
+if ( isset( $_GET['updated'] ) ) {
-	switch ( $_REQUEST['action'] ) {
+	switch ( $_GET['updated'] ) {
 		case 'all_notspam':
 			$msg = __( 'Sites removed from spam.' );
 		break;
@@ -254,29 +197,30 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 		case 'not_deleted':
 			$msg = __( 'You do not have permission to delete that site.' );
 		break;
-		case 'archive':
+		case 'archiveblog':
 			$msg = __( 'Site archived.' );
 		break;
-		case 'unarchive':
+		case 'unarchiveblog':
 			$msg = __( 'Site unarchived.' );
 		break;
-		case 'activate':
+		case 'activateblog':
 			$msg = __( 'Site activated.' );
 		break;
-		case 'deactivate':
+		case 'deactivateblog':
 			$msg = __( 'Site deactivated.' );
 		break;
-		case 'unspam':
+		case 'unspamblog':
 			$msg = __( 'Site removed from spam.' );
 		break;
-		case 'spam':
+		case 'spamblog':
 			$msg = __( 'Site marked as spam.' );
 		break;
 		default:
-			$msg = apply_filters( 'network_sites_updated_message_' . $_REQUEST['action'] , __( 'Settings saved.' ) );
+			$msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) );
 		break;
 	}
-	if ( $msg )
+	
+	if ( ! empty( $msg ) )
 		$msg = '<div class="updated" id="message"><p>' . $msg . '</p></div>';
 }
 
@@ -286,9 +230,9 @@ require_once( '../admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
+<?php screen_icon( 'ms-admin' ); ?>
-<h2><?php _e('Sites') ?>
+<h2><?php _e( 'Sites' ) ?>
-<?php echo $msg; ?>
+	
 <?php if ( current_user_can( 'create_sites') ) : ?>
 	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
 <?php endif; ?>
@@ -298,6 +242,8 @@ require_once( '../admin-header.php' );
 } ?>
 </h2>
 
+<?php echo $msg; ?>	
+	
 <form action="" method="get" id="ms-search">
 <?php $wp_list_table->search_box( __( 'Search Sites' ), 'site' ); ?>
 <input type="hidden" name="action" value="blogs" />