From f269b75d7ba86329502ba1530c73d3b966a29a84 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 10 Nov 2010 14:27:15 +0000
Subject: [PATCH] Network admin multisite checks and docs. see #14435.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/admin.php          |  7 ++++---
 wp-admin/network/edit.php           |  1 +
 wp-admin/network/index-extra.php    |  3 ++-
 wp-admin/network/index.php          |  4 ++--
 wp-admin/network/menu.php           |  2 +-
 wp-admin/network/plugin-editor.php  |  6 +++++-
 wp-admin/network/plugin-install.php |  6 +++++-
 wp-admin/network/plugins.php        |  6 +++++-
 wp-admin/network/profile.php        |  6 +++++-
 wp-admin/network/settings.php       |  1 +
 wp-admin/network/site-info.php      |  5 ++---
 wp-admin/network/site-new.php       |  5 ++---
 wp-admin/network/site-options.php   |  5 ++---
 wp-admin/network/site-themes.php    |  6 +++++-
 wp-admin/network/site-users.php     |  5 ++---
 wp-admin/network/sites.php          |  1 +
 wp-admin/network/theme-editor.php   |  6 +++++-
 wp-admin/network/theme-install.php  |  6 +++++-
 wp-admin/network/themes.php         |  4 ++++
 wp-admin/network/update-core.php    | 11 +++++++++++
 wp-admin/network/update.php         |  6 +++++-
 wp-admin/network/upgrade.php        |  5 +++--
 wp-admin/network/user-edit.php      |  6 +++++-
 wp-admin/network/user-new.php       |  5 ++---
 wp-admin/network/users.php          |  6 ++++++
 25 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/wp-admin/network/admin.php b/wp-admin/network/admin.php
index c82a9dc7e9..76a5715dd9 100644
--- a/wp-admin/network/admin.php
+++ b/wp-admin/network/admin.php
@@ -3,13 +3,14 @@
  * WordPress Network Administration Bootstrap
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
-define('WP_NETWORK_ADMIN', TRUE);
+define( 'WP_NETWORK_ADMIN', TRUE );
 
-require_once( dirname(dirname(__FILE__)) . '/admin.php');
+/** Load WordPress Administration Bootstrap */
+require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
 
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/edit.php b/wp-admin/network/edit.php
index ff4a1f01b5..90882535e6 100644
--- a/wp-admin/network/edit.php
+++ b/wp-admin/network/edit.php
@@ -7,6 +7,7 @@
  * @since 3.0.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
 if ( ! is_multisite() )
diff --git a/wp-admin/network/index-extra.php b/wp-admin/network/index-extra.php
index 6f1f86f031..17ead78684 100644
--- a/wp-admin/network/index-extra.php
+++ b/wp-admin/network/index-extra.php
@@ -3,10 +3,11 @@
  * Handle default network dashboard widgets options AJAX.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
 require( '../index-extra.php' );
diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php
index 8a659ce192..26a437714c 100644
--- a/wp-admin/network/index.php
+++ b/wp-admin/network/index.php
@@ -7,11 +7,11 @@
  * @since 3.0.0
  */
 
-/** Load WordPress Bootstrap */
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
 /** Load WordPress dashboard API */
