ntwb / wordpress

src/wp-admin/media-new.php

Spacing +26 added lines, -26 removed lines

@@ -10,64 +10,64 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if (!current_user_can('upload_files'))
+if ( ! current_user_can('upload_files'))
 	wp_die(__('You do not have permission to upload files.'));
 
 wp_enqueue_script('plupload-handlers');
 
 $post_id = 0;
-if ( isset( $_REQUEST['post_id'] ) ) {
-	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+if (isset($_REQUEST['post_id'])) {
+	$post_id = absint($_REQUEST['post_id']);
+	if ( ! get_post($post_id) || ! current_user_can('edit_post', $post_id))
 		$post_id = 0;
 }
 
-if ( $_POST ) {
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
+if ($_POST) {
+	if (isset($_POST['html-upload']) && ! empty($_FILES)) {
 		check_admin_referer('media-form');
 		// Upload File button was clicked
-		$upload_id = media_handle_upload( 'async-upload', $post_id );
-		if ( is_wp_error( $upload_id ) ) {
-			wp_die( $upload_id );
+		$upload_id = media_handle_upload('async-upload', $post_id);
+		if (is_wp_error($upload_id)) {
+			wp_die($upload_id);
 		}
 	}
-	wp_redirect( admin_url( 'upload.php' ) );
+	wp_redirect(admin_url('upload.php'));
 	exit;
 }
 
 $title = __('Upload New Media');
 $parent_file = 'upload.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-	'<ul>' .
-		'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-		'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-		'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
+	'<p>'.__('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:').'</p>'.
+	'<ul>'.
+		'<li>'.__('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.').'</li>'.
+		'<li>'.__('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.').'</li>'.
+		'<li>'.__('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.').'</li>'.
 	'</ul>'
-) );
+));
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</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/Media_Add_New_Screen" target="_blank">Documentation on Uploading Media Files</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');
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if (get_user_setting('uploader') || isset($_GET['browser-uploader']))
 	$form_class .= ' html-uploader';
 ?>
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 
-	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr($form_class); ?>" id="file-form">
 
 	<?php media_upload_form(); ?>
 
@@ -81,4 +81,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +8 added lines, -5 removed lines

@@ -12,17 +12,19 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if (!current_user_can('upload_files'))
+if (!current_user_can('upload_files')) {
 	wp_die(__('You do not have permission to upload files.'));
+}
 
 wp_enqueue_script('plupload-handlers');
 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
-		$post_id = 0;
-}
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			$post_id = 0;
+	}
+	}
 
 if ( $_POST ) {
 	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
@@ -61,8 +63,9 @@ 
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) ) {
 	$form_class .= ' html-uploader';
+}
 ?>
 <div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>

src/wp-admin/post.php

