ntwb / wordpress

src/wp-admin/network/upgrade.php

Spacing +44 added lines, -44 removed lines

@@ -8,79 +8,79 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require_once( ABSPATH . WPINC . '/http.php' );
+require_once(ABSPATH.WPINC.'/http.php');
 
-$title = __( 'Upgrade Network' );
+$title = __('Upgrade Network');
 $parent_file = 'upgrade.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
-		'<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
-		'<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>'
-) );
+		'<p>'.__('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.').'</p>'.
+		'<p>'.__('If a version update to core has not happened, clicking this button won&#8217;t affect anything.').'</p>'.
+		'<p>'.__('If this process fails for any reason, users logging in to their sites will force the same update.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen" target="_blank">Documentation on Upgrade Network</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( ! current_user_can( 'manage_network' ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! current_user_can('manage_network'))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
 echo '<div class="wrap">';
-echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';
+echo '<h1>'.__('Upgrade Network').'</h1>';
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'show';
 
-switch ( $action ) {
+switch ($action) {
 	case "upgrade":
-		$n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0;
+		$n = (isset($_GET['n'])) ? intval($_GET['n']) : 0;
 
-		if ( $n < 5 ) {
+		if ($n < 5) {
 			/**
 			 * @global string $wp_db_version
 			 */
 			global $wp_db_version;
-			update_site_option( 'wpmu_upgrade_site', $wp_db_version );
+			update_site_option('wpmu_upgrade_site', $wp_db_version);
 		}
 
-		$blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY blog_id DESC LIMIT {$n}, 5", ARRAY_A );
-		if ( empty( $blogs ) ) {
-			echo '<p>' . __( 'All done!' ) . '</p>';
+		$blogs = $wpdb->get_results("SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY blog_id DESC LIMIT {$n}, 5", ARRAY_A);
+		if (empty($blogs)) {
+			echo '<p>'.__('All done!').'</p>';
 			break;
 		}
 		echo "<ul>";
-		foreach ( (array) $blogs as $details ) {
-			switch_to_blog( $details['blog_id'] );
+		foreach ((array) $blogs as $details) {
+			switch_to_blog($details['blog_id']);
 			$siteurl = site_url();
-			$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
+			$upgrade_url = admin_url('upgrade.php?step=upgrade_db');
 			restore_current_blog();
 
 			echo "<li>$siteurl</li>";
 
-			$response = wp_remote_get( $upgrade_url, array(
+			$response = wp_remote_get($upgrade_url, array(
 				'timeout'     => 120,
 				'httpversion' => '1.1',
 				'sslverify'   => false,
-			) );
-			if ( is_wp_error( $response ) ) {
-				wp_die( sprintf(
+			));
+			if (is_wp_error($response)) {
+				wp_die(sprintf(
 					/* translators: 1: site url, 2: server error message */
-					__( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
+					__('Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s'),
 					$siteurl,
-					'<em>' . $response->get_error_message() . '</em>'
-				) );
+					'<em>'.$response->get_error_message().'</em>'
+				));
 			}
 
 			/**
@@ -90,7 +90,7 @@ 
 			 *
 			 * @param array|WP_Error $response The upgrade response array or WP_Error on failure.
 			 */
-			do_action( 'after_mu_upgrade', $response );
+			do_action('after_mu_upgrade', $response);
 			/**
 			 * Fires after each site has been upgraded.
 			 *
@@ -98,10 +98,10 @@ 
 			 *
 			 * @param int $blog_id The Site ID.
 			 */
-			do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
+			do_action('wpmu_upgrade_site', $details['blog_id']);
 		}
 		echo "</ul>";
-		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
+		?><p><?php _e('If your browser doesn&#8217;t start loading the next page automatically, click this link:'); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
 		<script type="text/javascript">
 		<!--
 		function nextpage() {
@@ -113,24 +113,24 @@ 
 	break;
 	case 'show':
 	default:
-		if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
+		if (get_site_option('wpmu_upgrade_site') != $GLOBALS['wp_db_version']) :
 		?>
-		<h2><?php _e( 'Database Update Required' ); ?></h2>
-		<p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>
+		<h2><?php _e('Database Update Required'); ?></h2>
+		<p><?php _e('WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.'); ?></p>
 		<?php endif; ?>
 
-		<p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
-		<p><a class="button button-primary" href="upgrade.php?action=upgrade"><?php _e( 'Upgrade Network' ); ?></a></p>
+		<p><?php _e('The database update process may take a little while, so please be patient.'); ?></p>
+		<p><a class="button button-primary" href="upgrade.php?action=upgrade"><?php _e('Upgrade Network'); ?></a></p>
 		<?php
 		/**
 		 * Fires before the footer on the network upgrade screen.
 		 *
 		 * @since MU
 		 */
-		do_action( 'wpmu_upgrade_page' );
+		do_action('wpmu_upgrade_page');
 	break;
 }
 ?>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/network/site-settings.php

Spacing +66 added lines, -66 removed lines

@@ -8,58 +8,58 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('Sorry, you are not allowed to edit this site.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
-		'<p>' . __('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
-		'<p>' . __('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
-		'<p>' . sprintf( __('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
-		'<p>' . __('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
-) );
+		'<p>'.__('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.').'</p>'.
+		'<p>'.__('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
+		'<p>'.__('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.').'</p>'.
+		'<p>'.sprintf(__('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.'), network_admin_url('themes.php')).'</p>'.
+		'<p>'.__('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id)
+	wp_die(__('Invalid site ID.'));
 
-$details = get_blog_details( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_blog_details($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( !can_edit_network( $details->site_id ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-$is_main_site = is_main_site( $id );
+$is_main_site = is_main_site($id);
 
-if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
-	check_admin_referer( 'edit-site' );
+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array($_POST['option'])) {
+	check_admin_referer('edit-site');
 
-	switch_to_blog( $id );
+	switch_to_blog($id);
 
-	$skip_options = array( 'allowedthemes' ); // Don't update these options since they are handled elsewhere in the form.
-	foreach ( (array) $_POST['option'] as $key => $val ) {
-		$key = wp_unslash( $key );
-		$val = wp_unslash( $val );
-		if ( $key === 0 || is_array( $val ) || in_array($key, $skip_options) )
+	$skip_options = array('allowedthemes'); // Don't update these options since they are handled elsewhere in the form.
+	foreach ((array) $_POST['option'] as $key => $val) {
+		$key = wp_unslash($key);
+		$val = wp_unslash($val);
+		if ($key === 0 || is_array($val) || in_array($key, $skip_options))
 			continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options
-		update_option( $key, $val );
+		update_option($key, $val);
 	}
 
 	/**
@@ -70,86 +70,86 @@ 
 	 *
 	 * @param int $id The ID of the site being updated.
 	 */
-	do_action( 'wpmu_update_blog_options', $id );
+	do_action('wpmu_update_blog_options', $id);
 
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
+	wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-settings.php'));
 	exit;
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] )
+	if ('updated' == $_GET['update'])
 		$messages[] = __('Site options updated.');
 }
 
-$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
+$title = sprintf(__('Edit Site: %s'), esc_html($details->blogname));
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
-<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
+<p class="edit-site-actions"><a href="<?php echo esc_url(get_home_url($id, '/')); ?>"><?php _e('Visit'); ?></a> | <a href="<?php echo esc_url(get_admin_url($id)); ?>"><?php _e('Dashboard'); ?></a></p>
 
 <?php
 
-network_edit_site_nav( array(
+network_edit_site_nav(array(
 	'blog_id'  => $id,
 	'selected' => 'site-settings'
-) );
+));
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 } ?>
 <form method="post" action="site-settings.php?action=update-site">
-	<?php wp_nonce_field( 'edit-site' ); ?>
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<?php wp_nonce_field('edit-site'); ?>
+	<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 	<table class="form-table">
 		<?php
-		$blog_prefix = $wpdb->get_blog_prefix( $id );
+		$blog_prefix = $wpdb->get_blog_prefix($id);
 		$sql = "SELECT * FROM {$blog_prefix}options
 			WHERE option_name NOT LIKE %s
 			AND option_name NOT LIKE %s";
-		$query = $wpdb->prepare( $sql,
-			$wpdb->esc_like( '_' ) . '%',
-			'%' . $wpdb->esc_like( 'user_roles' )
+		$query = $wpdb->prepare($sql,
+			$wpdb->esc_like('_').'%',
+			'%'.$wpdb->esc_like('user_roles')
 		);
-		$options = $wpdb->get_results( $query );
-		foreach ( $options as $option ) {
-			if ( $option->option_name == 'default_role' )
+		$options = $wpdb->get_results($query);
+		foreach ($options as $option) {
+			if ($option->option_name == 'default_role')
 				$editblog_default_role = $option->option_value;
 			$disabled = false;
 			$class = 'all-options';
-			if ( is_serialized( $option->option_value ) ) {
-				if ( is_serialized_string( $option->option_value ) ) {
-					$option->option_value = esc_html( maybe_unserialize( $option->option_value ) );
+			if (is_serialized($option->option_value)) {
+				if (is_serialized_string($option->option_value)) {
+					$option->option_value = esc_html(maybe_unserialize($option->option_value));
 				} else {
 					$option->option_value = 'SERIALIZED DATA';
 					$disabled = true;
 					$class = 'all-options disabled';
 				}
 			}
-			if ( strpos( $option->option_value, "\n" ) !== false ) {
+			if (strpos($option->option_value, "\n") !== false) {
 			?>
 				<tr class="form-field">
-					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></label></th>
-					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
+					<th scope="row"><label for="<?php echo esc_attr($option->option_name) ?>"><?php echo ucwords(str_replace("_", " ", $option->option_name)) ?></label></th>
+					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr($option->option_name) ?>]" id="<?php echo esc_attr($option->option_name) ?>"<?php disabled($disabled) ?>><?php echo esc_textarea($option->option_value) ?></textarea></td>
 				</tr>
 			<?php
 			} else {
 			?>
 				<tr class="form-field">
-					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></label></th>
-					<?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
-					<td><code><?php echo esc_html( $option->option_value ) ?></code></td>
+					<th scope="row"><label for="<?php echo esc_attr($option->option_name) ?>"><?php echo esc_html(ucwords(str_replace("_", " ", $option->option_name))); ?></label></th>
+					<?php if ($is_main_site && in_array($option->option_name, array('siteurl', 'home'))) { ?>
+					<td><code><?php echo esc_html($option->option_value) ?></code></td>
 					<?php } else { ?>
-					<td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ) ?>]" type="text" id="<?php echo esc_attr( $option->option_name ) ?>" value="<?php echo esc_attr( $option->option_value ) ?>" size="40" <?php disabled( $disabled ) ?> /></td>
+					<td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr($option->option_name) ?>]" type="text" id="<?php echo esc_attr($option->option_name) ?>" value="<?php echo esc_attr($option->option_value) ?>" size="40" <?php disabled($disabled) ?> /></td>
 					<?php } ?>
 				</tr>
 			<?php
@@ -162,7 +162,7 @@ 
 		 *
 		 * @param int $id Site ID.
 		 */
-		do_action( 'wpmueditblogaction', $id );
+		do_action('wpmueditblogaction', $id);
 		?>
 	</table>
 	<?php submit_button(); ?>
@@ -170,4 +170,4 @@ 
 
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/network/user-new.php

Spacing +50 added lines, -50 removed lines

@@ -8,48 +8,48 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users'))
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
-		'<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
-) );
+		'<p>'.__('Add User will set up a new user account on the network and send that person an email with username and password.').'</p>'.
+		'<p>'.__('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can('manage_network_users'))
+		wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array($_POST['user']))
+		wp_die(__('Cannot create an empty user.'));
 
-	$user = wp_unslash( $_POST['user'] );
+	$user = wp_unslash($_POST['user']);
 
-	$user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
-	if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
-		$add_user_errors = $user_details[ 'errors' ];
+	$user_details = wpmu_validate_user_signup($user['username'], $user['email']);
+	if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+		$add_user_errors = $user_details['errors'];
 	} else {
-		$password = wp_generate_password( 12, false);
-		$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user(esc_html(strtolower($user['username'])), $password, sanitize_email($user['email']));
 
-		if ( ! $user_id ) {
-	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+		if ( ! $user_id) {
+	 		$add_user_errors = new WP_Error('add_user_fail', __('Cannot add user.'));
 		} else {
 			/**
 			  * Fires after a new user has been created via the network user-new.php page.
@@ -58,29 +58,29 @@ 
 			  *
 			  * @param int $user_id ID of the newly created user.
 			  */
-			do_action( 'network_user_new_created_user', $user_id );
-			wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
+			do_action('network_user_new_created_user', $user_id);
+			wp_redirect(add_query_arg(array('update' => 'added', 'user_id' => $user_id), 'user-new.php'));
 			exit;
 		}
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] ) {
+	if ('added' == $_GET['update']) {
 		$edit_link = '';
-		if ( isset( $_GET['user_id'] ) ) {
-			$user_id_new = absint( $_GET['user_id'] );
-			if ( $user_id_new ) {
-				$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+		if (isset($_GET['user_id'])) {
+			$user_id_new = absint($_GET['user_id']);
+			if ($user_id_new) {
+				$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_id_new)));
 			}
 		}
 
-		if ( empty( $edit_link ) ) {
-			$messages[] = __( 'User added.' );
+		if (empty($edit_link)) {
+			$messages[] = __('User added.');
 		} else {
 			/* translators: %s: edit page url */
-			$messages[] = sprintf( __( 'User added. <a href="%s">Edit user</a>' ), $edit_link );
+			$messages[] = sprintf(__('User added. <a href="%s">Edit user</a>'), $edit_link);
 		}
 	}
 }
@@ -88,20 +88,20 @@ 
 $title = __('Add New User');
 $parent_file = 'users.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
+<h1 id="add-new-user"><?php _e('Add New User'); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 }
 
-if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
+if (isset($add_user_errors) && is_wp_error($add_user_errors)) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -109,15 +109,15 @@ 
 	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="email"><?php _e('Email') ?></label></th>
 			<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2"><?php _e('A password reset link will be sent to the user via email.') ?></td>
 		</tr>
 	</table>
 	<?php
@@ -126,12 +126,12 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	do_action( 'network_user_new_form' );
+	do_action('network_user_new_form');
 
-	wp_nonce_field( 'add-user', '_wpnonce_add-user' );
-	submit_button( __('Add User'), 'primary', 'add-user' );
+	wp_nonce_field('add-user', '_wpnonce_add-user');
+	submit_button(__('Add User'), 'primary', 'add-user');
 	?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +17 added lines, -11 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users') ) {
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -33,11 +35,13 @@ 
 if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-user', '_wpnonce_add-user' );
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can( 'manage_network_users' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	}
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array( $_POST['user'] ) ) {
+			wp_die( __( 'Cannot create an empty user.' ) );
+	}
 
 	$user = wp_unslash( $_POST['user'] );
 
@@ -94,15 +98,17 @@ 
 <h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-}
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	}
 
 if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+			foreach ( $add_user_errors->get_error_messages() as $message ) {
+							echo "<p>$message</p>";
+			}
 		?>
 	</div>
 <?php } ?>

src/wp-admin/network/sites.php

Spacing +118 added lines, -118 removed lines

@@ -8,175 +8,175 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-$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' );
+$title = __('Sites');
 $parent_file = 'sites.php';
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
-		'<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
-		'<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
-		'<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' .
-		'<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
-		'<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
-		'<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
-		'<li>' . __('Visit to go to the front-end site live.') . '</li></ul>' .
-		'<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
-		'<p>' . __('Clicking on bold headings can re-sort this table.') . '</p>'
-) );
+		'<p>'.__('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.').'</p>'.
+		'<p>'.__('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.').'</p>'.
+		'<p>'.__('Hovering over each site reveals seven options (three for the primary site):').'</p>'.
+		'<ul><li>'.__('An Edit link to a separate Edit Site screen.').'</li>'.
+		'<li>'.__('Dashboard leads to the Dashboard for that site.').'</li>'.
+		'<li>'.__('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.').'</li>'.
+		'<li>'.__('Delete which is a permanent action after the confirmation screens.').'</li>'.
+		'<li>'.__('Visit to go to the front-end site live.').'</li></ul>'.
+		'<p>'.__('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.').'</p>'.
+		'<p>'.__('Clicking on bold headings can re-sort this table.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_pagination' => __( 'Sites list navigation' ),
-	'heading_list'       => __( 'Sites list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_pagination' => __('Sites list navigation'),
+	'heading_list'       => __('Sites list'),
+));
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( isset( $_GET['action'] ) ) {
+if (isset($_GET['action'])) {
 	/** This action is documented in wp-admin/network/edit.php */
-	do_action( 'wpmuadminedit' );
+	do_action('wpmuadminedit');
 
 	// A list of valid actions and their associated messaging for confirmation output.
 	$manage_actions = array(
-		'activateblog'   => __( 'You are about to activate the site %s.' ),
-		'deactivateblog' => __( 'You are about to deactivate the site %s.' ),
-		'unarchiveblog'  => __( 'You are about to unarchive the site %s.' ),
-		'archiveblog'    => __( 'You are about to archive the site %s.' ),
-		'unspamblog'     => __( 'You are about to unspam the site %s.' ),
-		'spamblog'       => __( 'You are about to mark the site %s as spam.' ),
-		'deleteblog'     => __( 'You are about to delete the site %s.' ),
-		'unmatureblog'   => __( 'You are about to mark the site %s as mature.' ),
-		'matureblog'     => __( 'You are about to mark the site %s as not mature.' ),
+		'activateblog'   => __('You are about to activate the site %s.'),
+		'deactivateblog' => __('You are about to deactivate the site %s.'),
+		'unarchiveblog'  => __('You are about to unarchive the site %s.'),
+		'archiveblog'    => __('You are about to archive the site %s.'),
+		'unspamblog'     => __('You are about to unspam the site %s.'),
+		'spamblog'       => __('You are about to mark the site %s as spam.'),
+		'deleteblog'     => __('You are about to delete the site %s.'),
+		'unmatureblog'   => __('You are about to mark the site %s as mature.'),
+		'matureblog'     => __('You are about to mark the site %s as not mature.'),
 	);
 
-	if ( 'confirm' === $_GET['action'] ) {
+	if ('confirm' === $_GET['action']) {
 		// The action2 parameter contains the action being taken on the site.
 		$site_action = $_GET['action2'];
 
-		if ( ! array_key_exists( $site_action, $manage_actions ) ) {
-			wp_die( __( 'The requested action is not valid.' ) );
+		if ( ! array_key_exists($site_action, $manage_actions)) {
+			wp_die(__('The requested action is not valid.'));
 		}
 
 		// The mature/unmature UI exists only as external code. Check the "confirm" nonce for backward compatibility.
-		if ( 'matureblog' === $site_action || 'unmatureblog' === $site_action ) {
-			check_admin_referer( 'confirm' );
+		if ('matureblog' === $site_action || 'unmatureblog' === $site_action) {
+			check_admin_referer('confirm');
 		} else {
-			check_admin_referer( $site_action . '_' . $id );
+			check_admin_referer($site_action.'_'.$id);
 		}
 
-		if ( ! headers_sent() ) {
+		if ( ! headers_sent()) {
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=utf-8' );
+			header('Content-Type: text/html; charset=utf-8');
 		}
 
-		if ( $current_site->blog_id == $id ) {
-			wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
+		if ($current_site->blog_id == $id) {
+			wp_die(__('Sorry, you are not allowed to change the current site.'));
 		}
 
-		$site_details = get_blog_details( $id );
-		$site_address = untrailingslashit( $site_details->domain . $site_details->path );
+		$site_details = get_blog_details($id);
+		$site_address = untrailingslashit($site_details->domain.$site_details->path);
 
-		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 		?>
 			<div class="wrap">
-				<h1><?php _e( 'Confirm your action' ); ?></h1>
-				<form action="sites.php?action=<?php echo esc_attr( $site_action ); ?>" method="post">
-					<input type="hidden" name="action" value="<?php echo esc_attr( $site_action ); ?>" />
-					<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
-					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
-					<?php wp_nonce_field( $site_action . '_' . $id, '_wpnonce', false ); ?>
-					<p><?php echo sprintf( $manage_actions[ $site_action ], $site_address ); ?></p>
-					<?php submit_button( __( 'Confirm' ), 'primary' ); ?>
+				<h1><?php _e('Confirm your action'); ?></h1>
+				<form action="sites.php?action=<?php echo esc_attr($site_action); ?>" method="post">
+					<input type="hidden" name="action" value="<?php echo esc_attr($site_action); ?>" />
+					<input type="hidden" name="id" value="<?php echo esc_attr($id); ?>" />
+					<input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr(wp_get_referer()); ?>" />
+					<?php wp_nonce_field($site_action.'_'.$id, '_wpnonce', false); ?>
+					<p><?php echo sprintf($manage_actions[$site_action], $site_address); ?></p>
+					<?php submit_button(__('Confirm'), 'primary'); ?>
 				</form>
 			</div>
 		<?php
-		require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+		require_once(ABSPATH.'wp-admin/admin-footer.php');
 		exit();
-	} elseif ( array_key_exists( $_GET['action'], $manage_actions ) ) {
+	} elseif (array_key_exists($_GET['action'], $manage_actions)) {
 		$action = $_GET['action'];
-		check_admin_referer( $action . '_' . $id );
-	} elseif ( 'allblogs' === $_GET['action'] ) {
-		check_admin_referer( 'bulk-sites' );
+		check_admin_referer($action.'_'.$id);
+	} elseif ('allblogs' === $_GET['action']) {
+		check_admin_referer('bulk-sites');
 	}
 
 	$updated_action = '';
 
-	switch ( $_GET['action'] ) {
+	switch ($_GET['action']) {
 
 		case 'deleteblog':
-			if ( ! current_user_can( 'delete_sites' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
+			if ( ! current_user_can('delete_sites'))
+				wp_die(__('Sorry, you are not allowed to access this page.'), '', array('response' => 403));
 
 			$updated_action = 'not_deleted';
-			if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
-				wpmu_delete_blog( $id, true );
+			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'] ) ) {
+			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 ) {
+				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( __( 'Sorry, you are not allowed to delete the site.' ) );
+								if ( ! current_user_can('delete_site', $val))
+									wp_die(__('Sorry, you are not allowed to delete the site.'));
 
 								$updated_action = 'all_delete';
-								wpmu_delete_blog( $val, true );
+								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' );
+								$updated_action = ('spam' === $doaction) ? 'all_spam' : 'all_notspam';
+								update_blog_status($val, 'spam', ('spam' === $doaction) ? '1' : '0');
 							break;
 						}
 					} else {
-						wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
+						wp_die(__('Sorry, you are not allowed to change the current site.'));
 					}
 				}
 			} else {
-				$location = network_admin_url( 'sites.php' );
-				if ( ! empty( $_REQUEST['paged'] ) ) {
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				$location = network_admin_url('sites.php');
+				if ( ! empty($_REQUEST['paged'])) {
+					$location = add_query_arg('paged', (int) $_REQUEST['paged'], $location);
 				}
-				wp_redirect( $location );
+				wp_redirect($location);
 				exit();
 			}
 		break;
 
 		case 'archiveblog':
 		case 'unarchiveblog':
-			update_blog_status( $id, 'archived', ( 'archiveblog' === $_GET['action'] ) ? '1' : '0' );
+			update_blog_status($id, 'archived', ('archiveblog' === $_GET['action']) ? '1' : '0');
 		break;
 
 		case 'activateblog':
-			update_blog_status( $id, 'deleted', '0' );
+			update_blog_status($id, 'deleted', '0');
 
 			/**
 			 * Fires after a network site is activated.
@@ -185,7 +185,7 @@ 
 			 *
 			 * @param string $id The ID of the activated site.
 			 */
-			do_action( 'activate_blog', $id );
+			do_action('activate_blog', $id);
 		break;
 
 		case 'deactivateblog':
@@ -196,66 +196,66 @@ 
 			 *
 			 * @param string $id The ID of the site being deactivated.
 			 */
-			do_action( 'deactivate_blog', $id );
-			update_blog_status( $id, 'deleted', '1' );
+			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' );
+			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' );
+			update_blog_status($id, 'mature', ('matureblog' === $_GET['action']) ? '1' : '0');
 		break;
 	}
 
-	if ( empty( $updated_action ) && array_key_exists( $_GET['action'], $manage_actions ) ) {
+	if (empty($updated_action) && array_key_exists($_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() ) );
+	if ( ! empty($updated_action)) {
+		wp_safe_redirect(add_query_arg(array('updated' => $updated_action), wp_get_referer()));
 		exit();
 	}
 }
 
 $msg = '';
-if ( isset( $_GET['updated'] ) ) {
-	switch ( $_GET['updated'] ) {
+if (isset($_GET['updated'])) {
+	switch ($_GET['updated']) {
 		case 'all_notspam':
-			$msg = __( 'Sites removed from spam.' );
+			$msg = __('Sites removed from spam.');
 		break;
 		case 'all_spam':
-			$msg = __( 'Sites marked as spam.' );
+			$msg = __('Sites marked as spam.');
 		break;
 		case 'all_delete':
-			$msg = __( 'Sites deleted.' );
+			$msg = __('Sites deleted.');
 		break;
 		case 'delete':
-			$msg = __( 'Site deleted.' );
+			$msg = __('Site deleted.');
 		break;
 		case 'not_deleted':
-			$msg = __( 'Sorry, you are not allowed to delete that site.' );
+			$msg = __('Sorry, you are not allowed to delete that site.');
 		break;
 		case 'archiveblog':
-			$msg = __( 'Site archived.' );
+			$msg = __('Site archived.');
 		break;
 		case 'unarchiveblog':
-			$msg = __( 'Site unarchived.' );
+			$msg = __('Site unarchived.');
 		break;
 		case 'activateblog':
-			$msg = __( 'Site activated.' );
+			$msg = __('Site activated.');
 		break;
 		case 'deactivateblog':
-			$msg = __( 'Site deactivated.' );
+			$msg = __('Site deactivated.');
 		break;
 		case 'unspamblog':
-			$msg = __( 'Site removed from spam.' );
+			$msg = __('Site removed from spam.');
 		break;
 		case 'spamblog':
-			$msg = __( 'Site marked as spam.' );
+			$msg = __('Site marked as spam.');
 		break;
 		default:
 			/**
@@ -268,37 +268,37 @@ 
 			 *
 			 * @param string $msg The update message. Default 'Settings saved'.
 			 */
-			$msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) );
+			$msg = apply_filters('network_sites_updated_message_'.$_GET['updated'], __('Settings saved.'));
 		break;
 	}
 
-	if ( ! empty( $msg ) )
-		$msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
+	if ( ! empty($msg))
+		$msg = '<div class="updated" id="message notice is-dismissible"><p>'.$msg.'</p></div>';
 }
 
 $wp_list_table->prepare_items();
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php _e( 'Sites' ); ?>
+<h1><?php _e('Sites'); ?>
 
-<?php if ( current_user_can( 'create_sites') ) : ?>
-	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
+<?php if (current_user_can('create_sites')) : ?>
+	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'site'); ?></a>
 <?php endif; ?>
 
 <?php
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($s));
 } ?>
 </h1>
 
 <?php echo $msg; ?>
 
 <form method="get" id="ms-search">
-<?php $wp_list_table->search_box( __( 'Search Sites' ), 'site' ); ?>
+<?php $wp_list_table->search_box(__('Search Sites'), 'site'); ?>
 <input type="hidden" name="action" value="blogs" />
 </form>
 
@@ -308,4 +308,4 @@ 
 </div>
 <?php
 
-require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+require_once(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +14 added lines, -9 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 $wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
 $pagenum = $wp_list_table->get_pagenum();
@@ -125,8 +127,9 @@ 
 	switch ( $_GET['action'] ) {
 
 		case 'deleteblog':
-			if ( ! current_user_can( 'delete_sites' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
+			if ( ! current_user_can( 'delete_sites' ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
+			}
 
 			$updated_action = 'not_deleted';
 			if ( $id != '0' && $id != $current_site->blog_id && current_user_can( 'delete_site', $id ) ) {
@@ -143,8 +146,9 @@ 
 					if ( $val != '0' && $val != $current_site->blog_id ) {
 						switch ( $doaction ) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_site', $val ) )
-									wp_die( __( 'Sorry, you are not allowed to delete the site.' ) );
+								if ( ! current_user_can( 'delete_site', $val ) ) {
+																	wp_die( __( 'Sorry, you are not allowed to delete the site.' ) );
+								}
 
 								$updated_action = 'all_delete';
 								wpmu_delete_blog( $val, true );
@@ -272,9 +276,10 @@ 
 		break;
 	}
 
-	if ( ! empty( $msg ) )
-		$msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
-}
+	if ( ! empty( $msg ) ) {
+			$msg = '<div class="updated" id="message notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	}
 
 $wp_list_table->prepare_items();
 

src/wp-admin/network/themes.php

Spacing +131 added lines, -131 removed lines

@@ -8,13 +8,13 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( !current_user_can('manage_network_themes') )
-	wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) );
+if ( ! current_user_can('manage_network_themes'))
+	wp_die(__('Sorry, you are not allowed to manage network themes.'));
 
 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -24,176 +24,176 @@ 
 $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
-$temp_args = array( 'enabled', 'disabled', 'deleted', 'error' );
-$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( $temp_args, wp_get_referer() );
+$temp_args = array('enabled', 'disabled', 'deleted', 'error');
+$_SERVER['REQUEST_URI'] = remove_query_arg($temp_args, $_SERVER['REQUEST_URI']);
+$referer = remove_query_arg($temp_args, wp_get_referer());
 
-if ( $action ) {
-	switch ( $action ) {
+if ($action) {
+	switch ($action) {
 		case 'enable':
-			check_admin_referer('enable-theme_' . $_GET['theme']);
-			WP_Theme::network_enable_theme( $_GET['theme'] );
-			if ( false === strpos( $referer, '/network/themes.php' ) )
-				wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
+			check_admin_referer('enable-theme_'.$_GET['theme']);
+			WP_Theme::network_enable_theme($_GET['theme']);
+			if (false === strpos($referer, '/network/themes.php'))
+				wp_redirect(network_admin_url('themes.php?enabled=1'));
 			else
-				wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
+				wp_safe_redirect(add_query_arg('enabled', 1, $referer));
 			exit;
 		case 'disable':
-			check_admin_referer('disable-theme_' . $_GET['theme']);
-			WP_Theme::network_disable_theme( $_GET['theme'] );
-			wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
+			check_admin_referer('disable-theme_'.$_GET['theme']);
+			WP_Theme::network_disable_theme($_GET['theme']);
+			wp_safe_redirect(add_query_arg('disabled', '1', $referer));
 			exit;
 		case 'enable-selected':
 			check_admin_referer('bulk-themes');
-			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-			if ( empty($themes) ) {
-				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
+			$themes = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
+			if (empty($themes)) {
+				wp_safe_redirect(add_query_arg('error', 'none', $referer));
 				exit;
 			}
-			WP_Theme::network_enable_theme( (array) $themes );
-			wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
+			WP_Theme::network_enable_theme((array) $themes);
+			wp_safe_redirect(add_query_arg('enabled', count($themes), $referer));
 			exit;
 		case 'disable-selected':
 			check_admin_referer('bulk-themes');
-			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-			if ( empty($themes) ) {
-				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
+			$themes = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
+			if (empty($themes)) {
+				wp_safe_redirect(add_query_arg('error', 'none', $referer));
 				exit;
 			}
-			WP_Theme::network_disable_theme( (array) $themes );
-			wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
+			WP_Theme::network_disable_theme((array) $themes);
+			wp_safe_redirect(add_query_arg('disabled', count($themes), $referer));
 			exit;
 		case 'update-selected' :
-			check_admin_referer( 'bulk-themes' );
+			check_admin_referer('bulk-themes');
 
-			if ( isset( $_GET['themes'] ) )
-				$themes = explode( ',', $_GET['themes'] );
-			elseif ( isset( $_POST['checked'] ) )
+			if (isset($_GET['themes']))
+				$themes = explode(',', $_GET['themes']);
+			elseif (isset($_POST['checked']))
 				$themes = (array) $_POST['checked'];
 			else
 				$themes = array();
 
-			$title = __( 'Update Themes' );
+			$title = __('Update Themes');
 			$parent_file = 'themes.php';
 
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
 			echo '<div class="wrap">';
-			echo '<h1>' . esc_html( $title ) . '</h1>';
+			echo '<h1>'.esc_html($title).'</h1>';
 
-			$url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
+			$url = self_admin_url('update.php?action=update-selected-themes&amp;themes='.urlencode(join(',', $themes)));
 			$url = wp_nonce_url($url, 'bulk-update-themes');
 
 			echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
 			echo '</div>';
-			require_once(ABSPATH . 'wp-admin/admin-footer.php');
+			require_once(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		case 'delete-selected':
-			if ( ! current_user_can( 'delete_themes' ) ) {
-				wp_die( __('Sorry, you are not allowed to delete themes for this site.') );
+			if ( ! current_user_can('delete_themes')) {
+				wp_die(__('Sorry, you are not allowed to delete themes for this site.'));
 			}
 
-			check_admin_referer( 'bulk-themes' );
+			check_admin_referer('bulk-themes');
 
-			$themes = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
+			$themes = isset($_REQUEST['checked']) ? (array) $_REQUEST['checked'] : array();
 
-			if ( empty( $themes ) ) {
-				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
+			if (empty($themes)) {
+				wp_safe_redirect(add_query_arg('error', 'none', $referer));
 				exit;
 			}
 
-			$themes = array_diff( $themes, array( get_option( 'stylesheet' ), get_option( 'template' ) ) );
+			$themes = array_diff($themes, array(get_option('stylesheet'), get_option('template')));
 
-			if ( empty( $themes ) ) {
-				wp_safe_redirect( add_query_arg( 'error', 'main', $referer ) );
+			if (empty($themes)) {
+				wp_safe_redirect(add_query_arg('error', 'main', $referer));
 				exit;
 			}
 
 			$theme_info = array();
-			foreach ( $themes as $key => $theme ) {
-				$theme_info[ $theme ] = wp_get_theme( $theme );
+			foreach ($themes as $key => $theme) {
+				$theme_info[$theme] = wp_get_theme($theme);
 			}
 
-			include(ABSPATH . 'wp-admin/update.php');
+			include(ABSPATH.'wp-admin/update.php');
 
 			$parent_file = 'themes.php';
 
-			if ( ! isset( $_REQUEST['verify-delete'] ) ) {
-				wp_enqueue_script( 'jquery' );
-				require_once( ABSPATH . 'wp-admin/admin-header.php' );
-				$themes_to_delete = count( $themes );
+			if ( ! isset($_REQUEST['verify-delete'])) {
+				wp_enqueue_script('jquery');
+				require_once(ABSPATH.'wp-admin/admin-header.php');
+				$themes_to_delete = count($themes);
 				?>
 			<div class="wrap">
-				<?php if ( 1 == $themes_to_delete ) : ?>
-					<h1><?php _e( 'Delete Theme' ); ?></h1>
-					<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This theme may be active on other sites in the network.' ); ?></p></div>
-					<p><?php _e( 'You are about to remove the following theme:' ); ?></p>
+				<?php if (1 == $themes_to_delete) : ?>
+					<h1><?php _e('Delete Theme'); ?></h1>
+					<div class="error"><p><strong><?php _e('Caution:'); ?></strong> <?php _e('This theme may be active on other sites in the network.'); ?></p></div>
+					<p><?php _e('You are about to remove the following theme:'); ?></p>
 				<?php else : ?>
-					<h1><?php _e( 'Delete Themes' ); ?></h1>
-					<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These themes may be active on other sites in the network.' ); ?></p></div>
-					<p><?php _e( 'You are about to remove the following themes:' ); ?></p>
+					<h1><?php _e('Delete Themes'); ?></h1>
+					<div class="error"><p><strong><?php _e('Caution:'); ?></strong> <?php _e('These themes may be active on other sites in the network.'); ?></p></div>
+					<p><?php _e('You are about to remove the following themes:'); ?></p>
 				<?php endif; ?>
 					<ul class="ul-disc">
 					<?php
-						foreach ( $theme_info as $theme ) {
-							echo '<li>' . sprintf(
+						foreach ($theme_info as $theme) {
+							echo '<li>'.sprintf(
 								/* translators: 1: theme name, 2: theme author */
-								_x( '%1$s by %2$s', 'theme' ),
-								'<strong>' . $theme->display( 'Name' ) . '</strong>',
-								'<em>' . $theme->display( 'Author' ) . '</em>'
-							) . '</li>';
+								_x('%1$s by %2$s', 'theme'),
+								'<strong>'.$theme->display('Name').'</strong>',
+								'<em>'.$theme->display('Author').'</em>'
+							).'</li>';
 						}
 					?>
 					</ul>
-				<?php if ( 1 == $themes_to_delete ) : ?>
-					<p><?php _e( 'Are you sure you wish to delete this theme?' ); ?></p>
+				<?php if (1 == $themes_to_delete) : ?>
+					<p><?php _e('Are you sure you wish to delete this theme?'); ?></p>
 				<?php else : ?>
-					<p><?php _e( 'Are you sure you wish to delete these themes?' ); ?></p>
+					<p><?php _e('Are you sure you wish to delete these themes?'); ?></p>
 				<?php endif; ?>
 				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
 					<?php
-						foreach ( (array) $themes as $theme ) {
-							echo '<input type="hidden" name="checked[]" value="' . esc_attr($theme) . '" />';
+						foreach ((array) $themes as $theme) {
+							echo '<input type="hidden" name="checked[]" value="'.esc_attr($theme).'" />';
 						}
 
-						wp_nonce_field( 'bulk-themes' );
+						wp_nonce_field('bulk-themes');
 
-						if ( 1 == $themes_to_delete ) {
-							submit_button( __( 'Yes, delete this theme' ), 'button', 'submit', false );
+						if (1 == $themes_to_delete) {
+							submit_button(__('Yes, delete this theme'), 'button', 'submit', false);
 						} else {
-							submit_button( __( 'Yes, delete these themes' ), 'button', 'submit', false );
+							submit_button(__('Yes, delete these themes'), 'button', 'submit', false);
 						}
 					?>
 				</form>
 				<?php
 				$referer = wp_get_referer();
 				?>
-				<form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
-					<?php submit_button( __( 'No, return me to the theme list' ), 'button', 'submit', false ); ?>
+				<form method="post" action="<?php echo $referer ? esc_url($referer) : ''; ?>" style="display:inline;">
+					<?php submit_button(__('No, return me to the theme list'), 'button', 'submit', false); ?>
 				</form>
 			</div>
 				<?php
-				require_once(ABSPATH . 'wp-admin/admin-footer.php');
+				require_once(ABSPATH.'wp-admin/admin-footer.php');
 				exit;
 			} // Endif verify-delete
 
-			foreach ( $themes as $theme ) {
-				$delete_result = delete_theme( $theme, esc_url( add_query_arg( array(
+			foreach ($themes as $theme) {
+				$delete_result = delete_theme($theme, esc_url(add_query_arg(array(
 					'verify-delete' => 1,
 					'action' => 'delete-selected',
 					'checked' => $_REQUEST['checked'],
 					'_wpnonce' => $_REQUEST['_wpnonce']
-				), network_admin_url( 'themes.php' ) ) ) );
+				), network_admin_url('themes.php'))));
 			}
 
-			$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
-			wp_redirect( add_query_arg( array(
-				'deleted' => count( $themes ),
+			$paged = ($_REQUEST['paged']) ? $_REQUEST['paged'] : 1;
+			wp_redirect(add_query_arg(array(
+				'deleted' => count($themes),
 				'paged' => $paged,
 				's' => $s
-			), network_admin_url( 'themes.php' ) ) );
+			), network_admin_url('themes.php')));
 			exit;
 	}
 }
@@ -202,90 +202,90 @@ 
 
 add_thickbox();
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
-		'<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
-		'<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '</p>'
-) );
+		'<p>'.__('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.').'</p>'.
+		'<p>'.__('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.').'</p>'.
+		'<p>'.__('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter themes list' ),
-	'heading_pagination' => __( 'Themes list navigation' ),
-	'heading_list'       => __( 'Themes list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter themes list'),
+	'heading_pagination' => __('Themes list navigation'),
+	'heading_list'       => __('Themes list'),
+));
 
 $title = __('Themes');
 $parent_file = 'themes.php';
 
-wp_enqueue_script( 'updates' );
-wp_enqueue_script( 'theme-preview' );
+wp_enqueue_script('updates');
+wp_enqueue_script('theme-preview');
 
-require_once(ABSPATH . 'wp-admin/admin-header.php');
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="page-title-action"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+<h1><?php echo esc_html($title); if (current_user_can('install_themes')) { ?> <a href="theme-install.php" class="page-title-action"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($s));
 }
 ?>
 </h1>
 
 <?php
-if ( isset( $_GET['enabled'] ) ) {
-	$enabled = absint( $_GET['enabled'] );
-	if ( 1 == $enabled ) {
-		$message = __( 'Theme enabled.' );
+if (isset($_GET['enabled'])) {
+	$enabled = absint($_GET['enabled']);
+	if (1 == $enabled) {
+		$message = __('Theme enabled.');
 	} else {
-		$message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+		$message = _n('%s theme enabled.', '%s themes enabled.', $enabled);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
-} elseif ( isset( $_GET['disabled'] ) ) {
-	$disabled = absint( $_GET['disabled'] );
-	if ( 1 == $disabled ) {
-		$message = __( 'Theme disabled.' );
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.sprintf($message, number_format_i18n($enabled)).'</p></div>';
+} elseif (isset($_GET['disabled'])) {
+	$disabled = absint($_GET['disabled']);
+	if (1 == $disabled) {
+		$message = __('Theme disabled.');
 	} else {
-		$message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+		$message = _n('%s theme disabled.', '%s themes disabled.', $disabled);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
-} elseif ( isset( $_GET['deleted'] ) ) {
-	$deleted = absint( $_GET['deleted'] );
-	if ( 1 == $deleted ) {
-		$message = __( 'Theme deleted.' );
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.sprintf($message, number_format_i18n($disabled)).'</p></div>';
+} elseif (isset($_GET['deleted'])) {
+	$deleted = absint($_GET['deleted']);
+	if (1 == $deleted) {
+		$message = __('Theme deleted.');
 	} else {
-		$message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+		$message = _n('%s theme deleted.', '%s themes deleted.', $deleted);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
-} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
-	echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
-} elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {
-	echo '<div class="error notice is-dismissible"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.sprintf($message, number_format_i18n($deleted)).'</p></div>';
+} elseif (isset($_GET['error']) && 'none' == $_GET['error']) {
+	echo '<div id="message" class="error notice is-dismissible"><p>'.__('No theme selected.').'</p></div>';
+} elseif (isset($_GET['error']) && 'main' == $_GET['error']) {
+	echo '<div class="error notice is-dismissible"><p>'.__('You cannot delete a theme while it is active on the main site.').'</p></div>';
 }
 
 ?>
 
 <form method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
+<?php $wp_list_table->search_box(__('Search Installed Themes'), 'theme'); ?>
 </form>
 
 <?php
 $wp_list_table->views();
 
-if ( 'broken' == $status )
-	echo '<p class="clear">' . __( 'The following themes are installed but incomplete.' ) . '</p>';
+if ('broken' == $status)
+	echo '<p class="clear">'.__('The following themes are installed but incomplete.').'</p>';
 ?>
 
 <form id="bulk-action-form" method="post">
@@ -302,4 +302,4 @@ 
 wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/network/settings.php

Spacing +127 added lines, -127 removed lines

@@ -8,51 +8,51 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_network_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! current_user_can('manage_network_options'))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-$title = __( 'Network Settings' );
+$title = __('Network Settings');
 $parent_file = 'settings.php';
 
-add_action( 'admin_head', 'network_settings_add_js' );
+add_action('admin_head', 'network_settings_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
-			'<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
-			'<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
-			'<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
-			'<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
-			'<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
-			'<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
-			'<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
-) );
+			'<p>'.__('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.').'</p>'.
+			'<p>'.__('Operational settings has fields for the network&#8217;s name and admin email.').'</p>'.
+			'<p>'.__('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.').'</p>'.
+			'<p>'.__('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.').'</p>'.
+			'<p>'.__('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).').'</p>'.
+			'<p>'.__('You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).').'</p>'.
+			'<p>'.__('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.').'</p>'.
+			'<p>'.__('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( $_POST ) {
+if ($_POST) {
 	/** This action is documented in wp-admin/network/edit.php */
-	do_action( 'wpmuadminedit' );
+	do_action('wpmuadminedit');
 
-	check_admin_referer( 'siteoptions' );
+	check_admin_referer('siteoptions');
 
-	$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
-	foreach ( $checked_options as $option_name => $option_unchecked_value ) {
-		if ( ! isset( $_POST[$option_name] ) )
+	$checked_options = array('menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0);
+	foreach ($checked_options as $option_name => $option_unchecked_value) {
+		if ( ! isset($_POST[$option_name]))
 			$_POST[$option_name] = $option_unchecked_value;
 	}
 
@@ -66,18 +66,18 @@ 
 	);
 
 	// Handle translation install.
-	if ( ! empty( $_POST['WPLANG'] ) && wp_can_install_language_pack() ) {  // @todo: Skip if already installed
-		$language = wp_download_language_pack( $_POST['WPLANG'] );
-		if ( $language ) {
+	if ( ! empty($_POST['WPLANG']) && wp_can_install_language_pack()) {  // @todo: Skip if already installed
+		$language = wp_download_language_pack($_POST['WPLANG']);
+		if ($language) {
 			$_POST['WPLANG'] = $language;
 		}
 	}
 
-	foreach ( $options as $option_name ) {
-		if ( ! isset($_POST[$option_name]) )
+	foreach ($options as $option_name) {
+		if ( ! isset($_POST[$option_name]))
 			continue;
-		$value = wp_unslash( $_POST[$option_name] );
-		update_site_option( $option_name, $value );
+		$value = wp_unslash($_POST[$option_name]);
+		update_site_option($option_name, $value);
 	}
 
 	/**
@@ -85,62 +85,62 @@ 
 	 *
 	 * @since MU
 	 */
-	do_action( 'update_wpmu_options' );
+	do_action('update_wpmu_options');
 
-	wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
+	wp_redirect(add_query_arg('updated', 'true', network_admin_url('settings.php')));
 	exit();
 }
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset( $_GET['updated'] ) ) {
-	?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ) ?></p></div><?php
+if (isset($_GET['updated'])) {
+	?><div id="message" class="updated notice is-dismissible"><p><?php _e('Settings saved.') ?></p></div><?php
 }
 ?>
 
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 	<form method="post" action="settings.php" novalidate="novalidate">
-		<?php wp_nonce_field( 'siteoptions' ); ?>
-		<h2><?php _e( 'Operational Settings' ); ?></h2>
+		<?php wp_nonce_field('siteoptions'); ?>
+		<h2><?php _e('Operational Settings'); ?></h2>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
+				<th scope="row"><label for="site_name"><?php _e('Network Title') ?></label></th>
 				<td>
-					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
+					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr($current_site->site_name) ?>" />
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
+				<th scope="row"><label for="admin_email"><?php _e('Network Admin Email') ?></label></th>
 				<td>
-					<input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
+					<input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr(get_site_option('admin_email')) ?>" />
 					<p class="description" id="admin-email-desc">
-						<?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
+						<?php _e('This email address will receive notifications. Registration and support emails will also come from this address.'); ?>
 					</p>
 				</td>
 			</tr>
 		</table>
-		<h2><?php _e( 'Registration Settings' ); ?></h2>
+		<h2><?php _e('Registration Settings'); ?></h2>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
+				<th scope="row"><?php _e('Allow new registrations') ?></th>
 				<?php
-				if ( !get_site_option( 'registration' ) )
-					update_site_option( 'registration', 'none' );
-				$reg = get_site_option( 'registration' );
+				if ( ! get_site_option('registration'))
+					update_site_option('registration', 'none');
+				$reg = get_site_option('registration');
 				?>
 				<td>
 					<fieldset>
-					<legend class="screen-reader-text"><?php _e( 'New registrations settings' ) ?></legend>
-					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label>
-					<?php if ( is_subdomain_install() ) {
+					<legend class="screen-reader-text"><?php _e('New registrations settings') ?></legend>
+					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked($reg, 'none') ?> /> <?php _e('Registration is disabled.'); ?></label><br />
+					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked($reg, 'user') ?> /> <?php _e('User accounts may be registered.'); ?></label><br />
+					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked($reg, 'blog') ?> /> <?php _e('Logged in users may register new sites.'); ?></label><br />
+					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked($reg, 'all') ?> /> <?php _e('Both sites and user accounts can be registered.'); ?></label>
+					<?php if (is_subdomain_install()) {
 						echo '<p class="description">';
 						/* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
-						printf( __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
+						printf(__('If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.'),
 							'<code>NOBLOGREDIRECT</code>',
 							'<code>wp-config.php</code>'
 						);
@@ -151,42 +151,42 @@ 
 			</tr>
 
 			<tr>
-				<th scope="row"><?php _e( 'Registration notification' ) ?></th>
+				<th scope="row"><?php _e('Registration notification') ?></th>
 				<?php
-				if ( !get_site_option( 'registrationnotification' ) )
-					update_site_option( 'registrationnotification', 'yes' );
+				if ( ! get_site_option('registrationnotification'))
+					update_site_option('registrationnotification', 'yes');
 				?>
 				<td>
-					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
+					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked(get_site_option('registrationnotification'), 'yes') ?> /> <?php _e('Send the network admin an email notification every time someone registers a site or user account.') ?></label>
 				</td>
 			</tr>
 
 			<tr id="addnewusers">
-				<th scope="row"><?php _e( 'Add New Users' ) ?></th>
+				<th scope="row"><?php _e('Add New Users') ?></th>
 				<td>
-					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.' ); ?></label>
+					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked(get_site_option('add_new_users')) ?> /> <?php _e('Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.'); ?></label>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
+				<th scope="row"><label for="illegal_names"><?php _e('Banned Names') ?></label></th>
 				<td>
-					<input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
+					<input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr(implode(" ", (array) get_site_option('illegal_names'))); ?>" size="45" />
 					<p class="description" id="illegal-names-desc">
-						<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
+						<?php _e('Users are not allowed to register these sites. Separate names by spaces.') ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
+				<th scope="row"><label for="limited_email_domains"><?php _e('Limited Email Registrations') ?></label></th>
 				<td>
-					<?php $limited_email_domains = get_site_option( 'limited_email_domains' );
-					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
+					<?php $limited_email_domains = get_site_option('limited_email_domains');
+					$limited_email_domains = str_replace(' ', "\n", $limited_email_domains); ?>
 					<textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
-<?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
+<?php echo esc_textarea($limited_email_domains == '' ? '' : implode("\n", (array) $limited_email_domains)); ?></textarea>
 					<p class="description" id="limited-email-domains-desc">
-						<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
+						<?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?>
 					</p>
 				</td>
 			</tr>
@@ -195,123 +195,123 @@ 
 				<th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
 				<td>
 					<textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
-<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
+<?php echo esc_textarea(get_site_option('banned_email_domains') == '' ? '' : implode("\n", (array) get_site_option('banned_email_domains'))); ?></textarea>
 					<p class="description" id="banned-email-domains-desc">
-						<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
+						<?php _e('If you want to ban domains from site registrations. One domain per line.') ?>
 					</p>
 				</td>
 			</tr>
 
 		</table>
-		<h2><?php _e( 'New Site Settings' ); ?></h2>
+		<h2><?php _e('New Site Settings'); ?></h2>
 		<table class="form-table">
 
 			<tr>
-				<th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
+				<th scope="row"><label for="welcome_email"><?php _e('Welcome Email') ?></label></th>
 				<td>
 					<textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('welcome_email')) ?></textarea>
 					<p class="description" id="welcome-email-desc">
-						<?php _e( 'The welcome email sent to new site owners.' ) ?>
+						<?php _e('The welcome email sent to new site owners.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
+				<th scope="row"><label for="welcome_user_email"><?php _e('Welcome User Email') ?></label></th>
 				<td>
 					<textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('welcome_user_email')) ?></textarea>
 					<p class="description" id="welcome-user-email-desc">
-						<?php _e( 'The welcome email sent to new users.' ) ?>
+						<?php _e('The welcome email sent to new users.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
+				<th scope="row"><label for="first_post"><?php _e('First Post') ?></label></th>
 				<td>
 					<textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('first_post')) ?></textarea>
 					<p class="description" id="first-post-desc">
-						<?php _e( 'The first post on a new site.' ) ?>
+						<?php _e('The first post on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
+				<th scope="row"><label for="first_page"><?php _e('First Page') ?></label></th>
 				<td>
 					<textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('first_page')) ?></textarea>
 					<p class="description" id="first-page-desc">
-						<?php _e( 'The first page on a new site.' ) ?>
+						<?php _e('The first page on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
+				<th scope="row"><label for="first_comment"><?php _e('First Comment') ?></label></th>
 				<td>
 					<textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
+<?php echo esc_textarea(get_site_option('first_comment')) ?></textarea>
 					<p class="description" id="first-comment-desc">
-						<?php _e( 'The first comment on a new site.' ) ?>
+						<?php _e('The first comment on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
+				<th scope="row"><label for="first_comment_author"><?php _e('First Comment Author') ?></label></th>
 				<td>
-					<input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr( get_site_option('first_comment_author') ); ?>" />
+					<input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr(get_site_option('first_comment_author')); ?>" />
 					<p class="description" id="first-comment-author-desc">
-						<?php _e( 'The author of the first comment on a new site.' ) ?>
+						<?php _e('The author of the first comment on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ) ?></label></th>
+				<th scope="row"><label for="first_comment_email"><?php _e('First Comment Email') ?></label></th>
 				<td>
-					<input type="text" size="40" name="first_comment_email" id="first_comment_email" aria-describedby="first-comment-email-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_email' ) ); ?>" />
+					<input type="text" size="40" name="first_comment_email" id="first_comment_email" aria-describedby="first-comment-email-desc" value="<?php echo esc_attr(get_site_option('first_comment_email')); ?>" />
 					<p class="description" id="first-comment-email-desc">
-						<?php _e( 'The email address of the first comment author on a new site.' ) ?>
+						<?php _e('The email address of the first comment author on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
+				<th scope="row"><label for="first_comment_url"><?php _e('First Comment URL') ?></label></th>
 				<td>
-					<input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
+					<input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" />
 					<p class="description" id="first-comment-url-desc">
-						<?php _e( 'The URL for the first comment on a new site.' ) ?>
+						<?php _e('The URL for the first comment on a new site.') ?>
 					</p>
 				</td>
 			</tr>
 		</table>
-		<h2><?php _e( 'Upload Settings' ); ?></h2>
+		<h2><?php _e('Upload Settings'); ?></h2>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Site upload space' ) ?></th>
+				<th scope="row"><?php _e('Site upload space') ?></th>
 				<td>
-					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked((bool) get_site_option('upload_space_check_disabled'), false) ?>/> <?php printf(__('Limit total size of files uploaded to %s MB'), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="'.esc_attr(get_site_option('blog_upload_space', 100)).'" />'); ?></label><br />
 					<p class="screen-reader-text" id="blog-upload-space-desc">
-						<?php _e( 'Size in megabytes' ) ?>
+						<?php _e('Size in megabytes') ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
+				<th scope="row"><label for="upload_filetypes"><?php _e('Upload file types') ?></label></th>
 				<td>
-					<input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
+					<input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr(get_site_option('upload_filetypes', 'jpg jpeg png gif')) ?>" size="45" />
 					<p class="description" id="upload-filetypes-desc">
-						<?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
+						<?php _e('Allowed file types. Separate types by spaces.') ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
+				<th scope="row"><label for="fileupload_maxk"><?php _e('Max upload file size') ?></label></th>
 				<td>
-					<?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
+					<?php printf(_x('%s KB', 'File size in kilobytes'), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="'.esc_attr(get_site_option('fileupload_maxk', 300)).'" />'); ?>
 					<p class="screen-reader-text" id="fileupload-maxk-desc">
-						<?php _e( 'Size in kilobytes' ) ?>
+						<?php _e('Size in kilobytes') ?>
 					</p>
 				</td>
 			</tr>
@@ -320,27 +320,27 @@ 
 		<?php
 		$languages = get_available_languages();
 		$translations = wp_get_available_translations();
-		if ( ! empty( $languages ) || ! empty( $translations ) ) {
+		if ( ! empty($languages) || ! empty($translations)) {
 			?>
-			<h2><?php _e( 'Language Settings' ); ?></h2>
+			<h2><?php _e('Language Settings'); ?></h2>
 			<table class="form-table">
 				<tr>
-					<th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
+					<th><label for="WPLANG"><?php _e('Default Language'); ?></label></th>
 					<td>
 						<?php
-						$lang = get_site_option( 'WPLANG' );
-						if ( ! in_array( $lang, $languages ) ) {
+						$lang = get_site_option('WPLANG');
+						if ( ! in_array($lang, $languages)) {
 							$lang = '';
 						}
 
-						wp_dropdown_languages( array(
+						wp_dropdown_languages(array(
 							'name'         => 'WPLANG',
 							'id'           => 'WPLANG',
 							'selected'     => $lang,
 							'languages'    => $languages,
 							'translations' => $translations,
 							'show_available_translations' => wp_can_install_language_pack(),
-						) );
+						));
 						?>
 					</td>
 				</tr>
@@ -349,13 +349,13 @@ 
 		}
 		?>
 
-		<h2><?php _e( 'Menu Settings' ); ?></h2>
+		<h2><?php _e('Menu Settings'); ?></h2>
 		<table id="menu" class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
+				<th scope="row"><?php _e('Enable administration menus'); ?></th>
 				<td>
 			<?php
-			$menu_perms = get_site_option( 'menu_items' );
+			$menu_perms = get_site_option('menu_items');
 			/**
 			 * Filters available network-wide administration menu options.
 			 *
@@ -371,14 +371,14 @@ 
 			 *
 			 * @param array $admin_menus The menu items available.
 			 */
-			$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
+			$menu_items = apply_filters('mu_menu_items', array('plugins' => __('Plugins')));
 			$fieldset_end = '';
-			if ( count( (array) $menu_items ) > 1 ) {
-				echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable menus' ) . '</legend>';
+			if (count((array) $menu_items) > 1) {
+				echo '<fieldset><legend class="screen-reader-text">'.__('Enable menus').'</legend>';
 				$fieldset_end = '</fieldset>';
 			}
-			foreach ( (array) $menu_items as $key => $val ) {
-				echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
+			foreach ((array) $menu_items as $key => $val) {
+				echo "<label><input type='checkbox' name='menu_items[".$key."]' value='1'".(isset($menu_perms[$key]) ? checked($menu_perms[$key], '1', false) : '')." /> ".esc_html($val)."</label><br/>";
 			}
 			echo $fieldset_end;
 			?>
@@ -392,9 +392,9 @@ 
 		 *
 		 * @since MU
 		 */
-		do_action( 'wpmu_options' ); ?>
+		do_action('wpmu_options'); ?>
 		<?php submit_button(); ?>
 	</form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/network/users.php

Spacing +102 added lines, -102 removed lines

@@ -8,134 +8,134 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_network_users' ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! current_user_can('manage_network_users'))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-if ( isset( $_GET['action'] ) ) {
+if (isset($_GET['action'])) {
 	/** This action is documented in wp-admin/network/edit.php */
-	do_action( 'wpmuadminedit' );
+	do_action('wpmuadminedit');
 
-	switch ( $_GET['action'] ) {
+	switch ($_GET['action']) {
 		case 'deleteuser':
-			if ( ! current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( ! current_user_can('manage_network_users'))
+				wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-			check_admin_referer( 'deleteuser' );
+			check_admin_referer('deleteuser');
 
-			$id = intval( $_GET['id'] );
-			if ( $id != '0' && $id != '1' ) {
-				$_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
-				$title = __( 'Users' );
+			$id = intval($_GET['id']);
+			if ($id != '0' && $id != '1') {
+				$_POST['allusers'] = array($id); // confirm_delete_users() can only handle with arrays
+				$title = __('Users');
 				$parent_file = 'users.php';
-				require_once( ABSPATH . 'wp-admin/admin-header.php' );
+				require_once(ABSPATH.'wp-admin/admin-header.php');
 				echo '<div class="wrap">';
-				confirm_delete_users( $_POST['allusers'] );
+				confirm_delete_users($_POST['allusers']);
 				echo '</div>';
-				require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+				require_once(ABSPATH.'wp-admin/admin-footer.php');
 			} else {
-				wp_redirect( network_admin_url( 'users.php' ) );
+				wp_redirect(network_admin_url('users.php'));
 			}
 			exit();
 
 		case 'allusers':
-			if ( !current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( ! current_user_can('manage_network_users'))
+				wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-			if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
-				check_admin_referer( 'bulk-users-network' );
+			if ((isset($_POST['action']) || isset($_POST['action2'])) && isset($_POST['allusers'])) {
+				check_admin_referer('bulk-users-network');
 
 				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
 				$userfunction = '';
 
-				foreach ( (array) $_POST['allusers'] as $user_id ) {
-					if ( !empty( $user_id ) ) {
-						switch ( $doaction ) {
+				foreach ((array) $_POST['allusers'] as $user_id) {
+					if ( ! empty($user_id)) {
+						switch ($doaction) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_users' ) )
-									wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
-								$title = __( 'Users' );
+								if ( ! current_user_can('delete_users'))
+									wp_die(__('Sorry, you are not allowed to access this page.'), 403);
+								$title = __('Users');
 								$parent_file = 'users.php';
-								require_once( ABSPATH . 'wp-admin/admin-header.php' );
+								require_once(ABSPATH.'wp-admin/admin-header.php');
 								echo '<div class="wrap">';
-								confirm_delete_users( $_POST['allusers'] );
+								confirm_delete_users($_POST['allusers']);
 								echo '</div>';
-								require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+								require_once(ABSPATH.'wp-admin/admin-footer.php');
 								exit();
 
 							case 'spam':
-								$user = get_userdata( $user_id );
-								if ( is_super_admin( $user->ID ) )
-									wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								$user = get_userdata($user_id);
+								if (is_super_admin($user->ID))
+									wp_die(sprintf(__('Warning! User cannot be modified. The user %s is a network administrator.'), esc_html($user->user_login)));
 
 								$userfunction = 'all_spam';
-								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details ) {
-									if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
-										update_blog_status( $details->userblog_id, 'spam', '1' );
+								$blogs = get_blogs_of_user($user_id, true);
+								foreach ((array) $blogs as $details) {
+									if ($details->userblog_id != $current_site->blog_id) // main blog not a spam !
+										update_blog_status($details->userblog_id, 'spam', '1');
 								}
-								update_user_status( $user_id, 'spam', '1' );
+								update_user_status($user_id, 'spam', '1');
 							break;
 
 							case 'notspam':
 								$userfunction = 'all_notspam';
-								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details )
-									update_blog_status( $details->userblog_id, 'spam', '0' );
+								$blogs = get_blogs_of_user($user_id, true);
+								foreach ((array) $blogs as $details)
+									update_blog_status($details->userblog_id, 'spam', '0');
 
-								update_user_status( $user_id, 'spam', '0' );
+								update_user_status($user_id, 'spam', '0');
 							break;
 						}
 					}
 				}
 
-				wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
+				wp_safe_redirect(add_query_arg(array('updated' => 'true', 'action' => $userfunction), wp_get_referer()));
 			} else {
-				$location = network_admin_url( 'users.php' );
+				$location = network_admin_url('users.php');
 
-				if ( ! empty( $_REQUEST['paged'] ) )
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
-				wp_redirect( $location );
+				if ( ! empty($_REQUEST['paged']))
+					$location = add_query_arg('paged', (int) $_REQUEST['paged'], $location);
+				wp_redirect($location);
 			}
 			exit();
 
 		case 'dodelete':
-			check_admin_referer( 'ms-users-delete' );
-			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
-
-			if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
-				foreach ( $_POST['blog'] as $id => $users ) {
-					foreach ( $users as $blogid => $user_id ) {
-						if ( ! current_user_can( 'delete_user', $id ) )
+			check_admin_referer('ms-users-delete');
+			if ( ! (current_user_can('manage_network_users') && current_user_can('delete_users')))
+				wp_die(__('Sorry, you are not allowed to access this page.'), 403);
+
+			if ( ! empty($_POST['blog']) && is_array($_POST['blog'])) {
+				foreach ($_POST['blog'] as $id => $users) {
+					foreach ($users as $blogid => $user_id) {
+						if ( ! current_user_can('delete_user', $id))
 							continue;
 
-						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
-							remove_user_from_blog( $id, $blogid, $user_id );
+						if ( ! empty($_POST['delete']) && 'reassign' == $_POST['delete'][$blogid][$id])
+							remove_user_from_blog($id, $blogid, $user_id);
 						else
-							remove_user_from_blog( $id, $blogid );
+							remove_user_from_blog($id, $blogid);
 					}
 				}
 			}
 			$i = 0;
-			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
-				foreach ( $_POST['user'] as $id ) {
-					if ( ! current_user_can( 'delete_user', $id ) )
+			if (is_array($_POST['user']) && ! empty($_POST['user']))
+				foreach ($_POST['user'] as $id) {
+					if ( ! current_user_can('delete_user', $id))
 						continue;
-					wpmu_delete_user( $id );
+					wpmu_delete_user($id);
 					$i++;
 				}
 
-			if ( $i == 1 )
+			if ($i == 1)
 				$deletefunction = 'delete';
 			else
 				$deletefunction = 'all_delete';
 
-			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
+			wp_redirect(add_query_arg(array('updated' => 'true', 'action' => $deletefunction), network_admin_url('users.php')));
 			exit();
 	}
 }
@@ -143,62 +143,62 @@ 
 $wp_list_table = _get_list_table('WP_MS_Users_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 $wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+$total_pages = $wp_list_table->get_pagination_arg('total_pages');
 
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
+if ($pagenum > $total_pages && $total_pages > 0) {
+	wp_redirect(add_query_arg('paged', $total_pages));
 	exit;
 }
-$title = __( 'Users' );
+$title = __('Users');
 $parent_file = 'users.php';
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
-		'<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
-		'<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' .
-		'<p>' . __( 'You can sort the table by clicking on any of the table headings and switch between list and excerpt views by using the icons above the users list.' ) . '</p>' .
-		'<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' .
-		'<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</p>'
-) );
+		'<p>'.__('This table shows all users across the network and the sites to which they are assigned.').'</p>'.
+		'<p>'.__('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.').'</p>'.
+		'<p>'.__('You can also go to the user&#8217;s profile page by clicking on the individual username.').'</p>'.
+		'<p>'.__('You can sort the table by clicking on any of the table headings and switch between list and excerpt views by using the icons above the users list.').'</p>'.
+		'<p>'.__('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.').'</p>'.
+		'<p>'.__('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen" target="_blank">Documentation on Network Users</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter users list' ),
-	'heading_pagination' => __( 'Users list navigation' ),
-	'heading_list'       => __( 'Users list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter users list'),
+	'heading_pagination' => __('Users list navigation'),
+	'heading_list'       => __('Users list'),
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
+if (isset($_REQUEST['updated']) && $_REQUEST['updated'] == 'true' && ! empty($_REQUEST['action'])) {
 	?>
 	<div id="message" class="updated notice is-dismissible"><p>
 		<?php
-		switch ( $_REQUEST['action'] ) {
+		switch ($_REQUEST['action']) {
 			case 'delete':
-				_e( 'User deleted.' );
+				_e('User deleted.');
 			break;
 			case 'all_spam':
-				_e( 'Users marked as spam.' );
+				_e('Users marked as spam.');
 			break;
 			case 'all_notspam':
-				_e( 'Users removed from spam.' );
+				_e('Users removed from spam.');
 			break;
 			case 'all_delete':
-				_e( 'Users deleted.' );
+				_e('Users deleted.');
 			break;
 			case 'add':
-				_e( 'User added.' );
+				_e('User added.');
 			break;
 		}
 		?>
@@ -207,14 +207,14 @@ 
 }
 	?>
 <div class="wrap">
-	<h1><?php esc_html_e( 'Users' );
-	if ( current_user_can( 'create_users') ) : ?>
-		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
+	<h1><?php esc_html_e('Users');
+	if (current_user_can('create_users')) : ?>
+		<a href="<?php echo network_admin_url('user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a><?php
 	endif;
 
-	if ( strlen( $usersearch ) ) {
+	if (strlen($usersearch)) {
 		/* translators: %s: search keywords */
-		printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+		printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($usersearch));
 	}
 	?>
 	</h1>
@@ -222,7 +222,7 @@ 
 	<?php $wp_list_table->views(); ?>
 
 	<form method="get" class="search-form">
-		<?php $wp_list_table->search_box( __( 'Search Users' ), 'all-user' ); ?>
+		<?php $wp_list_table->search_box(__('Search Users'), 'all-user'); ?>
 	</form>
 
 	<form id="form-user-list" action="users.php?action=allusers" method="post">
@@ -230,4 +230,4 @@ 
 	</form>
 </div>
 
-<?php require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require_once(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +44 added lines, -29 removed lines

@@ -10,11 +10,13 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'manage_network_users' ) )
+if ( ! current_user_can( 'manage_network_users' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 if ( isset( $_GET['action'] ) ) {
 	/** This action is documented in wp-admin/network/edit.php */
@@ -22,8 +24,9 @@ 
 
 	switch ( $_GET['action'] ) {
 		case 'deleteuser':
-			if ( ! current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( ! current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			check_admin_referer( 'deleteuser' );
 
@@ -43,8 +46,9 @@ 
 			exit();
 
 		case 'allusers':
-			if ( !current_user_can( 'manage_network_users' ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( !current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
 				check_admin_referer( 'bulk-users-network' );
@@ -56,8 +60,9 @@ 
 					if ( !empty( $user_id ) ) {
 						switch ( $doaction ) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_users' ) )
-									wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+								if ( ! current_user_can( 'delete_users' ) ) {
+																	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+								}
 								$title = __( 'Users' );
 								$parent_file = 'users.php';
 								require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -69,14 +74,17 @@ 
 
 							case 'spam':
 								$user = get_userdata( $user_id );
-								if ( is_super_admin( $user->ID ) )
-									wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								if ( is_super_admin( $user->ID ) ) {
+																	wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								}
 
 								$userfunction = 'all_spam';
 								$blogs = get_blogs_of_user( $user_id, true );
 								foreach ( (array) $blogs as $details ) {
-									if ( $details->userblog_id != $current_site->blog_id ) // main blog not a spam !
+									if ( $details->userblog_id != $current_site->blog_id ) {
+										// main blog not a spam !
 										update_blog_status( $details->userblog_id, 'spam', '1' );
+									}
 								}
 								update_user_status( $user_id, 'spam', '1' );
 							break;
@@ -84,8 +92,9 @@ 
 							case 'notspam':
 								$userfunction = 'all_notspam';
 								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details )
-									update_blog_status( $details->userblog_id, 'spam', '0' );
+								foreach ( (array) $blogs as $details ) {
+																	update_blog_status( $details->userblog_id, 'spam', '0' );
+								}
 
 								update_user_status( $user_id, 'spam', '0' );
 							break;
@@ -97,43 +106,49 @@ 
 			} else {
 				$location = network_admin_url( 'users.php' );
 
-				if ( ! empty( $_REQUEST['paged'] ) )
-					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				if ( ! empty( $_REQUEST['paged'] ) ) {
+									$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				}
 				wp_redirect( $location );
 			}
 			exit();
 
 		case 'dodelete':
 			check_admin_referer( 'ms-users-delete' );
-			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
-				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) ) {
+							wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
 				foreach ( $_POST['blog'] as $id => $users ) {
 					foreach ( $users as $blogid => $user_id ) {
-						if ( ! current_user_can( 'delete_user', $id ) )
-							continue;
+						if ( ! current_user_can( 'delete_user', $id ) ) {
+													continue;
+						}
 
-						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
-							remove_user_from_blog( $id, $blogid, $user_id );
-						else
-							remove_user_from_blog( $id, $blogid );
+						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] ) {
+													remove_user_from_blog( $id, $blogid, $user_id );
+						} else {
+													remove_user_from_blog( $id, $blogid );
+						}
 					}
 				}
 			}
 			$i = 0;
-			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
-				foreach ( $_POST['user'] as $id ) {
+			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) ) {
+							foreach ( $_POST['user'] as $id ) {
 					if ( ! current_user_can( 'delete_user', $id ) )
 						continue;
+			}
 					wpmu_delete_user( $id );
 					$i++;
 				}
 
-			if ( $i == 1 )
-				$deletefunction = 'delete';
-			else
-				$deletefunction = 'all_delete';
+			if ( $i == 1 ) {
+							$deletefunction = 'delete';
+			} else {
+							$deletefunction = 'all_delete';
+			}
 
 			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
 			exit();

src/wp-admin/network/site-new.php

Spacing +90 added lines, -90 removed lines

@@ -8,51 +8,51 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('Sorry, you are not allowed to add sites to this network.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
-		'<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
-) );
+		'<p>'.__('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.').'</p>'.
+		'<p>'.__('If the admin email for the new site does not exist in the database, a new user will also be created.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
+if (isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action']) {
+	check_admin_referer('add-blog', '_wpnonce_add-blog');
 
-	if ( ! is_array( $_POST['blog'] ) )
-		wp_die( __( 'Can&#8217;t create an empty site.' ) );
+	if ( ! is_array($_POST['blog']))
+		wp_die(__('Can&#8217;t create an empty site.'));
 
 	$blog = $_POST['blog'];
 	$domain = '';
-	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
-		$domain = strtolower( $blog['domain'] );
+	if (preg_match('|^([a-zA-Z0-9-])+$|', $blog['domain']))
+		$domain = strtolower($blog['domain']);
 
 	// If not a subdomain install, make sure the domain isn't a reserved word
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 		$subdirectory_reserved_names = get_subdirectory_reserved_names();
 
-		if ( in_array( $domain, $subdirectory_reserved_names ) ) {
+		if (in_array($domain, $subdirectory_reserved_names)) {
 			wp_die(
 				/* translators: %s: reserved names list */
-				sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ),
-					'<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
+				sprintf(__('The following words are reserved for use by WordPress functions and cannot be used as blog names: %s'),
+					'<code>'.implode('</code>, <code>', $subdirectory_reserved_names).'</code>'
 				)
 			);
 		}
@@ -65,36 +65,36 @@ 
 	);
 
 	// Handle translation install for the new site.
-	if ( ! empty( $_POST['WPLANG'] ) && wp_can_install_language_pack() ) {
-		$language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
-		if ( $language ) {
+	if ( ! empty($_POST['WPLANG']) && wp_can_install_language_pack()) {
+		$language = wp_download_language_pack(wp_unslash($_POST['WPLANG']));
+		if ($language) {
 			$meta['WPLANG'] = $language;
 		}
 	}
 
-	if ( empty( $domain ) )
-		wp_die( __( 'Missing or invalid site address.' ) );
+	if (empty($domain))
+		wp_die(__('Missing or invalid site address.'));
 
-	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
-		wp_die( __( 'Missing email address.' ) );
+	if (isset($blog['email']) && '' === trim($blog['email'])) {
+		wp_die(__('Missing email address.'));
 	}
 
-	$email = sanitize_email( $blog['email'] );
-	if ( ! is_email( $email ) ) {
-		wp_die( __( 'Invalid email address.' ) );
+	$email = sanitize_email($blog['email']);
+	if ( ! is_email($email)) {
+		wp_die(__('Invalid email address.'));
 	}
 
-	if ( is_subdomain_install() ) {
-		$newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
+	if (is_subdomain_install()) {
+		$newdomain = $domain.'.'.preg_replace('|^www\.|', '', $current_site->domain);
 		$path      = $current_site->path;
 	} else {
 		$newdomain = $current_site->domain;
-		$path      = $current_site->path . $domain . '/';
+		$path      = $current_site->path.$domain.'/';
 	}
 
 	$password = 'N/A';
 	$user_id = email_exists($email);
-	if ( !$user_id ) { // Create a new user with a random password
+	if ( ! $user_id) { // Create a new user with a random password
 		/**
 		 * Fires immediately before a new user is created via the network site-new.php page.
 		 *
@@ -102,16 +102,16 @@ 
 		 *
 		 * @param string $email Email of the non-existent user.
 		 */
-		do_action( 'pre_network_site_new_created_user', $email );
+		do_action('pre_network_site_new_created_user', $email);
 
-		$user_id = username_exists( $domain );
-		if ( $user_id ) {
-			wp_die( __( 'The domain or path entered conflicts with an existing username.' ) );
+		$user_id = username_exists($domain);
+		if ($user_id) {
+			wp_die(__('The domain or path entered conflicts with an existing username.'));
 		}
-		$password = wp_generate_password( 12, false );
-		$user_id = wpmu_create_user( $domain, $password, $email );
-		if ( false === $user_id ) {
-			wp_die( __( 'There was an error creating the user.' ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user($domain, $password, $email);
+		if (false === $user_id) {
+			wp_die(__('There was an error creating the user.'));
 		}
 
 		/**
@@ -121,129 +121,129 @@ 
 		  *
 		  * @param int $user_id ID of the newly created user.
 		  */
-		do_action( 'network_site_new_created_user', $user_id );
+		do_action('network_site_new_created_user', $user_id);
 	}
 
 	$wpdb->hide_errors();
-	$id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, $current_site->id );
+	$id = wpmu_create_blog($newdomain, $path, $title, $user_id, $meta, $current_site->id);
 	$wpdb->show_errors();
-	if ( ! is_wp_error( $id ) ) {
-		if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
-			update_user_option( $user_id, 'primary_blog', $id, true );
+	if ( ! is_wp_error($id)) {
+		if ( ! is_super_admin($user_id) && ! get_user_option('primary_blog', $user_id)) {
+			update_user_option($user_id, 'primary_blog', $id, true);
 		}
 
 		wp_mail(
-			get_site_option( 'admin_email' ),
+			get_site_option('admin_email'),
 			sprintf(
 				/* translators: %s: network name */
-				__( '[%s] New Site Created' ),
+				__('[%s] New Site Created'),
 				$current_site->site_name
 			),
 			sprintf(
 				/* translators: 1: user login, 2: site url, 3: site name/title */
-				__( 'New site created by %1$s
+				__('New site created by %1$s
 
 Address: %2$s
 Name: %3$s' ),
 				$current_user->user_login,
-				get_site_url( $id ),
-				wp_unslash( $title )
+				get_site_url($id),
+				wp_unslash($title)
 			),
 			sprintf(
 				'From: "%1$s" <%2$s>',
-				_x( 'Site Admin', 'email "From" field' ),
-				get_site_option( 'admin_email' )
+				_x('Site Admin', 'email "From" field'),
+				get_site_option('admin_email')
 			)
 		);
-		wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
-		wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
+		wpmu_welcome_notification($id, $user_id, $password, $title, array('public' => 1));
+		wp_redirect(add_query_arg(array('update' => 'added', 'id' => $id), 'site-new.php'));
 		exit;
 	} else {
-		wp_die( $id->get_error_message() );
+		wp_die($id->get_error_message());
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
+	if ('added' == $_GET['update'])
 		$messages[] = sprintf(
 			/* translators: 1: dashboard url, 2: network admin edit url */
-			__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
-			esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
-			network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
+			__('Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>'),
+			esc_url(get_admin_url(absint($_GET['id']))),
+			network_admin_url('site-info.php?id='.absint($_GET['id']))
 		);
 }
 
 $title = __('Add New Site');
 $parent_file = 'sites.php';
 
-wp_enqueue_script( 'user-suggest' );
+wp_enqueue_script('user-suggest');
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
+<h1 id="add-new-site"><?php _e('Add New Site'); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 } ?>
-<form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
-<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
+<form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>" novalidate="novalidate">
+<?php wp_nonce_field('add-blog', '_wpnonce_add-blog') ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ) ?></label></th>
+			<th scope="row"><label for="site-address"><?php _e('Site Address (URL)') ?></label></th>
 			<td>
-			<?php if ( is_subdomain_install() ) { ?>
-				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
+			<?php if (is_subdomain_install()) { ?>
+				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace('|^www\.|', '', $current_site->domain); ?></span>
 			<?php } else {
-				echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
+				echo $current_site->domain.$current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
 			<?php }
-			echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
+			echo '<p class="description" id="site-address-desc">'.__('Only lowercase letters (a-z), numbers, and hyphens are allowed.').'</p>';
 			?>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
+			<th scope="row"><label for="site-title"><?php _e('Site Title') ?></label></th>
 			<td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
 		</tr>
 		<?php
 		$languages    = get_available_languages();
 		$translations = wp_get_available_translations();
-		if ( ! empty( $languages ) || ! empty( $translations ) ) :
+		if ( ! empty($languages) || ! empty($translations)) :
 			?>
 			<tr class="form-field form-required">
-				<th scope="row"><label for="site-language"><?php _e( 'Site Language' ); ?></label></th>
+				<th scope="row"><label for="site-language"><?php _e('Site Language'); ?></label></th>
 				<td>
 					<?php
 					// Network default.
-					$lang = get_site_option( 'WPLANG' );
+					$lang = get_site_option('WPLANG');
 
 					// Use English if the default isn't available.
-					if ( ! in_array( $lang, $languages ) ) {
+					if ( ! in_array($lang, $languages)) {
 						$lang = '';
 					}
 
-					wp_dropdown_languages( array(
+					wp_dropdown_languages(array(
 						'name'                        => 'WPLANG',
 						'id'                          => 'site-language',
 						'selected'                    => $lang,
 						'languages'                   => $languages,
 						'translations'                => $translations,
 						'show_available_translations' => wp_can_install_language_pack(),
-					) );
+					));
 					?>
 				</td>
 			</tr>
 		<?php endif; // Languages. ?>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>
+			<th scope="row"><label for="admin-email"><?php _e('Admin Email') ?></label></th>
 			<td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
+			<td colspan="2"><?php _e('A new user will be created if the above email address is not in the database.') ?><br /><?php _e('The username and password will be mailed to this email address.') ?></td>
 		</tr>
 	</table>
 
@@ -253,11 +253,11 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	do_action( 'network_site_new_form' );
+	do_action('network_site_new_form');
 
-	submit_button( __( 'Add Site' ), 'primary', 'add-site' );
+	submit_button(__('Add Site'), 'primary', 'add-site');
 	?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/network/site-themes.php

Spacing +83 added lines, -83 removed lines

@@ -8,36 +8,36 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('Sorry, you are not allowed to manage themes for this site.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
-		'<p>' . __('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
-		'<p>' . __('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
-		'<p>' . sprintf( __('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
-		'<p>' . __('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
-) );
+		'<p>'.__('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.').'</p>'.
+		'<p>'.__('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
+		'<p>'.__('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.').'</p>'.
+		'<p>'.sprintf(__('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.'), network_admin_url('themes.php')).'</p>'.
+		'<p>'.__('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter site themes list' ),
-	'heading_pagination' => __( 'Site themes list navigation' ),
-	'heading_list'       => __( 'Site themes list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter site themes list'),
+	'heading_pagination' => __('Site themes list navigation'),
+	'heading_list'       => __('Site themes list'),
+));
 
 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
@@ -46,77 +46,77 @@ 
 $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
-$temp_args = array( 'enabled', 'disabled', 'error' );
-$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( $temp_args, wp_get_referer() );
+$temp_args = array('enabled', 'disabled', 'error');
+$_SERVER['REQUEST_URI'] = remove_query_arg($temp_args, $_SERVER['REQUEST_URI']);
+$referer = remove_query_arg($temp_args, wp_get_referer());
 
-if ( ! empty( $_REQUEST['paged'] ) ) {
-	$referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
+if ( ! empty($_REQUEST['paged'])) {
+	$referer = add_query_arg('paged', (int) $_REQUEST['paged'], $referer);
 }
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id)
+	wp_die(__('Invalid site ID.'));
 
 $wp_list_table->prepare_items();
 
-$details = get_blog_details( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_blog_details($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( !can_edit_network( $details->site_id ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-$is_main_site = is_main_site( $id );
+$is_main_site = is_main_site($id);
 
-if ( $action ) {
-	switch_to_blog( $id );
-	$allowed_themes = get_option( 'allowedthemes' );
+if ($action) {
+	switch_to_blog($id);
+	$allowed_themes = get_option('allowedthemes');
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'enable':
-			check_admin_referer( 'enable-theme_' . $_GET['theme'] );
+			check_admin_referer('enable-theme_'.$_GET['theme']);
 			$theme = $_GET['theme'];
 			$action = 'enabled';
 			$n = 1;
-			if ( !$allowed_themes )
-				$allowed_themes = array( $theme => true );
+			if ( ! $allowed_themes)
+				$allowed_themes = array($theme => true);
 			else
 				$allowed_themes[$theme] = true;
 			break;
 		case 'disable':
-			check_admin_referer( 'disable-theme_' . $_GET['theme'] );
+			check_admin_referer('disable-theme_'.$_GET['theme']);
 			$theme = $_GET['theme'];
 			$action = 'disabled';
 			$n = 1;
-			if ( !$allowed_themes )
+			if ( ! $allowed_themes)
 				$allowed_themes = array();
 			else
-				unset( $allowed_themes[$theme] );
+				unset($allowed_themes[$theme]);
 			break;
 		case 'enable-selected':
-			check_admin_referer( 'bulk-themes' );
-			if ( isset( $_POST['checked'] ) ) {
+			check_admin_referer('bulk-themes');
+			if (isset($_POST['checked'])) {
 				$themes = (array) $_POST['checked'];
 				$action = 'enabled';
-				$n = count( $themes );
-				foreach ( (array) $themes as $theme )
-					$allowed_themes[ $theme ] = true;
+				$n = count($themes);
+				foreach ((array) $themes as $theme)
+					$allowed_themes[$theme] = true;
 			} else {
 				$action = 'error';
 				$n = 'none';
 			}
 			break;
 		case 'disable-selected':
-			check_admin_referer( 'bulk-themes' );
-			if ( isset( $_POST['checked'] ) ) {
+			check_admin_referer('bulk-themes');
+			if (isset($_POST['checked'])) {
 				$themes = (array) $_POST['checked'];
 				$action = 'disabled';
-				$n = count( $themes );
-				foreach ( (array) $themes as $theme )
-					unset( $allowed_themes[ $theme ] );
+				$n = count($themes);
+				foreach ((array) $themes as $theme)
+					unset($allowed_themes[$theme]);
 			} else {
 				$action = 'error';
 				$n = 'none';
@@ -124,73 +124,73 @@ 
 			break;
 	}
 
-	update_option( 'allowedthemes', $allowed_themes );
+	update_option('allowedthemes', $allowed_themes);
 	restore_current_blog();
 
-	wp_safe_redirect( add_query_arg( array( 'id' => $id, $action => $n ), $referer ) );
+	wp_safe_redirect(add_query_arg(array('id' => $id, $action => $n), $referer));
 	exit;
 }
 
-if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
-	wp_safe_redirect( $referer );
+if (isset($_GET['action']) && 'update-site' == $_GET['action']) {
+	wp_safe_redirect($referer);
 	exit();
 }
 
 add_thickbox();
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
+$title = sprintf(__('Edit Site: %s'), esc_html($details->blogname));
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
-<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
+<p class="edit-site-actions"><a href="<?php echo esc_url(get_home_url($id, '/')); ?>"><?php _e('Visit'); ?></a> | <a href="<?php echo esc_url(get_admin_url($id)); ?>"><?php _e('Dashboard'); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
+network_edit_site_nav(array(
 	'blog_id'  => $id,
 	'selected' => 'site-themes'
-) );
+));
 
-if ( isset( $_GET['enabled'] ) ) {
-	$enabled = absint( $_GET['enabled'] );
-	if ( 1 == $enabled ) {
-		$message = __( 'Theme enabled.' );
+if (isset($_GET['enabled'])) {
+	$enabled = absint($_GET['enabled']);
+	if (1 == $enabled) {
+		$message = __('Theme enabled.');
 	} else {
-		$message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+		$message = _n('%s theme enabled.', '%s themes enabled.', $enabled);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
-} elseif ( isset( $_GET['disabled'] ) ) {
-	$disabled = absint( $_GET['disabled'] );
-	if ( 1 == $disabled ) {
-		$message = __( 'Theme disabled.' );
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.sprintf($message, number_format_i18n($enabled)).'</p></div>';
+} elseif (isset($_GET['disabled'])) {
+	$disabled = absint($_GET['disabled']);
+	if (1 == $disabled) {
+		$message = __('Theme disabled.');
 	} else {
-		$message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+		$message = _n('%s theme disabled.', '%s themes disabled.', $disabled);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
-} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
-	echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.sprintf($message, number_format_i18n($disabled)).'</p></div>';
+} elseif (isset($_GET['error']) && 'none' == $_GET['error']) {
+	echo '<div id="message" class="error notice is-dismissible"><p>'.__('No theme selected.').'</p></div>';
 } ?>
 
-<p><?php _e( 'Network enabled themes are not shown on this screen.' ) ?></p>
+<p><?php _e('Network enabled themes are not shown on this screen.') ?></p>
 
 <form method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
-<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+<?php $wp_list_table->search_box(__('Search Installed Themes'), 'theme'); ?>
+<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 </form>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="site-themes.php?action=update-site">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 
 <?php $wp_list_table->display(); ?>
 
 </form>
 
 </div>
-<?php include(ABSPATH . 'wp-admin/admin-footer.php'); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>