-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
 
 if ( !is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/menu.php b/wp-admin/network/menu.php
index 36c778324b..dcacc58db2 100644
--- a/wp-admin/network/menu.php
+++ b/wp-admin/network/menu.php
@@ -3,7 +3,7 @@
  * Build Network Administration Menu.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
diff --git a/wp-admin/network/plugin-editor.php b/wp-admin/network/plugin-editor.php
index e51bef8b13..8850aa8f88 100644
--- a/wp-admin/network/plugin-editor.php
+++ b/wp-admin/network/plugin-editor.php
@@ -3,10 +3,14 @@
  * Plugin editor network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../plugin-editor.php' );
diff --git a/wp-admin/network/plugin-install.php b/wp-admin/network/plugin-install.php
index 9ae3cc5962..abfef634f7 100644
--- a/wp-admin/network/plugin-install.php
+++ b/wp-admin/network/plugin-install.php
@@ -3,10 +3,14 @@
  * Install plugin network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../plugin-install.php' );
\ No newline at end of file
diff --git a/wp-admin/network/plugins.php b/wp-admin/network/plugins.php
index ef117a0bdc..514a22b41a 100644
--- a/wp-admin/network/plugins.php
+++ b/wp-admin/network/plugins.php
@@ -3,10 +3,14 @@
  * Network Plugins administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../plugins.php' );
\ No newline at end of file
diff --git a/wp-admin/network/profile.php b/wp-admin/network/profile.php
index cb82a1d8e4..c100e68865 100644
--- a/wp-admin/network/profile.php
+++ b/wp-admin/network/profile.php
@@ -3,10 +3,14 @@
  * User profile network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../profile.php' );
\ No newline at end of file
diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 56de84bd67..569e6de729 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -7,6 +7,7 @@
  * @since 3.0.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
 if ( ! is_multisite() )
diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index c2bdc0f443..bb17f1e5fe 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -1,15 +1,14 @@
 <?php
-
 /**
  * Edit Site Info Administration Screen
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 9a3062bb4c..5daac776c3 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -1,15 +1,14 @@
 <?php
-
 /**
  * Add Site Administration Screen
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/site-options.php b/wp-admin/network/site-options.php
index d40b0689d5..daaebef478 100644
--- a/wp-admin/network/site-options.php
+++ b/wp-admin/network/site-options.php
@@ -1,15 +1,14 @@
 <?php
-
 /**
  * Edit Site Options Administration Screen
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php
index 2b3daa986b..7be57aaccc 100644
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@@ -3,12 +3,16 @@
  * Edit Site Themes Administration Screen
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
 $wp_list_table->check_permissions();
 
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 83fdfd31c3..e7815bafa4 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -1,15 +1,14 @@
 <?php
-
 /**
  * Edit Site Users Administration Screen
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 91d63959c3..bdb9f1b059 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -7,6 +7,7 @@
  * @since 3.0.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
 if ( ! is_multisite() )
diff --git a/wp-admin/network/theme-editor.php b/wp-admin/network/theme-editor.php
index 082af22d31..f6ac9c2e08 100644
--- a/wp-admin/network/theme-editor.php
+++ b/wp-admin/network/theme-editor.php
@@ -3,10 +3,14 @@
  * Theme editor network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../theme-editor.php' );
\ No newline at end of file
diff --git a/wp-admin/network/theme-install.php b/wp-admin/network/theme-install.php
index 01df98acb8..4cec1914ab 100644
--- a/wp-admin/network/theme-install.php
+++ b/wp-admin/network/theme-install.php
@@ -3,10 +3,14 @@
  * Install theme network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../theme-install.php' );
\ No newline at end of file
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 1b87fc84b0..08a3356668 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -7,8 +7,12 @@
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 $wp_list_table = get_list_table('WP_MS_Themes_List_Table');
 $wp_list_table->check_permissions();
 
diff --git a/wp-admin/network/update-core.php b/wp-admin/network/update-core.php
index 6dc1b4368e..d4f9c7680a 100644
--- a/wp-admin/network/update-core.php
+++ b/wp-admin/network/update-core.php
@@ -1,5 +1,16 @@
 <?php
+/**
+ * Updates network administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 3.1.0
+ */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../update-core.php' );
\ No newline at end of file
diff --git a/wp-admin/network/update.php b/wp-admin/network/update.php
index 598551ed3d..c7625b9a37 100644
--- a/wp-admin/network/update.php
+++ b/wp-admin/network/update.php
@@ -3,10 +3,14 @@
  * Update/Install Plugin/Theme network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../update.php' );
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index a56ba2579d..255c3001a1 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -7,9 +7,10 @@
  * @since 3.0.0
  */
 
-require_once('./admin.php');
+/** Load WordPress Administration Bootstrap */
+require_once( './admin.php' );
 
-if ( !is_multisite() )
+if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
 require_once( ABSPATH . WPINC . '/http.php' );
diff --git a/wp-admin/network/user-edit.php b/wp-admin/network/user-edit.php
index 07286ab8ee..0b2cfd26f4 100644
--- a/wp-admin/network/user-edit.php
+++ b/wp-admin/network/user-edit.php
@@ -3,10 +3,14 @@
  * Edit user network administration panel.
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 require( '../user-edit.php' );
\ No newline at end of file
diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index 03672c7190..ea2463a60b 100644
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -1,15 +1,14 @@
 <?php
-
 /**
  * Add Site Administration Screen
  *
  * @package WordPress
- * @subpackage Administration
+ * @subpackage Multisite
  * @since 3.1.0
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( './admin.php' );
 
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index 1fc10266ce..a1d88b71bf 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -7,8 +7,12 @@
  * @since 3.0.0
  */
 
+/** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
+if ( ! is_multisite() )
+	wp_die( __( 'Multisite support is not enabled.' ) );
+
 $wp_list_table = get_list_table('WP_MS_Users_List_Table');
 $wp_list_table->check_permissions();
 $wp_list_table->prepare_items();
@@ -72,6 +76,8 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 	?>
 	</h2>
 
+	<?php $wp_list_table->views(); ?>
+
 	<form action="" method="get" class="search-form">
 		<p class="search-box">
 		<input type="text" name="s" value="<?php echo esc_attr( $usersearch ); ?>" class="search-input" id="user-search-input" />