Indentation +9 added lines, -9 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * Edit post administration panel.
- *
- * Manage Post actions: post, edit, delete, etc.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Edit post administration panel.
+	 *
+	 * Manage Post actions: post, edit, delete, etc.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -45,8 +45,8 @@ 
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-     strpos( $sendback, 'post.php' ) !== false ||
-     strpos( $sendback, 'post-new.php' ) !== false ) {
+	 strpos( $sendback, 'post.php' ) !== false ||
+	 strpos( $sendback, 'post-new.php' ) !== false ) {
 	if ( 'attachment' == $post_type ) {
 		$sendback = admin_url( 'upload.php' );
 	} else {

Spacing +107 added lines, -107 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit.php';
 $submenu_file = 'edit.php';
 
-wp_reset_vars( array( 'action' ) );
+wp_reset_vars(array('action'));
 
-if ( isset( $_GET['post'] ) )
+if (isset($_GET['post']))
  	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
+elseif (isset($_POST['post_ID']))
  	$post_id = $post_ID = (int) $_POST['post_ID'];
 else
  	$post_id = $post_ID = 0;
@@ -30,59 +30,59 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
-	$post = get_post( $post_id );
+if ($post_id)
+	$post = get_post($post_id);
 
-if ( $post ) {
+if ($post) {
 	$post_type = $post->post_type;
-	$post_type_object = get_post_type_object( $post_type );
+	$post_type_object = get_post_type_object($post_type);
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if (isset($_POST['deletepost']))
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+elseif (isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'])
 	$action = 'preview';
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-     strpos( $sendback, 'post.php' ) !== false ||
-     strpos( $sendback, 'post-new.php' ) !== false ) {
-	if ( 'attachment' == $post_type ) {
-		$sendback = admin_url( 'upload.php' );
+     strpos($sendback, 'post.php') !== false ||
+     strpos($sendback, 'post-new.php') !== false) {
+	if ('attachment' == $post_type) {
+		$sendback = admin_url('upload.php');
 	} else {
-		$sendback = admin_url( 'edit.php' );
-		if ( ! empty( $post_type ) ) {
-			$sendback = add_query_arg( 'post_type', $post_type, $sendback );
+		$sendback = admin_url('edit.php');
+		if ( ! empty($post_type)) {
+			$sendback = add_query_arg('post_type', $post_type, $sendback);
 		}
 	}
 } else {
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+	$sendback = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'ids'), $sendback);
 }
 
-switch($action) {
+switch ($action) {
 case 'post-quickdraft-save':
 	// Check nonce and capabilities
 	$nonce = $_REQUEST['_wpnonce'];
 	$error_msg = false;
 
 	// For output of the quickdraft dashboard widget
-	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+	require_once ABSPATH.'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	if ( ! wp_verify_nonce($nonce, 'add-post'))
+		$error_msg = __('Unable to submit this form, please refresh and try again.');
 
-	if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+	if ( ! current_user_can(get_post_type_object('post')->cap->create_posts)) {
 		exit;
 	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
+	if ($error_msg)
+		return wp_dashboard_quick_press($error_msg);
 
-	$post = get_post( $_REQUEST['post_ID'] );
-	check_admin_referer( 'add-' . $post->post_type );
+	$post = get_post($_REQUEST['post_ID']);
+	check_admin_referer('add-'.$post->post_type);
 
-	$_POST['comment_status'] = get_default_comment_status( $post->post_type );
-	$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+	$_POST['comment_status'] = get_default_comment_status($post->post_type);
+	$_POST['ping_status']    = get_default_comment_status($post->post_type, 'pingback');
 
 	edit_post();
 	wp_dashboard_quick_press();
@@ -90,53 +90,53 @@ 
 
 case 'postajaxpost':
 case 'post':
-	check_admin_referer( 'add-' . $post_type );
+	check_admin_referer('add-'.$post_type);
 	$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
-	redirect_post( $post_id );
+	redirect_post($post_id);
 	exit();
 
 case 'edit':
 	$editing = true;
 
-	if ( empty( $post_id ) ) {
-		wp_redirect( admin_url('post.php') );
+	if (empty($post_id)) {
+		wp_redirect(admin_url('post.php'));
 		exit();
 	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $post)
+		wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
-		wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
+	if ( ! in_array($typenow, get_post_types(array('show_ui' => true)))) {
+		wp_die(__('You are not allowed to edit posts in this post type.'));
 	}
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post_id))
+		wp_die(__('You are not allowed to edit this item.'));
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	if ('trash' == $post->post_status)
+		wp_die(__('You can’t edit this item because it is in the Trash. Please restore it and try again.'));
 
-	if ( ! empty( $_GET['get-post-lock'] ) ) {
-		check_admin_referer( 'lock-post_' . $post_id );
-		wp_set_post_lock( $post_id );
-		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+	if ( ! empty($_GET['get-post-lock'])) {
+		check_admin_referer('lock-post_'.$post_id);
+		wp_set_post_lock($post_id);
+		wp_redirect(get_edit_post_link($post_id, 'url'));
 		exit();
 	}
 
 	$post_type = $post->post_type;
-	if ( 'post' == $post_type ) {
+	if ('post' == $post_type) {
 		$parent_file = "edit.php";
 		$submenu_file = "edit.php";
 		$post_new_file = "post-new.php";
-	} elseif ( 'attachment' == $post_type ) {
+	} elseif ('attachment' == $post_type) {
 		$parent_file = 'upload.php';
 		$submenu_file = 'upload.php';
 		$post_new_file = 'media-new.php';
 	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+		if (isset($post_type_object) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true)
 			$parent_file = $post_type_object->show_in_menu;
 		else
 			$parent_file = "edit.php?post_type=$post_type";
@@ -144,57 +144,57 @@ 
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
 
-	if ( ! wp_check_post_lock( $post->ID ) ) {
-		$active_post_lock = wp_set_post_lock( $post->ID );
+	if ( ! wp_check_post_lock($post->ID)) {
+		$active_post_lock = wp_set_post_lock($post->ID);
 
-		if ( 'attachment' !== $post_type )
+		if ('attachment' !== $post_type)
 			wp_enqueue_script('autosave');
 	}
 
-	if ( is_multisite() ) {
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (is_multisite()) {
+		add_action('admin_footer', '_admin_notice_post_locked');
 	} else {
-		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+		$check_users = get_users(array('fields' => 'ID', 'number' => 2));
 
-		if ( count( $check_users ) > 1 )
-			add_action( 'admin_footer', '_admin_notice_post_locked' );
+		if (count($check_users) > 1)
+			add_action('admin_footer', '_admin_notice_post_locked');
 
-		unset( $check_users );
+		unset($check_users);
 	}
 
 	$title = $post_type_object->labels->edit_item;
 	$post = get_post($post_id, OBJECT, 'edit');
 
-	if ( post_type_supports($post_type, 'comments') ) {
+	if (post_type_supports($post_type, 'comments')) {
 		wp_enqueue_script('admin-comments');
 		enqueue_comment_hotkeys_js();
 	}
 
-	include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+	include(ABSPATH.'wp-admin/edit-form-advanced.php');
 
 	break;
 
 case 'editattachment':
-	check_admin_referer('update-post_' . $post_id);
+	check_admin_referer('update-post_'.$post_id);
 
 	// Don't let these be changed
 	unset($_POST['guid']);
 	$_POST['post_type'] = 'attachment';
 
 	// Update the thumbnail filename
-	$newmeta = wp_get_attachment_metadata( $post_id, true );
+	$newmeta = wp_get_attachment_metadata($post_id, true);
 	$newmeta['thumb'] = $_POST['thumb'];
 
-	wp_update_attachment_metadata( $post_id, $newmeta );
+	wp_update_attachment_metadata($post_id, $newmeta);
 
 case 'editpost':
-	check_admin_referer('update-post_' . $post_id);
+	check_admin_referer('update-post_'.$post_id);
 
 	$post_id = edit_post();
 
 	// Session cookie flag that the post was saved
-	if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-		setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
+	if (isset($_COOKIE['wp-saving-post']) && $_COOKIE['wp-saving-post'] === $post_id.'-check') {
+		setcookie('wp-saving-post', $post_id.'-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl());
 	}
 
 	redirect_post($post_id); // Send user on their way while we keep working
@@ -202,72 +202,72 @@ 
 	exit();
 
 case 'trash':
-	check_admin_referer('trash-post_' . $post_id);
+	check_admin_referer('trash-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	if ( ! $post)
+		wp_die(__('The item you are trying to move to the Trash no longer exists.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('You are not allowed to move this item to the Trash.'));
 
-	if ( $user_id = wp_check_post_lock( $post_id ) ) {
-		$user = get_userdata( $user_id );
-		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+	if ($user_id = wp_check_post_lock($post_id)) {
+		$user = get_userdata($user_id);
+		wp_die(sprintf(__('You cannot move this item to the Trash. %s is currently editing.'), $user->display_name));
 	}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+	if ( ! wp_trash_post($post_id))
+		wp_die(__('Error in moving to Trash.'));
 
-	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
+	wp_redirect(add_query_arg(array('trashed' => 1, 'ids' => $post_id), $sendback));
 	exit();
 
 case 'untrash':
-	check_admin_referer('untrash-post_' . $post_id);
+	check_admin_referer('untrash-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	if ( ! $post)
+		wp_die(__('The item you are trying to restore from the Trash no longer exists.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('You are not allowed to restore this item from the Trash.'));
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+	if ( ! wp_untrash_post($post_id))
+		wp_die(__('Error in restoring from Trash.'));
 
-	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+	wp_redirect(add_query_arg('untrashed', 1, $sendback));
 	exit();
 
 case 'delete':
-	check_admin_referer('delete-post_' . $post_id);
+	check_admin_referer('delete-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+	if ( ! $post)
+		wp_die(__('This item has already been deleted.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to delete this item.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('You are not allowed to delete this item.'));
 
-	if ( $post->post_type == 'attachment' ) {
-		$force = ( ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+	if ($post->post_type == 'attachment') {
+		$force = ( ! MEDIA_TRASH);
+		if ( ! wp_delete_attachment($post_id, $force))
+			wp_die(__('Error in deleting.'));
 	} else {
-		if ( ! wp_delete_post( $post_id, true ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_post($post_id, true))
+			wp_die(__('Error in deleting.'));
 	}
 
-	wp_redirect( add_query_arg('deleted', 1, $sendback) );
+	wp_redirect(add_query_arg('deleted', 1, $sendback));
 	exit();
 
 case 'preview':
-	check_admin_referer( 'update-post_' . $post_id );
+	check_admin_referer('update-post_'.$post_id);
 
 	$url = post_preview();
 
@@ -275,7 +275,7 @@ 
 	exit();
 
 default:
-	wp_redirect( admin_url('edit.php') );
+	wp_redirect(admin_url('edit.php'));
 	exit();
 } // end switch
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +77 added lines, -52 removed lines

@@ -16,12 +16,13 @@ 
 
 wp_reset_vars( array( 'action' ) );
 
-if ( isset( $_GET['post'] ) )
+if ( isset( $_GET['post'] ) ) {
  	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
+} elseif ( isset( $_POST['post_ID'] ) ) {
  	$post_id = $post_ID = (int) $_POST['post_ID'];
-else
+} else {
  	$post_id = $post_ID = 0;
+}
 
 /**
  * @global string  $post_type
@@ -30,18 +31,20 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
+if ( $post_id ) {
 	$post = get_post( $post_id );
+}
 
 if ( $post ) {
 	$post_type = $post->post_type;
 	$post_type_object = get_post_type_object( $post_type );
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if ( isset( $_POST['deletepost'] ) ) {
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+} elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] ) {
 	$action = 'preview';
+}
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
@@ -68,15 +71,17 @@ 
 	// For output of the quickdraft dashboard widget
 	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
+			$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	}
 
 	if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
 		exit;
 	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
+	if ( $error_msg ) {
+			return wp_dashboard_quick_press( $error_msg );
+	}
 
 	$post = get_post( $_REQUEST['post_ID'] );
 	check_admin_referer( 'add-' . $post->post_type );
@@ -103,21 +108,25 @@ 
 		exit();
 	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $post ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
 	if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
 		wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
 	}
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to edit this item.' ) );
+	}
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	if ( 'trash' == $post->post_status ) {
+			wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	}
 
 	if ( ! empty( $_GET['get-post-lock'] ) ) {
 		check_admin_referer( 'lock-post_' . $post_id );
@@ -136,10 +145,11 @@ 
 		$submenu_file = 'upload.php';
 		$post_new_file = 'media-new.php';
 	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
-			$parent_file = $post_type_object->show_in_menu;
-		else
-			$parent_file = "edit.php?post_type=$post_type";
+		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+					$parent_file = $post_type_object->show_in_menu;
+		} else {
+					$parent_file = "edit.php?post_type=$post_type";
+		}
 		$submenu_file = "edit.php?post_type=$post_type";
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
@@ -147,8 +157,9 @@ 
 	if ( ! wp_check_post_lock( $post->ID ) ) {
 		$active_post_lock = wp_set_post_lock( $post->ID );
 
-		if ( 'attachment' !== $post_type )
-			wp_enqueue_script('autosave');
+		if ( 'attachment' !== $post_type ) {
+					wp_enqueue_script('autosave');
+		}
 	}
 
 	if ( is_multisite() ) {
@@ -156,8 +167,9 @@ 
 	} else {
 		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-		if ( count( $check_users ) > 1 )
-			add_action( 'admin_footer', '_admin_notice_post_locked' );
+		if ( count( $check_users ) > 1 ) {
+					add_action( 'admin_footer', '_admin_notice_post_locked' );
+		}
 
 		unset( $check_users );
 	}
@@ -204,22 +216,26 @@ 
 case 'trash':
 	check_admin_referer('trash-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+	}
 
 	if ( $user_id = wp_check_post_lock( $post_id ) ) {
 		$user = get_userdata( $user_id );
 		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
 	}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+	if ( ! wp_trash_post( $post_id ) ) {
+			wp_die( __( 'Error in moving to Trash.' ) );
+	}
 
 	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
 	exit();
@@ -227,17 +243,21 @@ 
 case 'untrash':
 	check_admin_referer('untrash-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
+	}
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+	if ( ! wp_untrash_post( $post_id ) ) {
+			wp_die( __( 'Error in restoring from Trash.' ) );
+	}
 
 	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
 	exit();
@@ -245,22 +265,27 @@ 
 case 'delete':
 	check_admin_referer('delete-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'This item has already been deleted.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to delete this item.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to delete this item.' ) );
+	}
 
 	if ( $post->post_type == 'attachment' ) {
 		$force = ( ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_attachment( $post_id, $force ) ) {
+					wp_die( __( 'Error in deleting.' ) );
+		}
 	} else {
-		if ( ! wp_delete_post( $post_id, true ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_post( $post_id, true ) ) {
+					wp_die( __( 'Error in deleting.' ) );
+		}
 	}
 
 	wp_redirect( add_query_arg('deleted', 1, $sendback) );

src/wp-admin/about.php

Indentation +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * About This Version administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * About This Version administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -160,7 +160,7 @@ 
 							'<a href="https://developer.wordpress.org/reference/functions/add_term_meta"><code>add_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/get_term_meta"><code>get_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/update_term_meta"><code>update_term_meta()</code></a>'
-				         );
+						 );
 					?></p>
 				</div>
 				<div class="col">
@@ -217,15 +217,15 @@ 
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
 _n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
 
 /* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );

Spacing +65 added lines, -65 removed lines

@@ -7,64 +7,64 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_enqueue_style( 'wp-mediaelement' );
-wp_enqueue_script( 'wp-mediaelement' );
-wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
-	'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+wp_enqueue_style('wp-mediaelement');
+wp_enqueue_script('wp-mediaelement');
+wp_localize_script('mediaelement', '_wpmejsSettings', array(
+	'pluginPath' => includes_url('js/mediaelement/', 'relative'),
 	'pauseOtherPlayers' => ''
-) );
+));
 
-if ( current_user_can( 'install_plugins' ) ) {
+if (current_user_can('install_plugins')) {
 	add_thickbox();
-	wp_enqueue_script( 'plugin-install' );
+	wp_enqueue_script('plugin-install');
 }
 
 $video_url = 'https://videopress.com/embed/J44FHXvg?hd=true';
-$locale    = str_replace( '_', '-', get_locale() );
-list( $locale ) = explode( '-', $locale );
-if ( 'en' !== $locale ) {
-	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+$locale    = str_replace('_', '-', get_locale());
+list($locale) = explode('-', $locale);
+if ('en' !== $locale) {
+	$video_url = add_query_arg('defaultLangCode', $locale, $video_url);
 }
 
 wp_oembed_add_host_js();
 
-$title = __( 'About' );
+$title = __('About');
 
-list( $display_version ) = explode( '-', $wp_version );
+list($display_version) = explode('-', $wp_version);
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 	<div class="wrap about-wrap">
-		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
+		<h1><?php printf(__('Welcome to WordPress&nbsp;%s'), $display_version); ?></h1>
 
-		<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
-		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+		<div class="about-text"><?php printf(__('Thank you for updating! WordPress %s makes your site more connected and responsive.'), $display_version); ?></div>
+		<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
-			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="about.php" class="nav-tab nav-tab-active"><?php _e('What&#8217;s New'); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e('Credits'); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 		</h2>
 
 		<div class="headline-feature feature-video">
-			<iframe width="1050" height="591" src="<?php echo esc_url( $video_url ); ?>" frameborder="0" allowfullscreen></iframe>
+			<iframe width="1050" height="591" src="<?php echo esc_url($video_url); ?>" frameborder="0" allowfullscreen></iframe>
 			<script src="https://videopress.com/videopress-iframe.js"></script>
 		</div>
 
 		<hr>
 
 		<div class="headline-feature feature-section one-col">
-			<h2><?php _e( 'Twenty Sixteen' ); ?></h2>
+			<h2><?php _e('Twenty Sixteen'); ?></h2>
 			<div class="media-container">
 				<img src="https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-2x.png 536w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-1x.png 840w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-1x.png 1086w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-2x.png 1680w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png 2172w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .8), (max-width: 1290px) calc((100vw - 240px) * .8), 840px" />
 			</div>
 			<div class="two-col">
 				<div class="col">
-					<h3><?php _e( 'Introducing Twenty Sixteen' ); ?></h3>
-					<p><?php _e( 'Our newest default theme, Twenty Sixteen, is a modern take on a classic blog design.' ); ?></p>
-					<p><?php _e( 'Twenty Sixteen was built to look great on any device. A fluid grid design, flexible header, fun color schemes, and more, will make your content shine.' ); ?></p>
+					<h3><?php _e('Introducing Twenty Sixteen'); ?></h3>
+					<p><?php _e('Our newest default theme, Twenty Sixteen, is a modern take on a classic blog design.'); ?></p>
+					<p><?php _e('Twenty Sixteen was built to look great on any device. A fluid grid design, flexible header, fun color schemes, and more, will make your content shine.'); ?></p>
 					<div class="horizontal-image">
 						<div class="content">
 							<img class="feature-image horizontal-screen" src="https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png" alt=""  srcset="https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-2x.png 535w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-1x.png 783w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png 1566w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .5216), (max-width: 1290px) calc((100vw - 240px) * .5216), 548px" />
@@ -86,8 +86,8 @@ 
 				</div>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Responsive images' ); ?></h3>
-				<p><?php _e( 'WordPress now takes a smarter approach to displaying appropriate image sizes on any device, ensuring a perfect fit every time. You don&#8217;t need to do anything to your theme, it just works.' ); ?></p>
+				<h3><?php _e('Responsive images'); ?></h3>
+				<p><?php _e('WordPress now takes a smarter approach to displaying appropriate image sizes on any device, ensuring a perfect fit every time. You don&#8217;t need to do anything to your theme, it just works.'); ?></p>
 			</div>
 		</div>
 
@@ -96,12 +96,12 @@ 
 		<div class="feature-section two-col">
 			<div class="col">
 				<div class="embed-container">
-					<blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://wordpress.org/news/2015/12/clifford/">WordPress 4.4 &ldquo;Clifford&rdquo;</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://wordpress.org/news/2015/12/clifford/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="<?php esc_attr_e( 'Embedded WordPress Post' ); ?>" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
+					<blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://wordpress.org/news/2015/12/clifford/">WordPress 4.4 &ldquo;Clifford&rdquo;</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://wordpress.org/news/2015/12/clifford/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="<?php esc_attr_e('Embedded WordPress Post'); ?>" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
 				</div>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Embed your WordPress content' ); ?></h3>
-				<p><?php _e( 'Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.' ); ?></p>
+				<h3><?php _e('Embed your WordPress content'); ?></h3>
+				<p><?php _e('Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.'); ?></p>
 			</div>
 		</div>
 
@@ -114,23 +114,23 @@ 
 				</div>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Even more embed providers' ); ?></h3>
-				<p><?php _e( 'In addition to post embeds, WordPress 4.4 also adds support for five new oEmbed providers: Cloudup, Reddit&nbsp;Comments, ReverbNation, Speaker&nbsp;Deck, and VideoPress.' ); ?></p>
+				<h3><?php _e('Even more embed providers'); ?></h3>
+				<p><?php _e('In addition to post embeds, WordPress 4.4 also adds support for five new oEmbed providers: Cloudup, Reddit&nbsp;Comments, ReverbNation, Speaker&nbsp;Deck, and VideoPress.'); ?></p>
 			</div>
 		</div>
 
 		<hr />
 
 		<div class="changelog">
-			<h3><?php _e( 'Under the Hood' ); ?></h3>
+			<h3><?php _e('Under the Hood'); ?></h3>
 
 			<div class="feature-section under-the-hood one-col">
 				<div class="col">
-					<h4><?php _e( 'REST API infrastructure' ); ?></h4>
+					<h4><?php _e('REST API infrastructure'); ?></h4>
 					<div class="two-col-text">
-						<p><?php _e( 'Infrastructure for the REST API has been integrated into core, marking a new era in developing with WordPress. The REST API serves to provide developers with a path forward for building and extending RESTful APIs on top of WordPress.' ); ?></p>
+						<p><?php _e('Infrastructure for the REST API has been integrated into core, marking a new era in developing with WordPress. The REST API serves to provide developers with a path forward for building and extending RESTful APIs on top of WordPress.'); ?></p>
 						<p><?php
-							if ( current_user_can( 'install_plugins' ) ) {
+							if (current_user_can('install_plugins')) {
 								$url_args = array(
 									'tab'       => 'plugin-information',
 									'plugin'    => 'rest-api',
@@ -139,13 +139,13 @@ 
 									'height'    => 550
 								);
 
-								$plugin_link = '<a href="' . esc_url( add_query_arg( $url_args, network_admin_url( 'plugin-install.php' ) ) ) . '" class="thickbox open-plugin-details-modal">WordPress REST API</a>';
+								$plugin_link = '<a href="'.esc_url(add_query_arg($url_args, network_admin_url('plugin-install.php'))).'" class="thickbox open-plugin-details-modal">WordPress REST API</a>';
 							} else {
 								$plugin_link = '<a href="https://wordpress.org/plugins/rest-api">WordPress REST API</a>';
 							}
 
 							/* translators: WordPress REST API plugin link */
-							printf( __( 'Infrastructure is the first part of a multi-stage rollout for the REST API. Inclusion of core endpoints is targeted for an upcoming release. To get a sneak peek of the core endpoints, and for more information on extending the REST API, check out the official %s plugin.' ), $plugin_link );
+							printf(__('Infrastructure is the first part of a multi-stage rollout for the REST API. Inclusion of core endpoints is targeted for an upcoming release. To get a sneak peek of the core endpoints, and for more information on extending the REST API, check out the official %s plugin.'), $plugin_link);
 						?></p>
 					</div>
 				</div>
@@ -153,10 +153,10 @@ 
 
 			<div class="feature-section under-the-hood three-col">
 				<div class="col">
-					<h4><?php _e( 'Term meta' ); ?></h4>
+					<h4><?php _e('Term meta'); ?></h4>
 					<p><?php
 						/* translators: 1: add_term_meta() docs link, 2: get_term_meta() docs link, 3: update_term_meta() docs link */
-						printf( __( 'Terms now support metadata, just like posts. See %1$s, %2$s, and %3$s for more information.' ),
+						printf(__('Terms now support metadata, just like posts. See %1$s, %2$s, and %3$s for more information.'),
 							'<a href="https://developer.wordpress.org/reference/functions/add_term_meta"><code>add_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/get_term_meta"><code>get_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/update_term_meta"><code>update_term_meta()</code></a>'
@@ -164,17 +164,17 @@ 
 					?></p>
 				</div>
 				<div class="col">
-					<h4><?php _e( 'Comment query improvements' ); ?></h4>
+					<h4><?php _e('Comment query improvements'); ?></h4>
 					<p><?php
 						/* translators: WP_Comment_Query class name */
-						printf( __( 'Comment queries now have cache handling to improve performance. New arguments in %s make crafting robust comment queries simpler.' ), '<code>WP_Comment_Query</code>' );
+						printf(__('Comment queries now have cache handling to improve performance. New arguments in %s make crafting robust comment queries simpler.'), '<code>WP_Comment_Query</code>');
 					?></p>
 				</div>
 				<div class="col">
-					<h4><?php _e( 'Term, comment, and network objects' ); ?></h4>
+					<h4><?php _e('Term, comment, and network objects'); ?></h4>
 					<p><?php
 						/* translators: 1: WP_Term class name, WP_Comment class name, WP_Network class name */
-						printf( __( 'New %1$s, %2$s, and %3$s objects make interacting with terms, comments, and networks more predictable and intuitive in code.' ),
+						printf(__('New %1$s, %2$s, and %3$s objects make interacting with terms, comments, and networks more predictable and intuitive in code.'),
 							'<code>WP_Term</code>',
 							'<code>WP_Comment</code>',
 							'<code>WP_Network</code>'
@@ -184,48 +184,48 @@ 
 			</div>
 
 			<div class="return-to-dashboard">
-				<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-					<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-						<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
+				<?php if (current_user_can('update_core') && isset($_GET['updated'])) : ?>
+					<a href="<?php echo esc_url(self_admin_url('update-core.php')); ?>">
+						<?php is_multisite() ? _e('Return to Updates') : _e('Return to Dashboard &rarr; Updates'); ?>
 					</a> |
 				<?php endif; ?>
-				<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
+				<a href="<?php echo esc_url(self_admin_url()); ?>"><?php is_blog_admin() ? _e('Go to Dashboard &rarr; Home') : _e('Go to Dashboard'); ?></a>
 			</div>
 
 		</div>
 	</div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
 return;
 
-__( 'Maintenance Release' );
-__( 'Maintenance Releases' );
+__('Maintenance Release');
+__('Maintenance Releases');
 
-__( 'Security Release' );
-__( 'Security Releases' );
+__('Security Release');
+__('Security Releases');
 
-__( 'Maintenance and Security Release' );
-__( 'Maintenance and Security Releases' );
+__('Maintenance and Security Release');
+__('Maintenance and Security Releases');
 
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed one security issue.' );
+__('<strong>Version %s</strong> addressed one security issue.');
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed some security issues.' );
+__('<strong>Version %s</strong> addressed some security issues.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.');
 
 /* translators: %s: Codex URL */
-__( 'For more information, see <a href="%s">the release notes</a>.' );
+__('For more information, see <a href="%s">the release notes</a>.');

src/wp-admin/network/themes.php

Spacing +137 added lines, -137 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( __( 'You do not have sufficient permissions to manage network themes.' ) );
+if ( ! current_user_can('manage_network_themes'))
+	wp_die(__('You do not have sufficient permissions to manage network themes.'));
 
 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -24,183 +24,183 @@ 
 $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 ) {
-	$allowed_themes = get_site_option( 'allowedthemes' );
-	switch ( $action ) {
+if ($action) {
+	$allowed_themes = get_site_option('allowedthemes');
+	switch ($action) {
 		case 'enable':
-			check_admin_referer('enable-theme_' . $_GET['theme']);
-			$allowed_themes[ $_GET['theme'] ] = true;
-			update_site_option( 'allowedthemes', $allowed_themes );
-			if ( false === strpos( $referer, '/network/themes.php' ) )
-				wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
+			check_admin_referer('enable-theme_'.$_GET['theme']);
+			$allowed_themes[$_GET['theme']] = true;
+			update_site_option('allowedthemes', $allowed_themes);
+			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']);
-			unset( $allowed_themes[ $_GET['theme'] ] );
-			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
+			check_admin_referer('disable-theme_'.$_GET['theme']);
+			unset($allowed_themes[$_GET['theme']]);
+			update_site_option('allowedthemes', $allowed_themes);
+			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;
 			}
-			foreach ( (array) $themes as $theme )
-				$allowed_themes[ $theme ] = true;
-			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
+			foreach ((array) $themes as $theme)
+				$allowed_themes[$theme] = true;
+			update_site_option('allowedthemes', $allowed_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;
 			}
-			foreach ( (array) $themes as $theme )
-				unset( $allowed_themes[ $theme ] );
-			update_site_option( 'allowedthemes', $allowed_themes );
-			wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
+			foreach ((array) $themes as $theme)
+				unset($allowed_themes[$theme]);
+			update_site_option('allowedthemes', $allowed_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( __('You do not have sufficient permissions to delete themes for this site.') );
+			if ( ! current_user_can('delete_themes')) {
+				wp_die(__('You do not have sufficient permissions 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;
 	}
 }
@@ -209,89 +209,89 @@ 
 
 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( 'theme-preview' );
+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 method="post">
@@ -304,4 +304,4 @@ 
 </div>
 
 <?php
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +34 added lines, -21 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_themes') )
+if ( !current_user_can('manage_network_themes') ) {
 	wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -35,10 +37,11 @@ 
 			check_admin_referer('enable-theme_' . $_GET['theme']);
 			$allowed_themes[ $_GET['theme'] ] = true;
 			update_site_option( 'allowedthemes', $allowed_themes );
-			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 ) );
+			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 ) );
+			}
 			exit;
 		case 'disable':
 			check_admin_referer('disable-theme_' . $_GET['theme']);
@@ -53,8 +56,9 @@ 
 				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
-			foreach ( (array) $themes as $theme )
-				$allowed_themes[ $theme ] = true;
+			foreach ( (array) $themes as $theme ) {
+							$allowed_themes[ $theme ] = true;
+			}
 			update_site_option( 'allowedthemes', $allowed_themes );
 			wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
 			exit;
@@ -65,20 +69,22 @@ 
 				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
-			foreach ( (array) $themes as $theme )
-				unset( $allowed_themes[ $theme ] );
+			foreach ( (array) $themes as $theme ) {
+							unset( $allowed_themes[ $theme ] );
+			}
 			update_site_option( 'allowedthemes', $allowed_themes );
 			wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
 			exit;
 		case 'update-selected' :
 			check_admin_referer( 'bulk-themes' );
 
-			if ( isset( $_GET['themes'] ) )
-				$themes = explode( ',', $_GET['themes'] );
-			elseif ( isset( $_POST['checked'] ) )
-				$themes = (array) $_POST['checked'];
-			else
-				$themes = array();
+			if ( isset( $_GET['themes'] ) ) {
+							$themes = explode( ',', $_GET['themes'] );
+			} elseif ( isset( $_POST['checked'] ) ) {
+							$themes = (array) $_POST['checked'];
+			} else {
+							$themes = array();
+			}
 
 			$title = __( 'Update Themes' );
 			$parent_file = 'themes.php';
@@ -135,8 +141,11 @@ 
 					<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>
+				<?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>
 				<?php endif; ?>
@@ -154,8 +163,11 @@ 
 					</ul>
 				<?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>
+				<?php else {
+	: ?>
+					<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" />
@@ -290,8 +302,9 @@ 
 <?php
 $wp_list_table->views();
 
-if ( 'broken' == $status )
+if ( 'broken' == $status ) {
 	echo '<p class="clear">' . __( 'The following themes are installed but incomplete.' ) . '</p>';
+}
 ?>
 
 <form method="post">

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

Spacing +88 added lines, -88 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( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('You do not have sufficient permissions 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( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id))
+	wp_die(__('You do not have permission 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,81 +124,81 @@ 
 			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>
 <h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
 <?php
 $tabs = array(
-	'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
-	'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php'    ),
-	'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php'   ),
-	'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
+	'site-info'     => array('label' => __('Info'), 'url' => 'site-info.php'),
+	'site-users'    => array('label' => __('Users'), 'url' => 'site-users.php'),
+	'site-themes'   => array('label' => __('Themes'), 'url' => 'site-themes.php'),
+	'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php'),
 );
-foreach ( $tabs as $tab_id => $tab ) {
-	$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
-	echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
+foreach ($tabs as $tab_id => $tab) {
+	$class = ($tab['url'] == $pagenow) ? ' nav-tab-active' : '';
+	echo '<a href="'.$tab['url'].'?id='.$id.'" class="nav-tab'.$class.'">'.esc_html($tab['label']).'</a>';
 }
 ?>
 </h2><?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['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'); ?>

Braces +24 added lines, -16 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( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -56,8 +58,9 @@ 
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-if ( ! $id )
+if ( ! $id ) {
 	wp_die( __('Invalid site ID.') );
+}
 
 $wp_list_table->prepare_items();
 
@@ -66,8 +69,9 @@ 
 	wp_die( __( 'The requested site does not exist.' ) );
 }
 
-if ( !can_edit_network( $details->site_id ) )
+if ( !can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'You do not have permission to access this page.' ), 403 );
+}
 
 $is_main_site = is_main_site( $id );
 
@@ -81,20 +85,22 @@ 
 			$theme = $_GET['theme'];
 			$action = 'enabled';
 			$n = 1;
-			if ( !$allowed_themes )
-				$allowed_themes = array( $theme => true );
-			else
-				$allowed_themes[$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'] );
 			$theme = $_GET['theme'];
 			$action = 'disabled';
 			$n = 1;
-			if ( !$allowed_themes )
-				$allowed_themes = array();
-			else
-				unset( $allowed_themes[$theme] );
+			if ( !$allowed_themes ) {
+							$allowed_themes = array();
+			} else {
+							unset( $allowed_themes[$theme] );
+			}
 			break;
 		case 'enable-selected':
 			check_admin_referer( 'bulk-themes' );
@@ -102,8 +108,9 @@ 
 				$themes = (array) $_POST['checked'];
 				$action = 'enabled';
 				$n = count( $themes );
-				foreach ( (array) $themes as $theme )
-					$allowed_themes[ $theme ] = true;
+				foreach ( (array) $themes as $theme ) {
+									$allowed_themes[ $theme ] = true;
+				}
 			} else {
 				$action = 'error';
 				$n = 'none';
@@ -115,8 +122,9 @@ 
 				$themes = (array) $_POST['checked'];
 				$action = 'disabled';
 				$n = count( $themes );
-				foreach ( (array) $themes as $theme )
-					unset( $allowed_themes[ $theme ] );
+				foreach ( (array) $themes as $theme ) {
+									unset( $allowed_themes[ $theme ] );
+				}
 			} else {
 				$action = 'error';
 				$n = 'none';

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

Spacing +94 added lines, -94 removed lines

@@ -8,78 +8,78 @@ 
  */
 
 /** 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( __( 'You do not have sufficient permissions to edit this site.' ) );
+if ( ! current_user_can('manage_sites')) {
+	wp_die(__('You do not have sufficient permissions to edit this site.'));
 }
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( '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( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id)) {
+	wp_die(__('You do not have permission to access this page.'), 403);
 }
 
-$parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
-$is_main_site = is_main_site( $id );
+$parsed_scheme = parse_url($details->siteurl, PHP_URL_SCHEME);
+$is_main_site = is_main_site($id);
 
-if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
-	check_admin_referer( 'edit-site' );
+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action']) {
+	check_admin_referer('edit-site');
 
-	switch_to_blog( $id );
+	switch_to_blog($id);
 
 	// Rewrite rules can't be flushed during switch to blog.
-	delete_option( 'rewrite_rules' );
+	delete_option('rewrite_rules');
 
-	$blog_data = wp_unslash( $_POST['blog'] );
+	$blog_data = wp_unslash($_POST['blog']);
 	$blog_data['scheme'] = $parsed_scheme;
 
-	if ( $is_main_site ) {
+	if ($is_main_site) {
 		// On the network's main site, don't allow the domain or path to change.
 		$blog_data['domain'] = $details->domain;
 		$blog_data['path'] = $details->path;
 	} else {
 		// For any other site, the scheme, domain, and path can all be changed. We first
 		// need to ensure a scheme has been provided, otherwise fallback to the existing.
-		$new_url_scheme = parse_url( $blog_data['url'], PHP_URL_SCHEME );
+		$new_url_scheme = parse_url($blog_data['url'], PHP_URL_SCHEME);
 
-		if ( ! $new_url_scheme ) {
-			$blog_data['url'] = esc_url( $parsed_scheme . '://' . $blog_data['url'] );
+		if ( ! $new_url_scheme) {
+			$blog_data['url'] = esc_url($parsed_scheme.'://'.$blog_data['url']);
 		}
-		$update_parsed_url = parse_url( $blog_data['url'] );
+		$update_parsed_url = parse_url($blog_data['url']);
 
 		// If a path is not provided, use the default of `/`.
-		if ( ! isset( $update_parsed_url['path'] ) ) {
+		if ( ! isset($update_parsed_url['path'])) {
 			$update_parsed_url['path'] = '/';
 		}
 
@@ -88,126 +88,126 @@ 
 		$blog_data['path'] = $update_parsed_url['path'];
 	}
 
-	$existing_details = get_blog_details( $id, false );
-	$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
-	foreach ( $blog_data_checkboxes as $c ) {
-		if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
-			$blog_data[ $c ] = $existing_details->$c;
+	$existing_details = get_blog_details($id, false);
+	$blog_data_checkboxes = array('public', 'archived', 'spam', 'mature', 'deleted');
+	foreach ($blog_data_checkboxes as $c) {
+		if ( ! in_array($existing_details->$c, array(0, 1))) {
+			$blog_data[$c] = $existing_details->$c;
 		} else {
-			$blog_data[ $c ] = isset( $_POST['blog'][ $c ] ) ? 1 : 0;
+			$blog_data[$c] = isset($_POST['blog'][$c]) ? 1 : 0;
 		}
 	}
 
-	update_blog_details( $id, $blog_data );
+	update_blog_details($id, $blog_data);
 
 	// Maybe update home and siteurl options.
-	$new_details = get_blog_details( $id, false );
+	$new_details = get_blog_details($id, false);
 
-	$old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
-	$old_home_parsed = parse_url( $old_home_url );
+	$old_home_url = trailingslashit(esc_url(get_option('home')));
+	$old_home_parsed = parse_url($old_home_url);
 
-	if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
-		$new_home_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
-		update_option( 'home', $new_home_url );
+	if ($old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path) {
+		$new_home_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
+		update_option('home', $new_home_url);
 	}
 
-	$old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
-	$old_site_parsed = parse_url( $old_site_url );
+	$old_site_url = trailingslashit(esc_url(get_option('siteurl')));
+	$old_site_parsed = parse_url($old_site_url);
 
-	if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
-		$new_site_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
-		update_option( 'siteurl', $new_site_url );
+	if ($old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path) {
+		$new_site_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
+		update_option('siteurl', $new_site_url);
 	}
 
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php' ) );
+	wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-info.php'));
 	exit;
 }
 
-if ( isset( $_GET['update'] ) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] ) {
-		$messages[] = __( 'Site info updated.' );
+	if ('updated' == $_GET['update']) {
+		$messages[] = __('Site info 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>
 <h2 class="nav-tab-wrapper nav-tab-small wp-clearfix">
 <?php
 $tabs = array(
-	'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php'     ),
-	'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php'    ),
-	'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php'   ),
-	'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php' ),
+	'site-info'     => array('label' => __('Info'), 'url' => 'site-info.php'),
+	'site-users'    => array('label' => __('Users'), 'url' => 'site-users.php'),
+	'site-themes'   => array('label' => __('Themes'), 'url' => 'site-themes.php'),
+	'site-settings' => array('label' => __('Settings'), 'url' => 'site-settings.php'),
 );
-foreach ( $tabs as $tab_id => $tab ) {
-	$class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
-	echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
+foreach ($tabs as $tab_id => $tab) {
+	$class = ($tab['url'] == $pagenow) ? ' nav-tab-active' : '';
+	echo '<a href="'.$tab['url'].'?id='.$id.'" class="nav-tab'.$class.'">'.esc_html($tab['label']).'</a>';
 }
 ?>
 </h2>
 <?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="site-info.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
 		// The main site of the network should not be updated on this page.
-		if ( $is_main_site ) : ?>
+		if ($is_main_site) : ?>
 		<tr class="form-field">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
-			<td><?php echo esc_url( $details->domain . $details->path ); ?></td>
+			<th scope="row"><?php _e('Site Address (URL)'); ?></th>
+			<td><?php echo esc_url($details->domain.$details->path); ?></td>
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
 		else : ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
-			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
+			<th scope="row"><?php _e('Site Address (URL)'); ?></th>
+			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme.'://'.esc_attr($details->domain).esc_attr($details->path); ?>" /></td>
 		</tr>
 		<?php endif; ?>
 
 		<tr class="form-field">
-			<th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
-			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
+			<th scope="row"><label for="blog_registered"><?php _ex('Registered', 'site') ?></label></th>
+			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr($details->registered) ?>" /></td>
 		</tr>
 		<tr class="form-field">
-			<th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
-			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
+			<th scope="row"><label for="blog_last_updated"><?php _e('Last Updated'); ?></label></th>
+			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr($details->last_updated) ?>" /></td>
 		</tr>
 		<?php
-		$attribute_fields = array( 'public' => __( 'Public' ) );
-		if ( ! $is_main_site ) {
-			$attribute_fields['archived'] = __( 'Archived' );
-			$attribute_fields['spam']     = _x( 'Spam', 'site' );
-			$attribute_fields['deleted']  = __( 'Deleted' );
+		$attribute_fields = array('public' => __('Public'));
+		if ( ! $is_main_site) {
+			$attribute_fields['archived'] = __('Archived');
+			$attribute_fields['spam']     = _x('Spam', 'site');
+			$attribute_fields['deleted']  = __('Deleted');
 		}
-		$attribute_fields['mature'] = __( 'Mature' );
+		$attribute_fields['mature'] = __('Mature');
 		?>
 		<tr>
-			<th scope="row"><?php _e( 'Attributes' ); ?></th>
+			<th scope="row"><?php _e('Attributes'); ?></th>
 			<td>
 			<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
-			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
-				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
+			<legend class="screen-reader-text"><?php _e('Set site attributes') ?></legend>
+			<?php foreach ($attribute_fields as $field_key => $field_label) : ?>
+				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked((bool) $details->$field_key, true); disabled( ! in_array($details->$field_key, array(0, 1))); ?> />
 				<?php echo $field_label; ?></label><br/>
 			<?php endforeach; ?>
 			<fieldset>
@@ -219,4 +219,4 @@ 
 
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +5 added lines, -2 removed lines

@@ -177,9 +177,12 @@
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
-		else : ?>
+		else {
+			: ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
+			<th scope="row"><?php _e( 'Site Address (URL)' );
+		}
+		?></th>
 			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
 		</tr>
 		<?php endif; ?>

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

Indentation +6 added lines, -6 removed lines

@@ -115,12 +115,12 @@
 		}
 
 		/**
-		  * Fires after a new user has been created via the network site-new.php page.
-		  *
-		  * @since 4.4.0
-		  *
-		  * @param int $user_id ID of the newly created user.
-		  */
+		 * Fires after a new user has been created via the network site-new.php page.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param int $user_id ID of the newly created user.
+		 */
 		do_action( 'network_site_new_created_user', $user_id );
 	}
 

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( __( 'You do not have sufficient permissions to add sites to this network.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('You do not have sufficient permissions 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');

Braces +21 added lines, -14 removed lines

@@ -13,11 +13,13 @@ 
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.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( __( 'You do not have sufficient permissions to add sites to this network.' ) );
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -36,13 +38,15 @@ 
 if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
-	if ( ! is_array( $_POST['blog'] ) )
-		wp_die( __( 'Can’t create an empty site.' ) );
+	if ( ! is_array( $_POST['blog'] ) ) {
+			wp_die( __( 'Can’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() ) {
@@ -72,8 +76,9 @@ 
 		}
 	}
 
-	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.' ) );
@@ -165,14 +170,15 @@ 
 
 if ( isset($_GET['update']) ) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
-		$messages[] = sprintf(
+	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'] ) )
 		);
-}
+	}
+	}
 
 $title = __('Add New Site');
 $parent_file = 'sites.php';
@@ -187,9 +193,10 @@ 
 <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>';
-} ?>
+	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' ) ?>
 	<table class="form-table">

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

Indentation +12 added lines, -12 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Add New User network administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+	 * Add New User network administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.1.0
+	 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -52,12 +52,12 @@ 
 	 		$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.
-			  *
-			  * @since 4.4.0
-			  *
-			  * @param int $user_id ID of the newly created user.
-			  */
+			 * Fires after a new user has been created via the network user-new.php page.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @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' ) );
 			exit;

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(__('You do not have sufficient permissions 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( __( 'You do not have permission to access this page.' ), 403 );
+	if ( ! current_user_can('manage_network_users'))
+		wp_die(__('You do not have permission 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(__('You do not have sufficient permissions 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( __( 'You do not have permission to access this page.' ), 403 );
+	if ( ! current_user_can( 'manage_network_users' ) ) {
+			wp_die( __( 'You do not have permission 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/users.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite users administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite users administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.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( __( 'You do not have permission to access this page.' ), 403 );
+if ( ! current_user_can('manage_network_users'))
+	wp_die(__('You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! current_user_can('manage_network_users'))
+				wp_die(__('You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! current_user_can('manage_network_users'))
+				wp_die(__('You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
-								$title = __( 'Users' );
+								if ( ! current_user_can('delete_users'))
+									wp_die(__('You do not have permission 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( __( 'You do not have permission 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(__('You do not have permission 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 bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</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 bold headings and switch between list and excerpt views by using the icons in the upper right.').'</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( __( 'You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
+			if ( !current_user_can( 'manage_network_users' ) ) {
+							wp_die( __( 'You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
+								if ( ! current_user_can( 'delete_users' ) ) {
+																	wp_die( __( 'You do not have permission 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( __( 'You do not have permission to access this page.' ), 403 );
+			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) ) {
+							wp_die( __( 'You do not have permission 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();