ntwb / wordpress

src/wp-admin/options-reading.php

Spacing +59 added lines, -59 removed lines

@@ -7,115 +7,115 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
-$title = __( 'Reading Settings' );
+$title = __('Reading Settings');
 $parent_file = 'options-general.php';
 
 add_action('admin_head', 'options_reading_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
-		'<p>' . sprintf(__('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="%s">Pages</a>. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '</p>' .
-		'<p>' . __('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen contains the settings that affect the display of your content.').'</p>'.
+		'<p>'.sprintf(__('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="%s">Pages</a>. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page').'</p>'.
+		'<p>'.__('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'site-visibility',
-	'title'   => has_action( 'blog_privacy_selector' ) ? __( 'Site Visibility' ) : __( 'Search Engine Visibility' ),
-	'content' => '<p>' . __( 'You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.' ) . '</p>' .
-		'<p>' . __( 'When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
-) );
+	'title'   => has_action('blog_privacy_selector') ? __('Site Visibility') : __('Search Engine Visibility'),
+	'content' => '<p>'.__('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.').'</p>'.
+		'<p>'.__('When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Reading_Screen" target="_blank">Documentation on Reading Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Reading_Screen" target="_blank">Documentation on Reading Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php
-settings_fields( 'reading' );
+settings_fields('reading');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
-	add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
+if ( ! in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8')))
+	add_settings_field('blog_charset', __('Encoding for pages and feeds'), 'options_reading_blog_charset', 'reading', 'default', array('label_for' => 'blog_charset'));
 ?>
 
-<?php if ( ! get_pages() ) : ?>
+<?php if ( ! get_pages()) : ?>
 <input name="show_on_front" type="hidden" value="posts" />
 <table class="form-table">
 <?php
-	if ( 'posts' != get_option( 'show_on_front' ) ) :
-		update_option( 'show_on_front', 'posts' );
+	if ('posts' != get_option('show_on_front')) :
+		update_option('show_on_front', 'posts');
 	endif;
 
 else :
-	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
-		update_option( 'show_on_front', 'posts' );
+	if ('page' == get_option('show_on_front') && ! get_option('page_on_front') && ! get_option('page_for_posts'))
+		update_option('show_on_front', 'posts');
 ?>
 <table class="form-table">
 <tr>
-<th scope="row"><?php _e( 'Front page displays' ); ?></th>
-<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Front page displays' ); ?></span></legend>
+<th scope="row"><?php _e('Front page displays'); ?></th>
+<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e('Front page displays'); ?></span></legend>
 	<p><label>
-		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
-		<?php _e( 'Your latest posts' ); ?>
+		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
+		<?php _e('Your latest posts'); ?>
 	</label>
 	</p>
 	<p><label>
-		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked( 'page', get_option( 'show_on_front' ) ); ?> />
-		<?php printf( __( 'A <a href="%s">static page</a> (select below)' ), 'edit.php?post_type=page' ); ?>
+		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> />
+		<?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit.php?post_type=page'); ?>
 	</label>
 	</p>
 <ul>
-	<li><label for="page_on_front"><?php printf( __( 'Front page: %s' ), wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_on_front' ) ) ) ); ?></label></li>
-	<li><label for="page_for_posts"><?php printf( __( 'Posts page: %s' ), wp_dropdown_pages( array( 'name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_for_posts' ) ) ) ); ?></label></li>
+	<li><label for="page_on_front"><?php printf(__('Front page: %s'), wp_dropdown_pages(array('name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'option_none_value' => '0', 'selected' => get_option('page_on_front')))); ?></label></li>
+	<li><label for="page_for_posts"><?php printf(__('Posts page: %s'), wp_dropdown_pages(array('name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'option_none_value' => '0', 'selected' => get_option('page_for_posts')))); ?></label></li>
 </ul>
-<?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
-<div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
+<?php if ('page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front')) : ?>
+<div id="front-page-warning" class="error inline"><p><?php _e('<strong>Warning:</strong> these pages should not be the same!'); ?></p></div>
 <?php endif; ?>
 </fieldset></td>
 </tr>
 <?php endif; ?>
 <tr>
-<th scope="row"><label for="posts_per_page"><?php _e( 'Blog pages show at most' ); ?></label></th>
+<th scope="row"><label for="posts_per_page"><?php _e('Blog pages show at most'); ?></label></th>
 <td>
-<input name="posts_per_page" type="number" step="1" min="1" id="posts_per_page" value="<?php form_option( 'posts_per_page' ); ?>" class="small-text" /> <?php _e( 'posts' ); ?>
+<input name="posts_per_page" type="number" step="1" min="1" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" class="small-text" /> <?php _e('posts'); ?>
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></th>
-<td><input name="posts_per_rss" type="number" step="1" min="1" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></td>
+<th scope="row"><label for="posts_per_rss"><?php _e('Syndication feeds show the most recent'); ?></label></th>
+<td><input name="posts_per_rss" type="number" step="1" min="1" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" class="small-text" /> <?php _e('items'); ?></td>
 </tr>
 <tr>
-<th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
-<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>	/> <?php _e( 'Full text' ); ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Summary' ); ?></label></p>
+<th scope="row"><?php _e('For each article in a feed, show'); ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('For each article in a feed, show'); ?> </span></legend>
+<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text'); ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary'); ?></label></p>
 </fieldset></td>
 </tr>
 
 <tr class="option-site-visibility">
-<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
-<?php if ( has_action( 'blog_privacy_selector' ) ) : ?>
+<th scope="row"><?php has_action('blog_privacy_selector') ? _e('Site Visibility') : _e('Search Engine Visibility'); ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php has_action('blog_privacy_selector') ? _e('Site Visibility') : _e('Search Engine Visibility'); ?> </span></legend>
+<?php if (has_action('blog_privacy_selector')) : ?>
 	<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
-	<label for="blog-public"><?php _e( 'Allow search engines to index this site' );?></label><br/>
+	<label for="blog-public"><?php _e('Allow search engines to index this site'); ?></label><br/>
 	<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
-	<label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
-	<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
+	<label for="blog-norobots"><?php _e('Discourage search engines from indexing this site'); ?></label>
+	<p class="description"><?php _e('Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.'); ?></p>
 	<?php
 	/**
 	 * Enable the legacy 'Site Visibility' privacy options.
@@ -130,22 +130,22 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'blog_privacy_selector' );
+	do_action('blog_privacy_selector');
 	?>
 <?php else : ?>
-	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) ); ?> />
-	<?php _e( 'Discourage search engines from indexing this site' ); ?></label>
-	<p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
+	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
+	<?php _e('Discourage search engines from indexing this site'); ?></label>
+	<p class="description"><?php _e('It is up to search engines to honor this request.'); ?></p>
 <?php endif; ?>
 </fieldset></td>
 </tr>
 
-<?php do_settings_fields( 'reading', 'default' ); ?>
+<?php do_settings_fields('reading', 'default'); ?>
 </table>
 
-<?php do_settings_sections( 'reading' ); ?>
+<?php do_settings_sections('reading'); ?>
 
 <?php submit_button(); ?>
 </form>
 </div>
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/nav-menus.php

Spacing +314 added lines, -314 removed lines

@@ -10,27 +10,27 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 // Load all the nav menu interface functions
-require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
+require_once(ABSPATH.'wp-admin/includes/nav-menu.php');
 
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
-	wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+if ( ! current_theme_supports('menus') && ! current_theme_supports('widgets'))
+	wp_die(__('Your theme does not support navigation menus or widgets.'));
 
 // Permissions Check
-if ( ! current_user_can( 'edit_theme_options' ) ) {
+if ( ! current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit theme options on this site.').'</p>',
 		403
 	);
 }
 
-wp_enqueue_script( 'nav-menu' );
+wp_enqueue_script('nav-menu');
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 // Container for any messages displayed to the user
 $messages = array();
@@ -39,15 +39,15 @@ 
 $nav_menu_selected_title = '';
 
 // The menu id of the current menu being edited
-$nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;
+$nav_menu_selected_id = isset($_REQUEST['menu']) ? (int) $_REQUEST['menu'] : 0;
 
 // Get existing menu locations assignments
 $locations = get_registered_nav_menus();
 $menu_locations = get_nav_menu_locations();
-$num_locations = count( array_keys( $locations ) );
+$num_locations = count(array_keys($locations));
 
 // Allowed actions: add, update, delete
-$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'edit';
 
 /*
  * If a JSON blob of navigation menu data is found, expand it and inject it
@@ -55,32 +55,32 @@ 
  */
 _wp_expand_nav_menu_post_data();
 
-switch ( $action ) {
+switch ($action) {
 	case 'add-menu-item':
-		check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-		if ( isset( $_REQUEST['nav-menu-locations'] ) )
-			set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
-		elseif ( isset( $_REQUEST['menu-item'] ) )
-			wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		check_admin_referer('add-menu_item', 'menu-settings-column-nonce');
+		if (isset($_REQUEST['nav-menu-locations']))
+			set_theme_mod('nav_menu_locations', array_map('absint', $_REQUEST['menu-locations']));
+		elseif (isset($_REQUEST['menu-item']))
+			wp_save_nav_menu_items($nav_menu_selected_id, $_REQUEST['menu-item']);
 		break;
 	case 'move-down-menu-item' :
 
 		// Moving down a menu item is the same as moving up the next in order.
-		check_admin_referer( 'move-menu_item' );
-		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
-		if ( is_nav_menu_item( $menu_item_id ) ) {
-			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
-			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
+		check_admin_referer('move-menu_item');
+		$menu_item_id = isset($_REQUEST['menu-item']) ? (int) $_REQUEST['menu-item'] : 0;
+		if (is_nav_menu_item($menu_item_id)) {
+			$menus = isset($_REQUEST['menu']) ? array((int) $_REQUEST['menu']) : wp_get_object_terms($menu_item_id, 'nav_menu', array('fields' => 'ids'));
+			if ( ! is_wp_error($menus) && ! empty($menus[0])) {
 				$menu_id = (int) $menus[0];
-				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$ordered_menu_items = wp_get_nav_menu_items($menu_id);
+				$menu_item_data = (array) wp_setup_nav_menu_item(get_post($menu_item_id));
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
 				$orders_to_dbids = array();
-				foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
-					if ( isset( $ordered_menu_item_object->ID ) ) {
-						if ( isset( $ordered_menu_item_object->menu_order ) ) {
+				foreach ((array) $ordered_menu_items as $ordered_menu_item_object) {
+					if (isset($ordered_menu_item_object->ID)) {
+						if (isset($ordered_menu_item_object->menu_order)) {
 							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
 							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
 						}
@@ -89,28 +89,28 @@ 
 
 				// Get next in order.
 				if (
-					isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
+					isset($orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1])
 				) {
 					$next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
-					$next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
+					$next_item_data = (array) wp_setup_nav_menu_item(get_post($next_item_id));
 
 					// If not siblings of same parent, bubble menu item up but keep order.
 					if (
-						! empty( $menu_item_data['menu_item_parent'] ) &&
+						! empty($menu_item_data['menu_item_parent']) &&
 						(
-							empty( $next_item_data['menu_item_parent'] ) ||
+							empty($next_item_data['menu_item_parent']) ||
 							$next_item_data['menu_item_parent'] != $menu_item_data['menu_item_parent']
 						)
 					) {
 
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_db_id = in_array($menu_item_data['menu_item_parent'], $orders_to_dbids) ? (int) $menu_item_data['menu_item_parent'] : 0;
 
-						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
+						$parent_object = wp_setup_nav_menu_item(get_post($parent_db_id));
 
-						if ( ! is_wp_error( $parent_object ) ) {
+						if ( ! is_wp_error($parent_object)) {
 							$parent_data = (array) $parent_object;
 							$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
-							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+							update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 
 						}
 
@@ -120,7 +120,7 @@ 
 						$menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
 
 						$menu_item_data['menu_item_parent'] = $next_item_data['ID'];
-						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+						update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 
 						wp_update_post($menu_item_data);
 						wp_update_post($next_item_data);
@@ -128,32 +128,32 @@ 
 
 				// The item is last but still has a parent, so bubble up.
 				} elseif (
-					! empty( $menu_item_data['menu_item_parent'] ) &&
-					in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
+					! empty($menu_item_data['menu_item_parent']) &&
+					in_array($menu_item_data['menu_item_parent'], $orders_to_dbids)
 				) {
-					$menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
-					update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+					$menu_item_data['menu_item_parent'] = (int) get_post_meta($menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
+					update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 				}
 			}
 		}
 
 		break;
 	case 'move-up-menu-item' :
-		check_admin_referer( 'move-menu_item' );
-		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
-		if ( is_nav_menu_item( $menu_item_id ) ) {
-			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
-			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
+		check_admin_referer('move-menu_item');
+		$menu_item_id = isset($_REQUEST['menu-item']) ? (int) $_REQUEST['menu-item'] : 0;
+		if (is_nav_menu_item($menu_item_id)) {
+			$menus = isset($_REQUEST['menu']) ? array((int) $_REQUEST['menu']) : wp_get_object_terms($menu_item_id, 'nav_menu', array('fields' => 'ids'));
+			if ( ! is_wp_error($menus) && ! empty($menus[0])) {
 				$menu_id = (int) $menus[0];
-				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$ordered_menu_items = wp_get_nav_menu_items($menu_id);
+				$menu_item_data = (array) wp_setup_nav_menu_item(get_post($menu_item_id));
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
 				$orders_to_dbids = array();
-				foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
-					if ( isset( $ordered_menu_item_object->ID ) ) {
-						if ( isset( $ordered_menu_item_object->menu_order ) ) {
+				foreach ((array) $ordered_menu_items as $ordered_menu_item_object) {
+					if (isset($ordered_menu_item_object->ID)) {
+						if (isset($ordered_menu_item_object->menu_order)) {
 							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
 							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
 						}
@@ -161,19 +161,19 @@ 
 				}
 
 				// If this menu item is not first.
-				if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
+				if ( ! empty($dbids_to_orders[$menu_item_id]) && ! empty($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1])) {
 
 					// If this menu item is a child of the previous.
 					if (
-						! empty( $menu_item_data['menu_item_parent'] ) &&
-						in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
-						isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &&
-						( $menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] )
+						! empty($menu_item_data['menu_item_parent']) &&
+						in_array($menu_item_data['menu_item_parent'], array_keys($dbids_to_orders)) &&
+						isset($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1]) &&
+						($menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1])
 					) {
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
-						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
+						$parent_db_id = in_array($menu_item_data['menu_item_parent'], $orders_to_dbids) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_object = wp_setup_nav_menu_item(get_post($parent_db_id));
 
-						if ( ! is_wp_error( $parent_object ) ) {
+						if ( ! is_wp_error($parent_object)) {
 							$parent_data = (array) $parent_object;
 
 							/*
@@ -181,9 +181,9 @@ 
 							 * make menu item a child also of it.
 							 */
 							if (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
-								! empty( $parent_data['menu_item_parent'] )
+								! empty($dbids_to_orders[$parent_db_id]) &&
+								! empty($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1]) &&
+								! empty($parent_data['menu_item_parent'])
 							) {
 								$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
 
@@ -192,11 +192,11 @@ 
 							 * make menu item a child of that something's parent
 							 */
 							} elseif (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
+								! empty($dbids_to_orders[$parent_db_id]) &&
+								! empty($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1])
 							) {
-								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
-								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
+								$_possible_parent_id = (int) get_post_meta($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
+								if (in_array($_possible_parent_id, array_keys($dbids_to_orders)))
 									$menu_item_data['menu_item_parent'] = $_possible_parent_id;
 								else
 									$menu_item_data['menu_item_parent'] = 0;
@@ -213,22 +213,22 @@ 
 							$menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
 
 							// Save changes.
-							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+							update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 							wp_update_post($menu_item_data);
 							wp_update_post($parent_data);
 						}
 
 					// Else this menu item is not a child of the previous.
 					} elseif (
-						empty( $menu_item_data['menu_order'] ) ||
-						empty( $menu_item_data['menu_item_parent'] ) ||
-						! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
-						empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
+						empty($menu_item_data['menu_order']) ||
+						empty($menu_item_data['menu_item_parent']) ||
+						! in_array($menu_item_data['menu_item_parent'], array_keys($dbids_to_orders)) ||
+						empty($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1]) ||
 						$orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
 					) {
 						// Just make it a child of the previous; keep the order.
 						$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
-						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+						update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 						wp_update_post($menu_item_data);
 					}
 				}
@@ -239,244 +239,244 @@ 
 	case 'delete-menu-item':
 		$menu_item_id = (int) $_REQUEST['menu-item'];
 
-		check_admin_referer( 'delete-menu_item_' . $menu_item_id );
+		check_admin_referer('delete-menu_item_'.$menu_item_id);
 
-		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		if (is_nav_menu_item($menu_item_id) && wp_delete_post($menu_item_id, true))
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('The menu item has been successfully deleted.').'</p></div>';
 		break;
 
 	case 'delete':
-		check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
-		if ( is_nav_menu( $nav_menu_selected_id ) ) {
-			$deletion = wp_delete_nav_menu( $nav_menu_selected_id );
+		check_admin_referer('delete-nav_menu-'.$nav_menu_selected_id);
+		if (is_nav_menu($nav_menu_selected_id)) {
+			$deletion = wp_delete_nav_menu($nav_menu_selected_id);
 		} else {
 			// Reset the selected menu.
 			$nav_menu_selected_id = 0;
-			unset( $_REQUEST['menu'] );
+			unset($_REQUEST['menu']);
 		}
 
-		if ( ! isset( $deletion ) )
+		if ( ! isset($deletion))
 			break;
 
-		if ( is_wp_error( $deletion ) )
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+		if (is_wp_error($deletion))
+			$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$deletion->get_error_message().'</p></div>';
 		else
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('The menu has been successfully deleted.').'</p></div>';
 		break;
 
 	case 'delete_menus':
-		check_admin_referer( 'nav_menus_bulk_actions' );
-		foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
-			if ( ! is_nav_menu( $menu_id_to_delete ) )
+		check_admin_referer('nav_menus_bulk_actions');
+		foreach ($_REQUEST['delete_menus'] as $menu_id_to_delete) {
+			if ( ! is_nav_menu($menu_id_to_delete))
 				continue;
 
-			$deletion = wp_delete_nav_menu( $menu_id_to_delete );
-			if ( is_wp_error( $deletion ) ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+			$deletion = wp_delete_nav_menu($menu_id_to_delete);
+			if (is_wp_error($deletion)) {
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$deletion->get_error_message().'</p></div>';
 				$deletion_error = true;
 			}
 		}
 
-		if ( empty( $deletion_error ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		if (empty($deletion_error))
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Selected menus have been successfully deleted.').'</p></div>';
 		break;
 
 	case 'update':
-		check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
+		check_admin_referer('update-nav_menu', 'update-nav-menu-nonce');
 
 		// Remove menu locations that have been unchecked.
-		foreach ( $locations as $location => $description ) {
-			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
-				unset( $menu_locations[ $location ] );
+		foreach ($locations as $location => $description) {
+			if ((empty($_POST['menu-locations']) || empty($_POST['menu-locations'][$location])) && isset($menu_locations[$location]) && $menu_locations[$location] == $nav_menu_selected_id)
+				unset($menu_locations[$location]);
 		}
 
 		// Merge new and existing menu locations if any new ones are set.
-		if ( isset( $_POST['menu-locations'] ) ) {
-			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+		if (isset($_POST['menu-locations'])) {
+			$new_menu_locations = array_map('absint', $_POST['menu-locations']);
+			$menu_locations = array_merge($menu_locations, $new_menu_locations);
 		}
 
 		// Set menu locations.
-		set_theme_mod( 'nav_menu_locations', $menu_locations );
+		set_theme_mod('nav_menu_locations', $menu_locations);
 
 		// Add Menu.
-		if ( 0 == $nav_menu_selected_id ) {
-			$new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
+		if (0 == $nav_menu_selected_id) {
+			$new_menu_title = trim(esc_html($_POST['menu-name']));
 
-			if ( $new_menu_title ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+			if ($new_menu_title) {
+				$_nav_menu_selected_id = wp_update_nav_menu_object(0, array('menu-name' => $new_menu_title));
 
-				if ( is_wp_error( $_nav_menu_selected_id ) ) {
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+				if (is_wp_error($_nav_menu_selected_id)) {
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$_nav_menu_selected_id->get_error_message().'</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object = wp_get_nav_menu_object($_nav_menu_selected_id);
 					$nav_menu_selected_id = $_nav_menu_selected_id;
 					$nav_menu_selected_title = $_menu_object->name;
-					if ( isset( $_REQUEST['menu-item'] ) )
-						wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
-					if ( isset( $_REQUEST['zero-menu-state'] ) ) {
+					if (isset($_REQUEST['menu-item']))
+						wp_save_nav_menu_items($nav_menu_selected_id, absint($_REQUEST['menu-item']));
+					if (isset($_REQUEST['zero-menu-state'])) {
 						// If there are menu items, add them
-						wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
+						wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title);
 						// Auto-save nav_menu_locations
 						$locations = get_nav_menu_locations();
-						foreach ( $locations as $location => $menu_id ) {
-								$locations[ $location ] = $nav_menu_selected_id;
+						foreach ($locations as $location => $menu_id) {
+								$locations[$location] = $nav_menu_selected_id;
 								break; // There should only be 1
 						}
-						set_theme_mod( 'nav_menu_locations', $locations );
+						set_theme_mod('nav_menu_locations', $locations);
 					}
-					if ( isset( $_REQUEST['use-location'] ) ) {
+					if (isset($_REQUEST['use-location'])) {
 						$locations = get_registered_nav_menus();
 						$menu_locations = get_nav_menu_locations();
-						if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
-							$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
-						set_theme_mod( 'nav_menu_locations', $menu_locations );
+						if (isset($locations[$_REQUEST['use-location']]))
+							$menu_locations[$_REQUEST['use-location']] = $nav_menu_selected_id;
+						set_theme_mod('nav_menu_locations', $menu_locations);
 					}
 
 					// $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%s</strong> has been created.' ), $nav_menu_selected_title ) . '</p></div>';
-					wp_redirect( admin_url( 'nav-menus.php?menu=' . $_nav_menu_selected_id ) );
+					wp_redirect(admin_url('nav-menus.php?menu='.$_nav_menu_selected_id));
 					exit();
 				}
 			} else {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('Please enter a valid menu name.').'</p></div>';
 			}
 
 		// Update existing menu.
 		} else {
 
-			$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
+			$_menu_object = wp_get_nav_menu_object($nav_menu_selected_id);
 
-			$menu_title = trim( esc_html( $_POST['menu-name'] ) );
-			if ( ! $menu_title ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+			$menu_title = trim(esc_html($_POST['menu-name']));
+			if ( ! $menu_title) {
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('Please enter a valid menu name.').'</p></div>';
 				$menu_title = $_menu_object->name;
 			}
 
-			if ( ! is_wp_error( $_menu_object ) ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
-				if ( is_wp_error( $_nav_menu_selected_id ) ) {
+			if ( ! is_wp_error($_menu_object)) {
+				$_nav_menu_selected_id = wp_update_nav_menu_object($nav_menu_selected_id, array('menu-name' => $menu_title));
+				if (is_wp_error($_nav_menu_selected_id)) {
 					$_menu_object = $_nav_menu_selected_id;
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$_nav_menu_selected_id->get_error_message().'</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object = wp_get_nav_menu_object($_nav_menu_selected_id);
 					$nav_menu_selected_title = $_menu_object->name;
 				}
 			}
 
 			// Update menu items.
-			if ( ! is_wp_error( $_menu_object ) ) {
-				$messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
+			if ( ! is_wp_error($_menu_object)) {
+				$messages = array_merge($messages, wp_nav_menu_update_menu_items($_nav_menu_selected_id, $nav_menu_selected_title));
 
 				// If the menu ID changed, redirect to the new URL.
-				if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
-					wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
+				if ($nav_menu_selected_id != $_nav_menu_selected_id) {
+					wp_redirect(admin_url('nav-menus.php?menu='.intval($_nav_menu_selected_id)));
 					exit();
 				}
 			}
 		}
 		break;
 	case 'locations':
-		if ( ! $num_locations ) {
-			wp_redirect( admin_url( 'nav-menus.php' ) );
+		if ( ! $num_locations) {
+			wp_redirect(admin_url('nav-menus.php'));
 			exit();
 		}
 
-		add_filter( 'screen_options_show_screen', '__return_false' );
+		add_filter('screen_options_show_screen', '__return_false');
 
-		if ( isset( $_POST['menu-locations'] ) ) {
-			check_admin_referer( 'save-menu-locations' );
+		if (isset($_POST['menu-locations'])) {
+			check_admin_referer('save-menu-locations');
 
-			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+			$new_menu_locations = array_map('absint', $_POST['menu-locations']);
+			$menu_locations = array_merge($menu_locations, $new_menu_locations);
 			// Set menu locations
-			set_theme_mod( 'nav_menu_locations', $menu_locations );
+			set_theme_mod('nav_menu_locations', $menu_locations);
 
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Menu locations updated.').'</p></div>';
 		}
 		break;
 }
 
 // Get all nav menus.
 $nav_menus = wp_get_nav_menus();
-$menu_count = count( $nav_menus );
+$menu_count = count($nav_menus);
 
 // Are we on the add new screen?
-$add_new_screen = ( isset( $_GET['menu'] ) && 0 == $_GET['menu'] ) ? true : false;
+$add_new_screen = (isset($_GET['menu']) && 0 == $_GET['menu']) ? true : false;
 
-$locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
+$locations_screen = (isset($_GET['action']) && 'locations' == $_GET['action']) ? true : false;
 
 /*
  * If we have one theme location, and zero menus, we take them right
  * into editing their first menu.
  */
-$page_count = wp_count_posts( 'page' );
-$one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
+$page_count = wp_count_posts('page');
+$one_theme_location_no_menus = (1 == count(get_registered_nav_menus()) && ! $add_new_screen && empty($nav_menus) && ! empty($page_count->publish)) ? true : false;
 
 $nav_menus_l10n = array(
 	'oneThemeLocationNoMenus' => $one_theme_location_no_menus,
-	'moveUp'       => __( 'Move up one' ),
-	'moveDown'     => __( 'Move down one' ),
-	'moveToTop'    => __( 'Move to the top' ),
+	'moveUp'       => __('Move up one'),
+	'moveDown'     => __('Move down one'),
+	'moveToTop'    => __('Move to the top'),
 	/* translators: %s: previous item name */
-	'moveUnder'    => __( 'Move under %s' ),
+	'moveUnder'    => __('Move under %s'),
 	/* translators: %s: previous item name */
-	'moveOutFrom'  => __( 'Move out from under %s' ),
+	'moveOutFrom'  => __('Move out from under %s'),
 	/* translators: %s: previous item name */
-	'under'        => __( 'Under %s' ),
+	'under'        => __('Under %s'),
 	/* translators: %s: previous item name */
-	'outFrom'      => __( 'Out from under %s' ),
+	'outFrom'      => __('Out from under %s'),
 	/* translators: 1: item name, 2: item position, 3: total number of items */
-	'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+	'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 	/* translators: 1: item name, 2: item position, 3: parent item name */
-	'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+	'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 );
-wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 
 /*
  * Redirect to add screen if there are no menus and this users has either zero,
  * or more than 1 theme locations.
  */
-if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
-	wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
+if (0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus)
+	wp_redirect(admin_url('nav-menus.php?action=edit&menu=0'));
 
 // Get recently edited nav menu.
-$recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+$recently_edited = absint(get_user_option('nav_menu_recently_edited'));
+if (empty($recently_edited) && is_nav_menu($nav_menu_selected_id))
 	$recently_edited = $nav_menu_selected_id;
 
 // Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+if (empty($nav_menu_selected_id) && ! isset($_GET['menu']) && is_nav_menu($recently_edited))
 	$nav_menu_selected_id = $recently_edited;
 
 // On deletion of menu, if another menu exists, show it.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+if ( ! $add_new_screen && 0 < $menu_count && isset($_GET['action']) && 'delete' == $_GET['action'])
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
 
 // Set $nav_menu_selected_id to 0 if no menus.
-if ( $one_theme_location_no_menus ) {
+if ($one_theme_location_no_menus) {
 	$nav_menu_selected_id = 0;
-} elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
+} elseif (empty($nav_menu_selected_id) && ! empty($nav_menus) && ! $add_new_screen) {
 	// if we have no selection yet, and we have menus, set to the first one in the list.
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
 }
 
 // Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
-	update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
+if ($nav_menu_selected_id != $recently_edited && is_nav_menu($nav_menu_selected_id))
+	update_user_meta($current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id);
 
 // If there's a menu, get its name.
-if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
-	$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
-	$nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
+if ( ! $nav_menu_selected_title && is_nav_menu($nav_menu_selected_id)) {
+	$_menu_object = wp_get_nav_menu_object($nav_menu_selected_id);
+	$nav_menu_selected_title = ! is_wp_error($_menu_object) ? $_menu_object->name : '';
 }
 
 // Generate truncated menu names.
-foreach ( (array) $nav_menus as $key => $_nav_menu ) {
-	$nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '&hellip;' );
+foreach ((array) $nav_menus as $key => $_nav_menu) {
+	$nav_menus[$key]->truncated_name = wp_html_excerpt($_nav_menu->name, 40, '&hellip;');
 }
 
 // Retrieve menu locations.
-if ( current_theme_supports( 'menus' ) ) {
+if (current_theme_supports('menus')) {
 	$locations = get_registered_nav_menus();
 	$menu_locations = get_nav_menu_locations();
 }
@@ -491,9 +491,9 @@ 
 $_wp_nav_menu_max_depth = 0;
 
 // Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
-if ( is_nav_menu( $nav_menu_selected_id ) ) {
-	$menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
-	$edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
+if (is_nav_menu($nav_menu_selected_id)) {
+	$menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('post_status' => 'any'));
+	$edit_markup = wp_get_nav_menu_to_edit($nav_menu_selected_id);
 }
 
 /**
@@ -503,7 +503,7 @@ 
  * @param string $classes
  * @return string
  */
-function wp_nav_menu_max_depth( $classes ) {
+function wp_nav_menu_max_depth($classes) {
 	global $_wp_nav_menu_max_depth;
 	return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }
@@ -513,138 +513,138 @@ 
 wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
-	$messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+if ( ! current_theme_supports('menus') && ! $num_locations)
+	$messages[] = '<div id="message" class="updated"><p>'.sprintf(__('Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.'), admin_url('widgets.php')).'</p></div>';
 
-if ( ! $locations_screen ) : // Main tab
-	$overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
-	$overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Fifteen', 'Twenty Fourteen' ) . '</p>';
-	$overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
-	$overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
-	$overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
+if ( ! $locations_screen) : // Main tab
+	$overview  = '<p>'.__('This screen is used for managing your custom navigation menus.').'</p>';
+	$overview .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.'), admin_url('widgets.php'), 'Twenty Fifteen', 'Twenty Fourteen').'</p>';
+	$overview .= '<p>'.__('From this screen you can:').'</p>';
+	$overview .= '<ul><li>'.__('Create, edit, and delete menus').'</li>';
+	$overview .= '<li>'.__('Add, organize, and modify individual menu items').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $overview
-	) );
+	));
 
-	$menu_management  = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>';
-	$menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>' ) . '</li>';
-	$menu_management .= '<li>' . __( 'If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started' ) . '</li></ul>';
-	$menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>';
+	$menu_management  = '<p>'.__('The menu management box at the top of the screen is used to control which menu is opened in the editor below.').'</p>';
+	$menu_management .= '<ul><li>'.__('To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>').'</li>';
+	$menu_management .= '<li>'.__('If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started').'</li></ul>';
+	$menu_management .= '<p>'.__('You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'menu-management',
-		'title'   => __( 'Menu Management' ),
+		'title'   => __('Menu Management'),
 		'content' => $menu_management
-	) );
+	));
 
-	$editing_menus  = '<p>' . __( 'Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
-	$editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
-	$editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
-	$editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
+	$editing_menus  = '<p>'.__('Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.').'</p>';
+	$editing_menus .= '<p>'.__('<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.').'</p>';
+	$editing_menus .= '<ul><li>'.__('Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>').'</li>';
+	$editing_menus .= '<li>'.__('To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>').'</li>';
+	$editing_menus .= '<li>'.__('To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu').'</li>';
+	$editing_menus .= '<li>'.__('Delete a menu item by <strong>expanding it and clicking the Remove link</strong>').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'editing-menus',
-		'title'   => __( 'Editing Menus' ),
+		'title'   => __('Editing Menus'),
 		'content' => $editing_menus
-	) );
+	));
 else : // Locations Tab.
-	$locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
-	$locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
-	$locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
-	$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
+	$locations_overview  = '<p>'.__('This screen is used for globally assigning menus to locations defined by your theme.').'</p>';
+	$locations_overview .= '<ul><li>'.__('To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>').'</li>';
+	$locations_overview .= '<li>'.__('To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>').'</li>';
+	$locations_overview .= '<li>'.__('To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'locations-overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $locations_overview
-	) );
+	));
 endif;
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</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/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 // Get the admin header.
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-	<h1><?php echo esc_html( __( 'Menus' ) ); ?>
+	<h1><?php echo esc_html(__('Menus')); ?>
 		<?php
-		if ( current_user_can( 'customize' ) ) :
-			$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+		if (current_user_can('customize')) :
+			$focus = $locations_screen ? array('section' => 'menu_locations') : array('panel' => 'nav_menus');
 			printf(
 				' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-				esc_url( add_query_arg( array(
-					array( 'autofocus' => $focus ),
-					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-				), admin_url( 'customize.php' ) ) ),
-				__( 'Manage with Live Preview' )
+				esc_url(add_query_arg(array(
+					array('autofocus' => $focus),
+					'return' => urlencode(wp_unslash($_SERVER['REQUEST_URI'])),
+				), admin_url('customize.php'))),
+				__('Manage with Live Preview')
 			);
 		endif;
 		?>
 	</h1>
 	<h2 class="nav-tab-wrapper wp-clearfix">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
-		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+		<a href="<?php echo admin_url('nav-menus.php'); ?>" class="nav-tab<?php if ( ! isset($_GET['action']) || isset($_GET['action']) && 'locations' != $_GET['action']) echo ' nav-tab-active'; ?>"><?php esc_html_e('Edit Menus'); ?></a>
+		<?php if ($num_locations && $menu_count) : ?>
+			<a href="<?php echo esc_url(add_query_arg(array('action' => 'locations'), admin_url('nav-menus.php'))); ?>" class="nav-tab<?php if ($locations_screen) echo ' nav-tab-active'; ?>"><?php esc_html_e('Manage Locations'); ?></a>
 		<?php
 			endif;
 		?>
 	</h2>
 	<?php
-	foreach ( $messages as $message ) :
-		echo $message . "\n";
+	foreach ($messages as $message) :
+		echo $message."\n";
 	endforeach;
 	?>
 	<?php
-	if ( $locations_screen ) :
-		if ( 1 == $num_locations ) {
-			echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+	if ($locations_screen) :
+		if (1 == $num_locations) {
+			echo '<p>'.__('Your theme supports one menu. Select which menu you would like to use.').'</p>';
 		} else {
-			echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+			echo '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations)).'</p>';
 		}
 	?>
 	<div id="menu-locations-wrap">
-		<form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
+		<form method="post" action="<?php echo esc_url(add_query_arg(array('action' => 'locations'), admin_url('nav-menus.php'))); ?>">
 			<table class="widefat fixed" id="menu-locations-table">
 				<thead>
 				<tr>
-					<th scope="col" class="manage-column column-locations"><?php _e( 'Theme Location' ); ?></th>
-					<th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
+					<th scope="col" class="manage-column column-locations"><?php _e('Theme Location'); ?></th>
+					<th scope="col" class="manage-column column-menus"><?php _e('Assigned Menu'); ?></th>
 				</tr>
 				</thead>
 				<tbody class="menu-locations">
-				<?php foreach ( $locations as $_location => $_name ) { ?>
+				<?php foreach ($locations as $_location => $_name) { ?>
 					<tr class="menu-locations-row">
 						<td class="menu-location-title"><label for="locations-<?php echo $_location; ?>"><?php echo $_name; ?></label></td>
 						<td class="menu-location-menus">
 							<select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
-								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
-								<?php foreach ( $nav_menus as $menu ) : ?>
-									<?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-									<option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
-										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
+								<option value="0"><?php printf('&mdash; %s &mdash;', esc_html__('Select a Menu')); ?></option>
+								<?php foreach ($nav_menus as $menu) : ?>
+									<?php $selected = isset($menu_locations[$_location]) && $menu_locations[$_location] == $menu->term_id; ?>
+									<option <?php if ($selected) echo 'data-orig="true"'; ?> <?php selected($selected); ?> value="<?php echo $menu->term_id; ?>">
+										<?php echo wp_html_excerpt($menu->name, 40, '&hellip;'); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 							<div class="locations-row-links">
-								<?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
+								<?php if (isset($menu_locations[$_location]) && 0 != $menu_locations[$_location]) : ?>
 								<span class="locations-edit-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">
-										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
+									<a href="<?php echo esc_url(add_query_arg(array('action' => 'edit', 'menu' => $menu_locations[$_location]), admin_url('nav-menus.php'))); ?>">
+										<span aria-hidden="true"><?php _ex('Edit', 'menu'); ?></span><span class="screen-reader-text"><?php _e('Edit selected menu'); ?></span>
 									</a>
 								</span>
 								<?php endif; ?>
 								<span class="locations-add-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, 'use-location' => $_location ), admin_url( 'nav-menus.php' ) ) ); ?>">
-										<?php _ex( 'Use new menu', 'menu' ); ?>
+									<a href="<?php echo esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0, 'use-location' => $_location), admin_url('nav-menus.php'))); ?>">
+										<?php _ex('Use new menu', 'menu'); ?>
 									</a>
 								</span>
 							</div><!-- .locations-row-links -->
@@ -653,9 +653,9 @@ 
 				<?php } // foreach ?>
 				</tbody>
 			</table>
-			<p class="button-controls wp-clearfix"><?php submit_button( __( 'Save Changes' ), 'primary left', 'nav-menu-locations', false ); ?></p>
-			<?php wp_nonce_field( 'save-menu-locations' ); ?>
-			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+			<p class="button-controls wp-clearfix"><?php submit_button(__('Save Changes'), 'primary left', 'nav-menu-locations', false); ?></p>
+			<?php wp_nonce_field('save-menu-locations'); ?>
+			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 		</form>
 	</div><!-- #menu-locations-wrap -->
 	<?php
@@ -664,31 +664,31 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	do_action( 'after_menu_locations_table' ); ?>
+	do_action('after_menu_locations_table'); ?>
 	<?php else : ?>
 	<div class="manage-menus">
- 		<?php if ( $menu_count < 2 ) : ?>
+ 		<?php if ($menu_count < 2) : ?>
 		<span class="add-edit-menu-action">
-			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			<?php printf(__('Edit your menu below, or <a href="%s">create a new menu</a>.'), esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0), admin_url('nav-menus.php')))); ?>
 		</span><!-- /add-edit-menu-action -->
 		<?php else : ?>
-			<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
+			<form method="get" action="<?php echo admin_url('nav-menus.php'); ?>">
 			<input type="hidden" name="action" value="edit" />
-			<label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
+			<label for="select-menu-to-edit" class="selected-menu"><?php _e('Select a menu to edit:'); ?></label>
 			<select name="menu" id="select-menu-to-edit">
-				<?php if ( $add_new_screen ) : ?>
-					<option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+				<?php if ($add_new_screen) : ?>
+					<option value="0" selected="selected"><?php _e('&mdash; Select &mdash;'); ?></option>
 				<?php endif; ?>
-				<?php foreach ( (array) $nav_menus as $_nav_menu ) : ?>
-					<option value="<?php echo esc_attr( $_nav_menu->term_id ); ?>" <?php selected( $_nav_menu->term_id, $nav_menu_selected_id ); ?>>
+				<?php foreach ((array) $nav_menus as $_nav_menu) : ?>
+					<option value="<?php echo esc_attr($_nav_menu->term_id); ?>" <?php selected($_nav_menu->term_id, $nav_menu_selected_id); ?>>
 						<?php
-						echo esc_html( $_nav_menu->truncated_name ) ;
+						echo esc_html($_nav_menu->truncated_name);
 
-						if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
+						if ( ! empty($menu_locations) && in_array($_nav_menu->term_id, $menu_locations)) {
 							$locations_assigned_to_this_menu = array();
-							foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
-								if ( isset( $locations[ $menu_location_key ] ) ) {
-									$locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+							foreach (array_keys($menu_locations, $_nav_menu->term_id) as $menu_location_key) {
+								if (isset($locations[$menu_location_key])) {
+									$locations_assigned_to_this_menu[] = $locations[$menu_location_key];
 								}
 							}
 
@@ -699,13 +699,13 @@ 
 							 *
 							 * @param int $locations Number of menu locations to list. Default 3.
 							 */
-							$assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
+							$assigned_locations = array_slice($locations_assigned_to_this_menu, 0, absint(apply_filters('wp_nav_locations_listed_per_menu', 3)));
 
 							// Adds ellipses following the number of locations defined in $assigned_locations.
-							if ( ! empty( $assigned_locations ) ) {
-								printf( ' (%1$s%2$s)',
-									implode( ', ', $assigned_locations ),
-									count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' &hellip;' : ''
+							if ( ! empty($assigned_locations)) {
+								printf(' (%1$s%2$s)',
+									implode(', ', $assigned_locations),
+									count($locations_assigned_to_this_menu) > count($assigned_locations) ? ' &hellip;' : ''
 								);
 							}
 						}
@@ -713,109 +713,109 @@ 
 					</option>
 				<?php endforeach; ?>
 			</select>
-			<span class="submit-btn"><input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Select' ); ?>"></span>
+			<span class="submit-btn"><input type="submit" class="button-secondary" value="<?php esc_attr_e('Select'); ?>"></span>
 			<span class="add-new-menu-action">
-				<?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+				<?php printf(__('or <a href="%s">create a new menu</a>.'), esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0), admin_url('nav-menus.php')))); ?>
 			</span><!-- /add-new-menu-action -->
 		</form>
 	<?php endif; ?>
 	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame" class="wp-clearfix">
-	<div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">
+	<div id="menu-settings-column" class="metabox-holder<?php if (isset($_GET['menu']) && '0' == $_GET['menu']) { echo ' metabox-holder-disabled'; } ?>">
 
 		<div class="clear"></div>
 
 		<form id="nav-menu-meta" class="nav-menu-meta" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 			<input type="hidden" name="action" value="add-menu-item" />
-			<?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>
-			<?php do_accordion_sections( 'nav-menus', 'side', null ); ?>
+			<?php wp_nonce_field('add-menu_item', 'menu-settings-column-nonce'); ?>
+			<?php do_accordion_sections('nav-menus', 'side', null); ?>
 		</form>
 
 	</div><!-- /#menu-settings-column -->
 	<div id="menu-management-liquid">
 		<div id="menu-management">
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
-				<div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+				<div class="menu-edit <?php if ($add_new_screen) echo 'blank-slate'; ?>">
 					<input type="hidden" name="nav-menu-data">
 					<?php
-					wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-					wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-					wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' );
+					wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+					wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+					wp_nonce_field('update-nav_menu', 'update-nav-menu-nonce');
 
 					$menu_name_aria_desc = $add_new_screen ? ' aria-describedby="menu-name-desc"' : '';
 
-					if ( $one_theme_location_no_menus ) {
-						$menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
+					if ($one_theme_location_no_menus) {
+						$menu_name_val = 'value="'.esc_attr('Menu 1').'"';
 					?>
 						<input type="hidden" name="zero-menu-state" value="true" />
 					<?php } else {
-						$menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
+						$menu_name_val = 'value="'.esc_attr($nav_menu_selected_title).'"';
 					} ?>
  					<input type="hidden" name="action" value="update" />
-					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 					<div id="nav-menu-header">
 						<div class="major-publishing-actions wp-clearfix">
-							<label class="menu-name-label" for="menu-name"><?php _e( 'Menu Name' ); ?></label>
-							<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox" <?php echo $menu_name_val . $menu_name_aria_desc; ?> />
+							<label class="menu-name-label" for="menu-name"><?php _e('Menu Name'); ?></label>
+							<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox" <?php echo $menu_name_val.$menu_name_aria_desc; ?> />
 							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
+								<?php submit_button(empty($nav_menu_selected_id) ? __('Create Menu') : __('Save Menu'), 'button-primary menu-save', 'save_menu', false, array('id' => 'save_menu_header')); ?>
 							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- END .nav-menu-header -->
 					<div id="post-body">
 						<div id="post-body-content" class="wp-clearfix">
-							<?php if ( ! $add_new_screen ) : ?>
-							<h3><?php _e( 'Menu Structure' ); ?></h3>
-							<?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
-							<div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
+							<?php if ( ! $add_new_screen) : ?>
+							<h3><?php _e('Menu Structure'); ?></h3>
+							<?php $starter_copy = ($one_theme_location_no_menus) ? __('Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.') : __('Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.'); ?>
+							<div class="drag-instructions post-body-plain" <?php if (isset($menu_items) && 0 == count($menu_items)) { ?>style="display: none;"<?php } ?>>
 								<p><?php echo $starter_copy; ?></p>
 							</div>
 							<?php
-							if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
+							if (isset($edit_markup) && ! is_wp_error($edit_markup)) {
 								echo $edit_markup;
 							} else {
 							?>
 							<ul class="menu" id="menu-to-edit"></ul>
 							<?php } ?>
 							<?php endif; ?>
-							<?php if ( $add_new_screen ) : ?>
-								<p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
-								<?php if ( isset( $_GET['use-location'] ) ) : ?>
-									<input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
+							<?php if ($add_new_screen) : ?>
+								<p class="post-body-plain" id="menu-name-desc"><?php _e('Give your menu a name, then click Create Menu.'); ?></p>
+								<?php if (isset($_GET['use-location'])) : ?>
+									<input type="hidden" name="use-location" value="<?php echo esc_attr($_GET['use-location']); ?>" />
 								<?php endif; ?>
 							<?php endif; ?>
-							<div class="menu-settings" <?php if ( $one_theme_location_no_menus ) { ?>style="display: none;"<?php } ?>>
-								<h3><?php _e( 'Menu Settings' ); ?></h3>
+							<div class="menu-settings" <?php if ($one_theme_location_no_menus) { ?>style="display: none;"<?php } ?>>
+								<h3><?php _e('Menu Settings'); ?></h3>
 								<?php
-								if ( ! isset( $auto_add ) ) {
-									$auto_add = get_option( 'nav_menu_options' );
-									if ( ! isset( $auto_add['auto_add'] ) )
+								if ( ! isset($auto_add)) {
+									$auto_add = get_option('nav_menu_options');
+									if ( ! isset($auto_add['auto_add']))
 										$auto_add = false;
-									elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
+									elseif (false !== array_search($nav_menu_selected_id, $auto_add['auto_add']))
 										$auto_add = true;
 									else
 										$auto_add = false;
 								} ?>
 
 								<dl class="auto-add-pages">
-									<dt class="howto"><?php _e( 'Auto add pages' ); ?></dt>
-									<dd class="checkbox-input"><input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label></dd>
+									<dt class="howto"><?php _e('Auto add pages'); ?></dt>
+									<dd class="checkbox-input"><input type="checkbox"<?php checked($auto_add); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf(__('Automatically add new top-level pages to this menu'), esc_url(admin_url('edit.php?post_type=page'))); ?></label></dd>
 								</dl>
 
-								<?php if ( current_theme_supports( 'menus' ) ) : ?>
+								<?php if (current_theme_supports('menus')) : ?>
 
 									<dl class="menu-theme-locations">
-										<dt class="howto"><?php _e( 'Theme locations' ); ?></dt>
-										<?php foreach ( $locations as $location => $description ) : ?>
+										<dt class="howto"><?php _e('Theme locations'); ?></dt>
+										<?php foreach ($locations as $location => $description) : ?>
 										<dd class="checkbox-input">
-											<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
-											<label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
-											<?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
+											<input type="checkbox"<?php checked(isset($menu_locations[$location]) && $menu_locations[$location] == $nav_menu_selected_id); ?> name="menu-locations[<?php echo esc_attr($location); ?>]" id="locations-<?php echo esc_attr($location); ?>" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
+											<label for="locations-<?php echo esc_attr($location); ?>"><?php echo $description; ?></label>
+											<?php if ( ! empty($menu_locations[$location]) && $menu_locations[$location] != $nav_menu_selected_id) : ?>
 												<span class="theme-location-set"><?php
 													/* translators: %s: menu name */
-													printf( _x( '(Currently set to: %s)', 'menu location' ),
-														wp_get_nav_menu_object( $menu_locations[ $location ] )->name
+													printf(_x('(Currently set to: %s)', 'menu location'),
+														wp_get_nav_menu_object($menu_locations[$location])->name
 													);
 												?></span>
 											<?php endif; ?>
@@ -830,13 +830,13 @@ 
 					</div><!-- /#post-body -->
 					<div id="nav-menu-footer">
 						<div class="major-publishing-actions wp-clearfix">
-							<?php if ( 0 != $menu_count && ! $add_new_screen ) : ?>
+							<?php if (0 != $menu_count && ! $add_new_screen) : ?>
 							<span class="delete-action">
-								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'menu' => $nav_menu_selected_id ), admin_url( 'nav-menus.php' ) ), 'delete-nav_menu-' . $nav_menu_selected_id) ); ?>"><?php _e('Delete Menu'); ?></a>
+								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url(wp_nonce_url(add_query_arg(array('action' => 'delete', 'menu' => $nav_menu_selected_id), admin_url('nav-menus.php')), 'delete-nav_menu-'.$nav_menu_selected_id)); ?>"><?php _e('Delete Menu'); ?></a>
 							</span><!-- END .delete-action -->
 							<?php endif; ?>
 							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
+								<?php submit_button(empty($nav_menu_selected_id) ? __('Create Menu') : __('Save Menu'), 'button-primary menu-save', 'save_menu', false, array('id' => 'save_menu_footer')); ?>
 							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- /#nav-menu-footer -->
@@ -847,4 +847,4 @@ 
 	</div><!-- /#nav-menus-frame -->
 	<?php endif; ?>
 </div><!-- /.wrap-->
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/options-general.php

Spacing +96 added lines, -97 removed lines

@@ -7,13 +7,13 @@ 
  */
 
 /** 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 ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('General Settings');
 $parent_file = 'options-general.php';
@@ -22,35 +22,35 @@ 
 
 add_action('admin_head', 'options_general_add_js');
 
-$options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
-	'<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>';
+$options_help = '<p>'.__('The fields on this screen determine some of the basics of your site setup.').'</p>'.
+	'<p>'.__('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.').'</p>';
 
-if ( ! is_multisite() ) {
-	$options_help .= '<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
-		'<p>' . __('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.') . '</p>';
+if ( ! is_multisite()) {
+	$options_help .= '<p>'.__('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.').'</p>'.
+		'<p>'.__('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.').'</p>';
 }
 
-$options_help .= '<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
-	'<p>' . __( 'UTC means Coordinated Universal Time.' ) . '</p>' .
-	'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>';
+$options_help .= '<p>'.__('You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).').'</p>'.
+	'<p>'.__('UTC means Coordinated Universal Time.').'</p>'.
+	'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $options_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_General_Screen" target="_blank">Documentation on General Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_General_Screen" target="_blank">Documentation on General Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php" novalidate="novalidate">
 <?php settings_fields('general'); ?>
@@ -63,24 +63,24 @@ 
 <tr>
 <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
 <td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
+<p class="description" id="tagline-description"><?php _e('In a few words, explain what this site is about.') ?></p></td>
 </tr>
-<?php if ( !is_multisite() ) { ?>
+<?php if ( ! is_multisite()) { ?>
 <tr>
 <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled(defined('WP_SITEURL')); ?> class="regular-text code<?php if (defined('WP_SITEURL')) echo ' disabled' ?>" /></td>
 </tr>
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option('home'); ?>"<?php disabled(defined('WP_HOME')); ?> class="regular-text code<?php if (defined('WP_HOME')) echo ' disabled' ?>" />
+<?php if ( ! defined('WP_HOME')) : ?>
+<p class="description" id="home-description"><?php _e('Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>'); ?></p></td>
 <?php endif; ?>
 </tr>
 <tr>
 <th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
-<td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="admin-email-description"><?php _e( 'This address is used for admin purposes, like new user notification.' ) ?></p></td>
+<td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
+<p class="description" id="admin-email-description"><?php _e('This address is used for admin purposes, like new user notification.') ?></p></td>
 </tr>
 <tr>
 <th scope="row"><?php _e('Membership') ?></th>
@@ -92,28 +92,28 @@ 
 <tr>
 <th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
 <td>
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
+<select name="default_role" id="default_role"><?php wp_dropdown_roles(get_option('default_role')); ?></select>
 </td>
 </tr>
 <?php } else { ?>
 <tr>
 <th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
-<td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
+<td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
+<p class="description" id="new-admin-email-description"><?php _e('This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></p>
 <?php
-$new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
+$new_admin_email = get_option('new_admin_email');
+if ($new_admin_email && $new_admin_email != get_option('admin_email')) : ?>
 <div class="updated inline">
 <p><?php
 	printf(
 		/* translators: %s: new admin email */
-		__( 'There is a pending change of the admin email to %s.' ),
-		'<code>' . esc_html( $new_admin_email ) . '</code>'
+		__('There is a pending change of the admin email to %s.'),
+		'<code>'.esc_html($new_admin_email).'</code>'
 	);
 	printf(
 		' <a href="%1$s">%2$s</a>',
-		esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
-		__( 'Cancel' )
+		esc_url(wp_nonce_url(admin_url('options.php?dismiss=new_admin_email'), 'dismiss-'.get_current_blog_id().'-new_admin_email')),
+		__('Cancel')
 	);
 ?></p>
 </div>
@@ -129,17 +129,17 @@ 
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
+if (false !== strpos($tzstring, 'Etc/GMT'))
 	$tzstring = '';
 
-if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
+if (empty($tzstring)) { // Create a UTC+- zone if no timezone string exists
 	$check_zone_info = false;
-	if ( 0 == $current_offset )
+	if (0 == $current_offset)
 		$tzstring = 'UTC+0';
 	elseif ($current_offset < 0)
-		$tzstring = 'UTC' . $current_offset;
+		$tzstring = 'UTC'.$current_offset;
 	else
-		$tzstring = 'UTC+' . $current_offset;
+		$tzstring = 'UTC+'.$current_offset;
 }
 
 ?>
@@ -150,34 +150,34 @@ 
 <?php echo wp_timezone_choice($tzstring); ?>
 </select>
 
-<p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
+<p class="description" id="timezone-description"><?php _e('Choose a city in the same timezone as you.'); ?></p>
 
 <p class="timezone-info">
 	<span id="utc-time"><?php
 		/* translators: 1: UTC abbreviation, 2: UTC time */
-		printf( __( 'Universal time (%1$s) is %2$s.' ),
-			'<abbr>' . __( 'UTC' ) . '</abbr>',
-			'<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>'
+		printf(__('Universal time (%1$s) is %2$s.'),
+			'<abbr>'.__('UTC').'</abbr>',
+			'<code>'.date_i18n($timezone_format, false, 'gmt').'</code>'
 		);
 	?></span>
-<?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
+<?php if (get_option('timezone_string') || ! empty($current_offset)) : ?>
 	<span id="local-time"><?php
 		/* translators: %s: local time */
-		printf( __( 'Local time is %s.' ),
-			'<code>' . date_i18n( $timezone_format ) . '</code>'
+		printf(__('Local time is %s.'),
+			'<code>'.date_i18n($timezone_format).'</code>'
 		);
 	?></span>
 <?php endif; ?>
 </p>
 
-<?php if ( $check_zone_info && $tzstring ) : ?>
+<?php if ($check_zone_info && $tzstring) : ?>
 <p class="timezone-info">
 <span>
 	<?php
 	// Set TZ so localtime works.
 	date_default_timezone_set($tzstring);
 	$now = localtime(time(), true);
-	if ( $now['tm_isdst'] )
+	if ($now['tm_isdst'])
 		_e('This timezone is currently in daylight saving time.');
 	else
 		_e('This timezone is currently in standard time.');
@@ -186,34 +186,33 @@ 
 	<?php
 	$allowed_zones = timezone_identifiers_list();
 
-	if ( in_array( $tzstring, $allowed_zones) ) {
+	if (in_array($tzstring, $allowed_zones)) {
 		$found = false;
 		$date_time_zone_selected = new DateTimeZone($tzstring);
 		$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
 		$right_now = time();
-		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
-			if ( $tr['ts'] > $right_now ) {
+		foreach (timezone_transitions_get($date_time_zone_selected) as $tr) {
+			if ($tr['ts'] > $right_now) {
 			    $found = true;
 				break;
 			}
 		}
 
-		if ( $found ) {
+		if ($found) {
 			echo ' ';
 			$message = $tr['isdst'] ?
 				/* translators: %s: date and time  */
-				__( 'Daylight saving time begins on: %s.')  :
-				/* translators: %s: date and time  */
-				__( 'Standard time begins on: %s.' );
+				__('Daylight saving time begins on: %s.') : /* translators: %s: date and time  */
+				__('Standard time begins on: %s.');
 			// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-			printf( $message,
-				'<code>' . date_i18n(
-					__( 'F j, Y' ) . ' ' . __( 'g:i a' ),
-					$tr['ts'] + ( $tz_offset - $tr['offset'] )
-				) . '</code>'
+			printf($message,
+				'<code>'.date_i18n(
+					__('F j, Y').' '.__('g:i a'),
+					$tr['ts'] + ($tz_offset - $tr['offset'])
+				).'</code>'
 			);
 		} else {
-			_e( 'This timezone does not observe daylight saving time.' );
+			_e('This timezone does not observe daylight saving time.');
 		}
 	}
 	// Set back to UTC.
@@ -238,25 +237,25 @@ 
 	*
 	* @param array $default_date_formats Array of default date formats.
 	*/
-	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
+	$date_formats = array_unique(apply_filters('date_formats', array(__('F j, Y'), 'Y-m-d', 'm/d/Y', 'd/m/Y')));
 
 	$custom = true;
 
-	foreach ( $date_formats as $format ) {
-		echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
-		if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
+	foreach ($date_formats as $format) {
+		echo "\t<label><input type='radio' name='date_format' value='".esc_attr($format)."'";
+		if (get_option('date_format') === $format) { // checked() uses "==" rather than "==="
 			echo " checked='checked'";
 			$custom = false;
 		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+		echo ' /> <span class="date-time-text format-i18n">'.date_i18n($format).'</span><code>'.esc_html($format)."</code></label><br />\n";
 	}
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
-	checked( $custom );
-	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></label>' .
-		'<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label>' .
-		'<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" /></span>' .
-		'<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'date_format' ) ) . '</span>' .
+	checked($custom);
+	echo '/> <span class="date-time-text date-time-custom-text">'.__('Custom:').'<span class="screen-reader-text"> '.__('enter a custom date format in the following field').'</span></label>'.
+		'<label for="date_format_custom" class="screen-reader-text">'.__('Custom date format:').'</label>'.
+		'<input type="text" name="date_format_custom" id="date_format_custom" value="'.esc_attr(get_option('date_format')).'" class="small-text" /></span>'.
+		'<span class="screen-reader-text">'.__('example:').' </span> <span class="example">'.date_i18n(get_option('date_format')).'</span>'.
 		"<span class='spinner'></span>\n";
 ?>
 	</fieldset>
@@ -274,28 +273,28 @@ 
 	*
 	* @param array $default_time_formats Array of default time formats.
 	*/
-	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
+	$time_formats = array_unique(apply_filters('time_formats', array(__('g:i a'), 'g:i A', 'H:i')));
 
 	$custom = true;
 
-	foreach ( $time_formats as $format ) {
-		echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
-		if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
+	foreach ($time_formats as $format) {
+		echo "\t<label><input type='radio' name='time_format' value='".esc_attr($format)."'";
+		if (get_option('time_format') === $format) { // checked() uses "==" rather than "==="
 			echo " checked='checked'";
 			$custom = false;
 		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+		echo ' /> <span class="date-time-text format-i18n">'.date_i18n($format).'</span><code>'.esc_html($format)."</code></label><br />\n";
 	}
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
-	checked( $custom );
-	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></label>' .
-		'<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label>' .
-		'<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" /></span>' .
-		'<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
+	checked($custom);
+	echo '/> <span class="date-time-text date-time-custom-text">'.__('Custom:').'<span class="screen-reader-text"> '.__('enter a custom time format in the following field').'</span></label>'.
+		'<label for="time_format_custom" class="screen-reader-text">'.__('Custom time format:').'</label>'.
+		'<input type="text" name="time_format_custom" id="time_format_custom" value="'.esc_attr(get_option('time_format')).'" class="small-text" /></span>'.
+		'<span class="screen-reader-text">'.__('example:').' </span> <span class="example">'.date_i18n(get_option('time_format')).'</span>'.
 		"<span class='spinner'></span>\n";
 
-	echo "\t<p class='date-time-doc'>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
+	echo "\t<p class='date-time-doc'>".__('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.')."</p>\n";
 ?>
 	</fieldset>
 </td>
@@ -311,7 +310,7 @@ 
 
 for ($day_index = 0; $day_index <= 6; $day_index++) :
 	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
-	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
+	echo "\n\t<option value='".esc_attr($day_index)."' $selected>".$wp_locale->get_weekday($day_index).'</option>';
 endfor;
 ?>
 </select></td>
@@ -321,39 +320,39 @@ 
 <?php
 $languages = get_available_languages();
 $translations = wp_get_available_translations();
-if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
+if ( ! is_multisite() && defined('WPLANG') && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array(WPLANG, $languages)) {
 	$languages[] = WPLANG;
 }
-if ( ! empty( $languages ) || ! empty( $translations ) ) {
+if ( ! empty($languages) || ! empty($translations)) {
 	?>
 	<tr>
-		<th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
+		<th width="33%" scope="row"><label for="WPLANG"><?php _e('Site Language'); ?></label></th>
 		<td>
 			<?php
 			$locale = get_locale();
-			if ( ! in_array( $locale, $languages ) ) {
+			if ( ! in_array($locale, $languages)) {
 				$locale = '';
 			}
 
-			wp_dropdown_languages( array(
+			wp_dropdown_languages(array(
 				'name'         => 'WPLANG',
 				'id'           => 'WPLANG',
 				'selected'     => $locale,
 				'languages'    => $languages,
 				'translations' => $translations,
-				'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
-			) );
+				'show_available_translations' => ( ! is_multisite() || is_super_admin()) && wp_can_install_language_pack(),
+			));
 
 			// Add note about deprecated WPLANG constant.
-			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
-				if ( is_super_admin() ) {
+			if (defined('WPLANG') && ('' !== WPLANG) && $locale !== WPLANG) {
+				if (is_super_admin()) {
 					?>
 					<p class="description">
-						<strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
+						<strong><?php _e('Note:'); ?></strong> <?php printf(__('The %s constant in your %s file is no longer needed.'), '<code>WPLANG</code>', '<code>wp-config.php</code>'); ?>
 					</p>
 					<?php
 				}
-				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
+				_deprecated_argument('define()', '4.0.0', sprintf(__('The %s constant in your %s file is no longer needed.'), 'WPLANG', 'wp-config.php'));
 			}
 			?>
 		</td>
@@ -370,4 +369,4 @@ 
 
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/update.php

Spacing +112 added lines, -112 removed lines

@@ -6,99 +6,99 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
-	define( 'IFRAME_REQUEST', true );
+if ( ! defined('IFRAME_REQUEST') && isset($_GET['action']) && in_array($_GET['action'], array('update-selected', 'activate-plugin', 'update-selected-themes')))
+	define('IFRAME_REQUEST', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
-if ( isset($_GET['action']) ) {
+if (isset($_GET['action'])) {
 	$plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
 	$theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+	if ('update-selected' == $action) {
+		if ( ! current_user_can('update_plugins'))
+			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
 
-		check_admin_referer( 'bulk-update-plugins' );
+		check_admin_referer('bulk-update-plugins');
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if (isset($_GET['plugins']))
+			$plugins = explode(',', stripslashes($_GET['plugins']));
+		elseif (isset($_POST['checked']))
 			$plugins = (array) $_POST['checked'];
 		else
 			$plugins = array();
 
 		$plugins = array_map('urldecode', $plugins);
 
-		$url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
+		$url = 'update.php?action=update-selected&plugins='.urlencode(implode(',', $plugins));
 		$nonce = 'bulk-update-plugins';
 
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('updates');
 		iframe_header();
 
-		$upgrader = new Plugin_Upgrader( new Bulk_Plugin_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
-		$upgrader->bulk_upgrade( $plugins );
+		$upgrader = new Plugin_Upgrader(new Bulk_Plugin_Upgrader_Skin(compact('nonce', 'url')));
+		$upgrader->bulk_upgrade($plugins);
 
 		iframe_footer();
 
-	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
+	} elseif ('upgrade-plugin' == $action) {
+		if ( ! current_user_can('update_plugins'))
 			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
 
-		check_admin_referer('upgrade-plugin_' . $plugin);
+		check_admin_referer('upgrade-plugin_'.$plugin);
 
 		$title = __('Update Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugins.php';
 
-		wp_enqueue_script( 'updates' );
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		wp_enqueue_script('updates');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$nonce = 'upgrade-plugin_' . $plugin;
-		$url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
+		$nonce = 'upgrade-plugin_'.$plugin;
+		$url = 'update.php?action=upgrade-plugin&plugin='.urlencode($plugin);
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
+		$upgrader = new Plugin_Upgrader(new Plugin_Upgrader_Skin(compact('title', 'nonce', 'url', 'plugin')));
 		$upgrader->upgrade($plugin);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
+	} elseif ('activate-plugin' == $action) {
+		if ( ! current_user_can('update_plugins'))
 			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
 
-		check_admin_referer('activate-plugin_' . $plugin);
-		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-			wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
-			activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-			wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
+		check_admin_referer('activate-plugin_'.$plugin);
+		if ( ! isset($_GET['failure']) && ! isset($_GET['success'])) {
+			wp_redirect(admin_url('update.php?action=activate-plugin&failure=true&plugin='.urlencode($plugin).'&_wpnonce='.$_GET['_wpnonce']));
+			activate_plugin($plugin, '', ! empty($_GET['networkwide']), true);
+			wp_redirect(admin_url('update.php?action=activate-plugin&success=true&plugin='.urlencode($plugin).'&_wpnonce='.$_GET['_wpnonce']));
 			die();
 		}
-		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		iframe_header(__('Plugin Reactivation'), true);
+		if (isset($_GET['success']))
+			echo '<p>'.__('Plugin reactivated successfully.').'</p>';
 
-		if ( isset($_GET['failure']) ){
-			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
+		if (isset($_GET['failure'])) {
+			echo '<p>'.__('Plugin failed to reactivate due to a fatal error.').'</p>';
 
-			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+			error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
-			wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-			include( WP_PLUGIN_DIR . '/' . $plugin );
+			wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
+			include(WP_PLUGIN_DIR.'/'.$plugin);
 		}
 		iframe_footer();
-	} elseif ( 'install-plugin' == $action ) {
+	} elseif ('install-plugin' == $action) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins'))
+			wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
 
-		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
+		include_once(ABSPATH.'wp-admin/includes/plugin-install.php'); //for plugins_api..
 
-		check_admin_referer( 'install-plugin_' . $plugin );
-		$api = plugins_api( 'plugin_information', array(
+		check_admin_referer('install-plugin_'.$plugin);
+		$api = plugins_api('plugin_information', array(
 			'slug' => $plugin,
 			'fields' => array(
 				'short_description' => false,
@@ -114,34 +114,34 @@ 
 				'homepage' => false,
 				'donate_link' => false,
 			),
-		) );
+		));
 
-		if ( is_wp_error( $api ) ) {
-	 		wp_die( $api );
+		if (is_wp_error($api)) {
+	 		wp_die($api);
 		}
 
 		$title = __('Plugin Install');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
-		$nonce = 'install-plugin_' . $plugin;
-		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		$title = sprintf(__('Installing Plugin: %s'), $api->name.' '.$api->version);
+		$nonce = 'install-plugin_'.$plugin;
+		$url = 'update.php?action=install-plugin&plugin='.urlencode($plugin);
+		if (isset($_GET['from']))
+			$url .= '&from='.urlencode(stripslashes($_GET['from']));
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+		$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
 		$upgrader->install($api->download_link);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upload-plugin' == $action ) {
+	} elseif ('upload-plugin' == $action) {
 
-		if ( ! current_user_can( 'upload_plugins' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('upload_plugins')) {
+			wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
 		}
 
 		check_admin_referer('plugin-upload');
@@ -151,128 +151,128 @@ 
 		$title = __('Upload Plugin');
 		$parent_file = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf(__('Installing Plugin from uploaded file: %s'), esc_html(basename($file_upload->filename)));
 		$nonce = 'plugin-upload';
 		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
 		$type = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Plugin_Upgrader(new Plugin_Installer_Skin(compact('type', 'title', 'nonce', 'url')));
+		$result = $upgrader->install($file_upload->package);
 
-		if ( $result || is_wp_error($result) )
+		if ($result || is_wp_error($result))
 			$file_upload->cleanup();
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upgrade-theme' == $action ) {
+	} elseif ('upgrade-theme' == $action) {
 
-		if ( ! current_user_can('update_themes') )
+		if ( ! current_user_can('update_themes'))
 			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
 
-		check_admin_referer('upgrade-theme_' . $theme);
+		check_admin_referer('upgrade-theme_'.$theme);
 
-		wp_enqueue_script( 'customize-loader' );
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('customize-loader');
+		wp_enqueue_script('updates');
 
 		$title = __('Update Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$nonce = 'upgrade-theme_' . $theme;
-		$url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
+		$nonce = 'upgrade-theme_'.$theme;
+		$url = 'update.php?action=upgrade-theme&theme='.urlencode($theme);
 
-		$upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
+		$upgrader = new Theme_Upgrader(new Theme_Upgrader_Skin(compact('title', 'nonce', 'url', 'theme')));
 		$upgrader->upgrade($theme);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
-	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		include(ABSPATH.'wp-admin/admin-footer.php');
+	} elseif ('update-selected-themes' == $action) {
+		if ( ! current_user_can('update_themes'))
+			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
 
-		check_admin_referer( 'bulk-update-themes' );
+		check_admin_referer('bulk-update-themes');
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if (isset($_GET['themes']))
+			$themes = explode(',', stripslashes($_GET['themes']));
+		elseif (isset($_POST['checked']))
 			$themes = (array) $_POST['checked'];
 		else
 			$themes = array();
 
 		$themes = array_map('urldecode', $themes);
 
-		$url = 'update.php?action=update-selected-themes&amp;themes=' . urlencode(implode(',', $themes));
+		$url = 'update.php?action=update-selected-themes&amp;themes='.urlencode(implode(',', $themes));
 		$nonce = 'bulk-update-themes';
 
-		wp_enqueue_script( 'updates' );
+		wp_enqueue_script('updates');
 		iframe_header();
 
-		$upgrader = new Theme_Upgrader( new Bulk_Theme_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
-		$upgrader->bulk_upgrade( $themes );
+		$upgrader = new Theme_Upgrader(new Bulk_Theme_Upgrader_Skin(compact('nonce', 'url')));
+		$upgrader->bulk_upgrade($themes);
 
 		iframe_footer();
-	} elseif ( 'install-theme' == $action ) {
+	} elseif ('install-theme' == $action) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes'))
+			wp_die(__('Sorry, you are not allowed to install themes on this site.'));
 
-		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
+		include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php'); //for themes_api..
 
-		check_admin_referer( 'install-theme_' . $theme );
-		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		check_admin_referer('install-theme_'.$theme);
+		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false))); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
+		if (is_wp_error($api))
 	 		wp_die($api);
 
-		wp_enqueue_script( 'customize-loader' );
+		wp_enqueue_script('customize-loader');
 
 		$title = __('Install Themes');
 		$parent_file = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
-		$nonce = 'install-theme_' . $theme;
-		$url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
+		$title = sprintf(__('Installing Theme: %s'), $api->name.' '.$api->version);
+		$nonce = 'install-theme_'.$theme;
+		$url = 'update.php?action=install-theme&theme='.urlencode($theme);
 		$type = 'web'; //Install theme type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
+		$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('title', 'url', 'nonce', 'plugin', 'api')));
 		$upgrader->install($api->download_link);
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
-	} elseif ( 'upload-theme' == $action ) {
+	} elseif ('upload-theme' == $action) {
 
-		if ( ! current_user_can( 'upload_themes' ) ) {
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('upload_themes')) {
+			wp_die(__('Sorry, you are not allowed to install themes on this site.'));
 		}
 
 		check_admin_referer('theme-upload');
 
 		$file_upload = new File_Upload_Upgrader('themezip', 'package');
 
-		wp_enqueue_script( 'customize-loader' );
+		wp_enqueue_script('customize-loader');
 
 		$title = __('Upload Theme');
 		$parent_file = 'themes.php';
 		$submenu_file = 'theme-install.php';
 
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		$title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf(__('Installing Theme from uploaded file: %s'), esc_html(basename($file_upload->filename)));
 		$nonce = 'theme-upload';
 		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
 		$type = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Theme_Upgrader(new Theme_Installer_Skin(compact('type', 'title', 'nonce', 'url')));
+		$result = $upgrader->install($file_upload->package);
 
-		if ( $result || is_wp_error($result) )
+		if ($result || is_wp_error($result))
 			$file_upload->cleanup();
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 
 	} else {
 		/**
@@ -284,6 +284,6 @@ 
 		 *
 		 * @since 2.8.0
 		 */
-		do_action( "update-custom_{$action}" );
+		do_action("update-custom_{$action}");
 	}
 }

Braces +52 added lines, -37 removed lines

@@ -6,8 +6,9 @@ 
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -20,17 +21,19 @@ 
 	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
 	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
-			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		if ( ! current_user_can( 'update_plugins' ) ) {
+					wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-plugins' );
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$plugins = (array) $_POST['checked'];
-		else
-			$plugins = array();
+		if ( isset( $_GET['plugins'] ) ) {
+					$plugins = explode( ',', stripslashes($_GET['plugins']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$plugins = (array) $_POST['checked'];
+		} else {
+					$plugins = array();
+		}
 
 		$plugins = array_map('urldecode', $plugins);
 
@@ -46,8 +49,9 @@ 
 		iframe_footer();
 
 	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		}
 
 		check_admin_referer('upgrade-plugin_' . $plugin);
 
@@ -67,8 +71,9 @@ 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		}
 
 		check_admin_referer('activate-plugin_' . $plugin);
 		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
@@ -78,8 +83,9 @@ 
 			die();
 		}
 		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		if ( isset($_GET['success']) ) {
+					echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		}
 
 		if ( isset($_GET['failure']) ){
 			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
@@ -92,8 +98,9 @@ 
 		iframe_footer();
 	} elseif ( 'install-plugin' == $action ) {
 
-		if ( ! current_user_can('install_plugins') )
-			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins') ) {
+					wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
@@ -128,8 +135,9 @@ 
 		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
 		$nonce = 'install-plugin_' . $plugin;
 		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		if ( isset($_GET['from']) ) {
+					$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		}
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
@@ -161,15 +169,17 @@ 
 		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 
 	} elseif ( 'upgrade-theme' == $action ) {
 
-		if ( ! current_user_can('update_themes') )
-			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		if ( ! current_user_can('update_themes') ) {
+					wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		}
 
 		check_admin_referer('upgrade-theme_' . $theme);
 
@@ -189,17 +199,19 @@ 
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
-			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		if ( ! current_user_can( 'update_themes' ) ) {
+					wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-themes' );
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
-			$themes = (array) $_POST['checked'];
-		else
-			$themes = array();
+		if ( isset( $_GET['themes'] ) ) {
+					$themes = explode( ',', stripslashes($_GET['themes']) );
+		} elseif ( isset( $_POST['checked'] ) ) {
+					$themes = (array) $_POST['checked'];
+		} else {
+					$themes = array();
+		}
 
 		$themes = array_map('urldecode', $themes);
 
@@ -215,16 +227,18 @@ 
 		iframe_footer();
 	} elseif ( 'install-theme' == $action ) {
 
-		if ( ! current_user_can('install_themes') )
-			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes') ) {
+					wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
 
 		check_admin_referer( 'install-theme_' . $theme );
 		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
-		if ( is_wp_error($api) )
-	 		wp_die($api);
+		if ( is_wp_error($api) ) {
+			 		wp_die($api);
+		}
 
 		wp_enqueue_script( 'customize-loader' );
 
@@ -269,8 +283,9 @@ 
 		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
 		$result = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
-			$file_upload->cleanup();
+		if ( $result || is_wp_error($result) ) {
+					$file_upload->cleanup();
+		}
 
 		include(ABSPATH . 'wp-admin/admin-footer.php');
 

src/wp-admin/plugins.php

Spacing +197 added lines, -197 removed lines

@@ -7,10 +7,10 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can('activate_plugins') )
-	wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
+if ( ! current_user_can('activate_plugins'))
+	wp_die(__('Sorry, you are not allowed to manage plugins for this site.'));
 
 $wp_list_table = _get_list_table('WP_Plugins_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -18,302 +18,302 @@ 
 $action = $wp_list_table->current_action();
 
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
-$s = isset($_REQUEST['s']) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : '';
+$s = isset($_REQUEST['s']) ? urlencode(wp_unslash($_REQUEST['s'])) : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
 $_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
 
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('updates');
 
-if ( $action ) {
+if ($action) {
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'activate':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
 
-			if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if (is_multisite() && ! is_network_admin() && is_network_only_plugin($plugin)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			check_admin_referer('activate-plugin_' . $plugin);
+			check_admin_referer('activate-plugin_'.$plugin);
 
-			$result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
-			if ( is_wp_error( $result ) ) {
-				if ( 'unexpected_output' == $result->get_error_code() ) {
-					$redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
-					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+			$result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin='.$plugin), is_network_admin());
+			if (is_wp_error($result)) {
+				if ('unexpected_output' == $result->get_error_code()) {
+					$redirect = self_admin_url('plugins.php?error=true&charsout='.strlen($result->get_error_data()).'&plugin='.$plugin."&plugin_status=$status&paged=$page&s=$s");
+					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_'.$plugin), $redirect));
 					exit;
 				} else {
 					wp_die($result);
 				}
 			}
 
-			if ( ! is_network_admin() ) {
-				$recent = (array) get_option( 'recently_activated' );
-				unset( $recent[ $plugin ] );
-				update_option( 'recently_activated', $recent );
+			if ( ! is_network_admin()) {
+				$recent = (array) get_option('recently_activated');
+				unset($recent[$plugin]);
+				update_option('recently_activated', $recent);
 			} else {
-				$recent = (array) get_site_option( 'recently_activated' );
-				unset( $recent[ $plugin ] );
-				update_site_option( 'recently_activated', $recent );
+				$recent = (array) get_site_option('recently_activated');
+				unset($recent[$plugin]);
+				update_site_option('recently_activated', $recent);
 			}
 
-			if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
-				wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
+			if (isset($_GET['from']) && 'import' == $_GET['from']) {
+				wp_redirect(self_admin_url("import.php?import=".str_replace('-importer', '', dirname($plugin)))); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
 			} else {
-				wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
+				wp_redirect(self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s")); // overrides the ?error=true one above
 			}
 			exit;
 
 		case 'activate-selected':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
 
 			check_admin_referer('bulk-plugins');
 
-			$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+			$plugins = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
 
-			if ( is_network_admin() ) {
-				foreach ( $plugins as $i => $plugin ) {
+			if (is_network_admin()) {
+				foreach ($plugins as $i => $plugin) {
 					// Only activate plugins which are not already network activated.
-					if ( is_plugin_active_for_network( $plugin ) ) {
-						unset( $plugins[ $i ] );
+					if (is_plugin_active_for_network($plugin)) {
+						unset($plugins[$i]);
 					}
 				}
 			} else {
-				foreach ( $plugins as $i => $plugin ) {
+				foreach ($plugins as $i => $plugin) {
 					// Only activate plugins which are not already active and are not network-only when on Multisite.
-					if ( is_plugin_active( $plugin ) || ( is_multisite() && is_network_only_plugin( $plugin ) ) ) {
-						unset( $plugins[ $i ] );
+					if (is_plugin_active($plugin) || (is_multisite() && is_network_only_plugin($plugin))) {
+						unset($plugins[$i]);
 					}
 				}
 			}
 
-			if ( empty($plugins) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			activate_plugins($plugins, self_admin_url('plugins.php?error=true'), is_network_admin() );
+			activate_plugins($plugins, self_admin_url('plugins.php?error=true'), is_network_admin());
 
-			if ( ! is_network_admin() ) {
-				$recent = (array) get_option('recently_activated' );
+			if ( ! is_network_admin()) {
+				$recent = (array) get_option('recently_activated');
 			} else {
-				$recent = (array) get_site_option('recently_activated' );
+				$recent = (array) get_site_option('recently_activated');
 			}
 
-			foreach ( $plugins as $plugin ) {
-				unset( $recent[ $plugin ] );
+			foreach ($plugins as $plugin) {
+				unset($recent[$plugin]);
 			}
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', $recent );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', $recent);
 			} else {
-				update_site_option( 'recently_activated', $recent );
+				update_site_option('recently_activated', $recent);
 			}
 
-			wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+			wp_redirect(self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'update-selected' :
 
-			check_admin_referer( 'bulk-plugins' );
+			check_admin_referer('bulk-plugins');
 
-			if ( isset( $_GET['plugins'] ) )
-				$plugins = explode( ',', $_GET['plugins'] );
-			elseif ( isset( $_POST['checked'] ) )
+			if (isset($_GET['plugins']))
+				$plugins = explode(',', $_GET['plugins']);
+			elseif (isset($_POST['checked']))
 				$plugins = (array) $_POST['checked'];
 			else
 				$plugins = array();
 
-			$title = __( 'Update Plugins' );
+			$title = __('Update Plugins');
 			$parent_file = 'plugins.php';
 
-			wp_enqueue_script( 'updates' );
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+			wp_enqueue_script('updates');
+			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&amp;plugins=' . urlencode( join(',', $plugins) ));
+			$url = self_admin_url('update.php?action=update-selected&amp;plugins='.urlencode(join(',', $plugins)));
 			$url = wp_nonce_url($url, 'bulk-update-plugins');
 
 			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 'error_scrape':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
 
-			check_admin_referer('plugin-activation-error_' . $plugin);
+			check_admin_referer('plugin-activation-error_'.$plugin);
 
 			$valid = validate_plugin($plugin);
-			if ( is_wp_error($valid) )
+			if (is_wp_error($valid))
 				wp_die($valid);
 
-			if ( ! WP_DEBUG ) {
-				error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+			if ( ! WP_DEBUG) {
+				error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 			}
 
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 			// Go back to "sandbox" scope so we get the same errors as before
-			plugin_sandbox_scrape( $plugin );
+			plugin_sandbox_scrape($plugin);
 			/** This action is documented in wp-admin/includes/plugin.php */
-			do_action( "activate_{$plugin}" );
+			do_action("activate_{$plugin}");
 			exit;
 
 		case 'deactivate':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
 
-			check_admin_referer('deactivate-plugin_' . $plugin);
+			check_admin_referer('deactivate-plugin_'.$plugin);
 
-			if ( ! is_network_admin() && is_plugin_active_for_network( $plugin ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if ( ! is_network_admin() && is_plugin_active_for_network($plugin)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			deactivate_plugins( $plugin, false, is_network_admin() );
+			deactivate_plugins($plugin, false, is_network_admin());
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', array($plugin => time()) + (array) get_option('recently_activated'));
 			} else {
-				update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
+				update_site_option('recently_activated', array($plugin => time()) + (array) get_site_option('recently_activated'));
 			}
 
-			if ( headers_sent() )
-				echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
+			if (headers_sent())
+				echo "<meta http-equiv='refresh' content='".esc_attr("0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s")."' />";
 			else
-				wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+				wp_redirect(self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'deactivate-selected':
-			if ( ! current_user_can('activate_plugins') )
+			if ( ! current_user_can('activate_plugins'))
 				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
 
 			check_admin_referer('bulk-plugins');
 
-			$plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+			$plugins = isset($_POST['checked']) ? (array) $_POST['checked'] : array();
 			// Do not deactivate plugins which are already deactivated.
-			if ( is_network_admin() ) {
-				$plugins = array_filter( $plugins, 'is_plugin_active_for_network' );
+			if (is_network_admin()) {
+				$plugins = array_filter($plugins, 'is_plugin_active_for_network');
 			} else {
-				$plugins = array_filter( $plugins, 'is_plugin_active' );
-				$plugins = array_diff( $plugins, array_filter( $plugins, 'is_plugin_active_for_network' ) );
+				$plugins = array_filter($plugins, 'is_plugin_active');
+				$plugins = array_diff($plugins, array_filter($plugins, 'is_plugin_active_for_network'));
 			}
-			if ( empty($plugins) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			deactivate_plugins( $plugins, false, is_network_admin() );
+			deactivate_plugins($plugins, false, is_network_admin());
 
 			$deactivated = array();
-			foreach ( $plugins as $plugin ) {
-				$deactivated[ $plugin ] = time();
+			foreach ($plugins as $plugin) {
+				$deactivated[$plugin] = time();
 			}
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', $deactivated + (array) get_option('recently_activated'));
 			} else {
-				update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
+				update_site_option('recently_activated', $deactivated + (array) get_site_option('recently_activated'));
 			}
 
-			wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+			wp_redirect(self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'delete-selected':
-			if ( ! current_user_can('delete_plugins') ) {
+			if ( ! current_user_can('delete_plugins')) {
 				wp_die(__('Sorry, you are not allowed to delete plugins for this site.'));
 			}
 
 			check_admin_referer('bulk-plugins');
 
 			//$_POST = from the plugin form; $_GET = from the FTP details screen.
-			$plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
-			if ( empty( $plugins ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			$plugins = isset($_REQUEST['checked']) ? (array) $_REQUEST['checked'] : array();
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
 			$plugins = array_filter($plugins, 'is_plugin_inactive'); // Do not allow to delete Activated plugins.
-			if ( empty( $plugins ) ) {
-				wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s" ) );
+			if (empty($plugins)) {
+				wp_redirect(self_admin_url("plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s"));
 				exit;
 			}
 
-			include(ABSPATH . 'wp-admin/update.php');
+			include(ABSPATH.'wp-admin/update.php');
 
 			$parent_file = 'plugins.php';
 
-			if ( ! isset($_REQUEST['verify-delete']) ) {
+			if ( ! isset($_REQUEST['verify-delete'])) {
 				wp_enqueue_script('jquery');
-				require_once(ABSPATH . 'wp-admin/admin-header.php');
+				require_once(ABSPATH.'wp-admin/admin-header.php');
 				?>
 			<div class="wrap">
 				<?php
 					$plugin_info = array();
 					$have_non_network_plugins = false;
-					foreach ( (array) $plugins as $plugin ) {
-						$plugin_slug = dirname( $plugin );
-
-						if ( '.' == $plugin_slug ) {
-							if ( $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) ) {
-								$plugin_info[ $plugin ] = $data;
-								$plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
-								if ( ! $plugin_info[ $plugin ]['Network'] ) {
+					foreach ((array) $plugins as $plugin) {
+						$plugin_slug = dirname($plugin);
+
+						if ('.' == $plugin_slug) {
+							if ($data = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin)) {
+								$plugin_info[$plugin] = $data;
+								$plugin_info[$plugin]['is_uninstallable'] = is_uninstallable_plugin($plugin);
+								if ( ! $plugin_info[$plugin]['Network']) {
 									$have_non_network_plugins = true;
 								}
 							}
 						} else {
 							// Get plugins list from that folder.
-							if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) {
-								foreach ( $folder_plugins as $plugin_file => $data ) {
-									$plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data );
-									$plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
-									if ( ! $plugin_info[ $plugin_file ]['Network'] ) {
+							if ($folder_plugins = get_plugins('/'.$plugin_slug)) {
+								foreach ($folder_plugins as $plugin_file => $data) {
+									$plugin_info[$plugin_file] = _get_plugin_data_markup_translate($plugin_file, $data);
+									$plugin_info[$plugin_file]['is_uninstallable'] = is_uninstallable_plugin($plugin);
+									if ( ! $plugin_info[$plugin_file]['Network']) {
 										$have_non_network_plugins = true;
 									}
 								}
 							}
 						}
 					}
-					$plugins_to_delete = count( $plugin_info );
+					$plugins_to_delete = count($plugin_info);
 				?>
-				<?php if ( 1 == $plugins_to_delete ) : ?>
-					<h1><?php _e( 'Delete Plugin' ); ?></h1>
-					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
+				<?php if (1 == $plugins_to_delete) : ?>
+					<h1><?php _e('Delete Plugin'); ?></h1>
+					<?php if ($have_non_network_plugins && is_network_admin()) : ?>
+						<div class="error"><p><strong><?php _e('Caution:'); ?></strong> <?php _e('This plugin may be active on other sites in the network.'); ?></p></div>
 					<?php endif; ?>
-					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
+					<p><?php _e('You are about to remove the following plugin:'); ?></p>
 				<?php else: ?>
-					<h1><?php _e( 'Delete Plugins' ); ?></h1>
-					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
+					<h1><?php _e('Delete Plugins'); ?></h1>
+					<?php if ($have_non_network_plugins && is_network_admin()) : ?>
+						<div class="error"><p><strong><?php _e('Caution:'); ?></strong> <?php _e('These plugins may be active on other sites in the network.'); ?></p></div>
 					<?php endif; ?>
-					<p><?php _e( 'You are about to remove the following plugins:' ); ?></p>
+					<p><?php _e('You are about to remove the following plugins:'); ?></p>
 				<?php endif; ?>
 					<ul class="ul-disc">
 						<?php
 						$data_to_delete = false;
-						foreach ( $plugin_info as $plugin ) {
-							if ( $plugin['is_uninstallable'] ) {
+						foreach ($plugin_info as $plugin) {
+							if ($plugin['is_uninstallable']) {
 								/* translators: 1: plugin name, 2: plugin author */
-								echo '<li>', sprintf( __( '%1$s by %2$s (will also <strong>delete its data</strong>)' ), '<strong>' . $plugin['Name'] . '</strong>', '<em>' . $plugin['AuthorName'] . '</em>' ), '</li>';
+								echo '<li>', sprintf(__('%1$s by %2$s (will also <strong>delete its data</strong>)'), '<strong>'.$plugin['Name'].'</strong>', '<em>'.$plugin['AuthorName'].'</em>'), '</li>';
 								$data_to_delete = true;
 							} else {
 								/* translators: 1: plugin name, 2: plugin author */
-								echo '<li>', sprintf( _x('%1$s by %2$s', 'plugin' ), '<strong>' . $plugin['Name'] . '</strong>', '<em>' . $plugin['AuthorName'] ) . '</em>', '</li>';
+								echo '<li>', sprintf(_x('%1$s by %2$s', 'plugin'), '<strong>'.$plugin['Name'].'</strong>', '<em>'.$plugin['AuthorName']).'</em>', '</li>';
 							}
 						}
 						?>
 					</ul>
 				<p><?php
-				if ( $data_to_delete )
+				if ($data_to_delete)
 					_e('Are you sure you wish to delete these files and data?');
 				else
 					_e('Are you sure you wish to delete these files?');
@@ -322,38 +322,38 @@ 
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
 					<?php
-						foreach ( (array) $plugins as $plugin ) {
-							echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
+						foreach ((array) $plugins as $plugin) {
+							echo '<input type="hidden" name="checked[]" value="'.esc_attr($plugin).'" />';
 						}
 					?>
 					<?php wp_nonce_field('bulk-plugins') ?>
-					<?php submit_button( $data_to_delete ? __( 'Yes, delete these files and data' ) : __( 'Yes, delete these files' ), 'button', 'submit', false ); ?>
+					<?php submit_button($data_to_delete ? __('Yes, delete these files and data') : __('Yes, delete these files'), '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 plugin 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 plugin list'), 'button', 'submit', false); ?>
 				</form>
 			</div>
 				<?php
-				require_once(ABSPATH . 'wp-admin/admin-footer.php');
+				require_once(ABSPATH.'wp-admin/admin-footer.php');
 				exit;
 			} else {
-				$plugins_to_delete = count( $plugins );
+				$plugins_to_delete = count($plugins);
 			} // endif verify-delete
 
-			$delete_result = delete_plugins( $plugins );
+			$delete_result = delete_plugins($plugins);
 
-			set_transient('plugins_delete_result_' . $user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
-			wp_redirect( self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s") );
+			set_transient('plugins_delete_result_'.$user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
+			wp_redirect(self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s"));
 			exit;
 
 		case 'clear-recent-list':
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', array() );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', array());
 			} else {
-				update_site_option( 'recently_activated', array() );
+				update_site_option('recently_activated', array());
 			}
 			break;
 	}
@@ -364,128 +364,128 @@ 
 wp_enqueue_script('plugin-install');
 add_thickbox();
 
-add_screen_option( 'per_page', array( 'default' => 999 ) );
+add_screen_option('per_page', array('default' => 999));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
-	'<p>' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-	'<p>' . sprintf(
+	'<p>'.__('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.').'</p>'.
+	'<p>'.__('The search for installed plugins will search for terms in their name, description, or author.').' <span id="live-search-desc" class="hide-if-no-js">'.__('The search results will be updated as you type.').'</span></p>'.
+	'<p>'.sprintf(
 		/* translators: %s: WordPress Plugin Directory URL */
-		__( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s" target="_blank">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
+		__('If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s" target="_blank">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'),
 		'https://wordpress.org/plugins/'
-	) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	).'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'compatibility-problems',
 'title'		=> __('Troubleshooting'),
 'content'	=>
-	'<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
-	'<p>' . sprintf(
+	'<p>'.__('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.').'</p>'.
+	'<p>'.sprintf(
 		/* translators: WP_PLUGIN_DIR constant value */
-		__( 'If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
-		'<code>' . WP_PLUGIN_DIR . '</code>'
-	) . '</p>'
-) );
+		__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.'),
+		'<code>'.WP_PLUGIN_DIR.'</code>'
+	).'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Managing_Plugins#Plugin_Management" target="_blank">Documentation on Managing Plugins</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/Managing_Plugins#Plugin_Management" target="_blank">Documentation on Managing Plugins</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 plugins list' ),
-	'heading_pagination' => __( 'Plugins list navigation' ),
-	'heading_list'       => __( 'Plugins list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter plugins list'),
+	'heading_pagination' => __('Plugins list navigation'),
+	'heading_list'       => __('Plugins list'),
+));
 
 $title = __('Plugins');
 $parent_file = 'plugins.php';
 
-require_once(ABSPATH . 'wp-admin/admin-header.php');
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 $invalid = validate_active_plugins();
-if ( ! empty( $invalid ) ) {
-	foreach ( $invalid as $plugin_file => $error ) {
+if ( ! empty($invalid)) {
+	foreach ($invalid as $plugin_file => $error) {
 		echo '<div id="message" class="error"><p>';
 		printf(
 			/* translators: 1: plugin file 2: error message */
-			__( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
-			'<code>' . esc_html( $plugin_file ) . '</code>',
+			__('The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s'),
+			'<code>'.esc_html($plugin_file).'</code>',
 			$error->get_error_message() );
 		echo '</p></div>';
 	}
 }
 ?>
 
-<?php if ( isset($_GET['error']) ) :
+<?php if (isset($_GET['error'])) :
 
-	if ( isset( $_GET['main'] ) )
-		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
-	elseif ( isset($_GET['charsout']) )
+	if (isset($_GET['main']))
+		$errmsg = __('You cannot delete a plugin while it is active on the main site.');
+	elseif (isset($_GET['charsout']))
 		$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
 	else
 		$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
 	?>
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
-		if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
-			$iframe_url = add_query_arg( array(
+		if ( ! isset($_GET['main']) && ! isset($_GET['charsout']) && wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_'.$plugin)) {
+			$iframe_url = add_query_arg(array(
 				'action'   => 'error_scrape',
-				'plugin'   => urlencode( $plugin ),
-				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
-			), admin_url( 'plugins.php' ) );
+				'plugin'   => urlencode($plugin),
+				'_wpnonce' => urlencode($_GET['_error_nonce']),
+			), admin_url('plugins.php'));
 		?>
-		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
+		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url($iframe_url); ?>"></iframe>
 	<?php
 		}
 	?>
 	</div>
-<?php elseif ( isset($_GET['deleted']) ) :
-		$delete_result = get_transient( 'plugins_delete_result_' . $user_ID );
+<?php elseif (isset($_GET['deleted'])) :
+		$delete_result = get_transient('plugins_delete_result_'.$user_ID);
 		// Delete it once we're done.
-		delete_transient( 'plugins_delete_result_' . $user_ID );
+		delete_transient('plugins_delete_result_'.$user_ID);
 
-		if ( is_wp_error($delete_result) ) : ?>
-		<div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+		if (is_wp_error($delete_result)) : ?>
+		<div id="message" class="error notice is-dismissible"><p><?php printf(__('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message()); ?></p></div>
 		<?php else : ?>
 		<div id="message" class="updated notice is-dismissible">
 			<p>
 				<?php
-				if ( 1 == (int) $_GET['deleted'] ) {
-					_e( 'The selected plugin has been <strong>deleted</strong>.' );
+				if (1 == (int) $_GET['deleted']) {
+					_e('The selected plugin has been <strong>deleted</strong>.');
 				} else {
-					_e( 'The selected plugins have been <strong>deleted</strong>.' );
+					_e('The selected plugins have been <strong>deleted</strong>.');
 				}
 				?>
 			</p>
 		</div>
 		<?php endif; ?>
-<?php elseif ( isset($_GET['activate']) ) : ?>
+<?php elseif (isset($_GET['activate'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div>
 <?php elseif (isset($_GET['activate-multi'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>activated</strong>.'); ?></p></div>
-<?php elseif ( isset($_GET['deactivate']) ) : ?>
+<?php elseif (isset($_GET['deactivate'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p></div>
 <?php elseif (isset($_GET['deactivate-multi'])) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>deactivated</strong>.'); ?></p></div>
-<?php elseif ( 'update-selected' == $action ) : ?>
+<?php elseif ('update-selected' == $action) : ?>
 	<div id="message" class="updated notice is-dismissible"><p><?php _e('All selected plugins are up to date.'); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title );
-if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
- <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
+<h1><?php echo esc_html($title);
+if (( ! is_multisite() || is_network_admin()) && current_user_can('install_plugins')) { ?>
+ <a href="<?php echo self_admin_url('plugin-install.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
 <?php
 }
 
-if ( strlen( $s ) ) {
+if (strlen($s)) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( urldecode( $s ) ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(urldecode($s)));
 }
 ?>
 </h1>
@@ -503,13 +503,13 @@ 
  *
  * @param array $plugins_all An array containing all installed plugins.
  */
-do_action( 'pre_current_active_plugins', $plugins['all'] );
+do_action('pre_current_active_plugins', $plugins['all']);
 ?>
 
 <?php $wp_list_table->views(); ?>
 
 <form class="search-form search-plugins" method="get">
-<?php $wp_list_table->search_box( __( 'Search Installed Plugins' ), 'plugin' ); ?>
+<?php $wp_list_table->search_box(__('Search Installed Plugins'), 'plugin'); ?>
 </form>
 
 <form method="post" id="bulk-action-form">
@@ -528,4 +528,4 @@ 
 wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +52 added lines, -36 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('activate_plugins') )
+if ( ! current_user_can('activate_plugins') ) {
 	wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_Plugins_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -29,8 +30,9 @@ 
 
 	switch ( $action ) {
 		case 'activate':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
 				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
@@ -68,8 +70,9 @@ 
 			exit;
 
 		case 'activate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			check_admin_referer('bulk-plugins');
 
@@ -121,12 +124,13 @@ 
 
 			check_admin_referer( 'bulk-plugins' );
 
-			if ( isset( $_GET['plugins'] ) )
-				$plugins = explode( ',', $_GET['plugins'] );
-			elseif ( isset( $_POST['checked'] ) )
-				$plugins = (array) $_POST['checked'];
-			else
-				$plugins = array();
+			if ( isset( $_GET['plugins'] ) ) {
+							$plugins = explode( ',', $_GET['plugins'] );
+			} elseif ( isset( $_POST['checked'] ) ) {
+							$plugins = (array) $_POST['checked'];
+			} else {
+							$plugins = array();
+			}
 
 			$title = __( 'Update Plugins' );
 			$parent_file = 'plugins.php';
@@ -146,14 +150,16 @@ 
 			exit;
 
 		case 'error_scrape':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			}
 
 			check_admin_referer('plugin-activation-error_' . $plugin);
 
 			$valid = validate_plugin($plugin);
-			if ( is_wp_error($valid) )
-				wp_die($valid);
+			if ( is_wp_error($valid) ) {
+							wp_die($valid);
+			}
 
 			if ( ! WP_DEBUG ) {
 				error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
@@ -167,8 +173,9 @@ 
 			exit;
 
 		case 'deactivate':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			}
 
 			check_admin_referer('deactivate-plugin_' . $plugin);
 
@@ -185,15 +192,17 @@ 
 				update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
 			}
 
-			if ( headers_sent() )
-				echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
-			else
-				wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			if ( headers_sent() ) {
+							echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
+			} else {
+							wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			}
 			exit;
 
 		case 'deactivate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+			}
 
 			check_admin_referer('bulk-plugins');
 
@@ -290,8 +299,11 @@ 
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
 					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
-				<?php else: ?>
-					<h1><?php _e( 'Delete Plugins' ); ?></h1>
+				<?php else {
+	: ?>
+					<h1><?php _e( 'Delete Plugins' );
+}
+?></h1>
 					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
@@ -313,10 +325,11 @@ 
 						?>
 					</ul>
 				<p><?php
-				if ( $data_to_delete )
-					_e('Are you sure you wish to delete these files and data?');
-				else
-					_e('Are you sure you wish to delete these files?');
+				if ( $data_to_delete ) {
+									_e('Are you sure you wish to delete these files and data?');
+				} else {
+									_e('Are you sure you wish to delete these files?');
+				}
 				?></p>
 				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
@@ -423,12 +436,13 @@ 
 
 <?php if ( isset($_GET['error']) ) :
 
-	if ( isset( $_GET['main'] ) )
-		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
-	elseif ( isset($_GET['charsout']) )
-		$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
-	else
-		$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	if ( isset( $_GET['main'] ) ) {
+			$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
+	} elseif ( isset($_GET['charsout']) ) {
+			$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
+	} else {
+			$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	}
 	?>
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
@@ -451,12 +465,14 @@ 
 
 		if ( is_wp_error($delete_result) ) : ?>
 		<div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<div id="message" class="updated notice is-dismissible">
 			<p>
 				<?php
 				if ( 1 == (int) $_GET['deleted'] ) {
 					_e( 'The selected plugin has been <strong>deleted</strong>.' );
+}
 				} else {
 					_e( 'The selected plugins have been <strong>deleted</strong>.' );
 				}

src/wp-admin/import.php

Spacing +67 added lines, -67 removed lines

@@ -9,28 +9,28 @@ 
 define('WP_LOAD_IMPORTERS', true);
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'import' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to import content.' ) );
+if ( ! current_user_can('import')) {
+	wp_die(__('Sorry, you are not allowed to import content.'));
 }
 
 $title = __('Import');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
-		'<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.').'</p>'.
+		'<p>'.__('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Import_Screen" target="_blank">Documentation on Import</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/Tools_Import_Screen" target="_blank">Documentation on Import</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( current_user_can( 'install_plugins' ) ) {
+if (current_user_can('install_plugins')) {
 	// List of popular importer plugins from the WordPress.org API.
 	$popular_importers = wp_get_popular_importers();
 } else {
@@ -38,30 +38,30 @@ 
 }
 
 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
-if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
-	$importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];
-	if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.
-		wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) );
+if ( ! empty($_GET['invalid']) && isset($popular_importers[$_GET['invalid']])) {
+	$importer_id = $popular_importers[$_GET['invalid']]['importer-id'];
+	if ($importer_id != $_GET['invalid']) { // Prevent redirect loops.
+		wp_redirect(admin_url('admin.php?import='.$importer_id));
 		exit;
 	}
-	unset( $importer_id );
+	unset($importer_id);
 }
 
 add_thickbox();
-wp_enqueue_script( 'plugin-install' );
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('plugin-install');
+wp_enqueue_script('updates');
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
-<?php if ( ! empty( $_GET['invalid'] ) ) : ?>
+<h1><?php echo esc_html($title); ?></h1>
+<?php if ( ! empty($_GET['invalid'])) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php
+		<p><strong><?php _e('ERROR:'); ?></strong> <?php
 			/* translators: %s: importer slug */
-			printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
+			printf(__('The %s importer is invalid or is not installed.'), '<strong>'.esc_html($_GET['invalid']).'</strong>');
 		?></p>
 	</div>
 <?php endif; ?>
@@ -72,108 +72,108 @@ 
 $importers = get_importers();
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
-foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
+foreach ($popular_importers as $pop_importer => $pop_data) {
+	if (isset($importers[$pop_importer]))
 		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
+	if (isset($importers[$pop_data['importer-id']]))
 		continue;
 
 	// Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
-	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
+	$importers[$pop_data['importer-id']] = array($pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug']);
 }
 
-if ( empty( $importers ) ) {
-	echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful
+if (empty($importers)) {
+	echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
 } else {
-	uasort( $importers, '_usort_by_first_member' );
+	uasort($importers, '_usort_by_first_member');
 ?>
 <table class="widefat importers striped">
 
 	<?php
-	foreach ( $importers as $importer_id => $data ) {
+	foreach ($importers as $importer_id => $data) {
 		$plugin_slug = $action = '';
 		$is_plugin_installed = false;
 
-		if ( isset( $data['install'] ) ) {
+		if (isset($data['install'])) {
 			$plugin_slug = $data['install'];
 
-			if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
+			if (file_exists(WP_PLUGIN_DIR.'/'.$plugin_slug)) {
 				// Looks like an importer is installed, but not active.
-				$plugins = get_plugins( '/' . $plugin_slug );
-				if ( ! empty( $plugins ) ) {
-					$keys = array_keys( $plugins );
-					$plugin_file = $plugin_slug . '/' . $keys[0];
-					$url = wp_nonce_url( add_query_arg( array(
+				$plugins = get_plugins('/'.$plugin_slug);
+				if ( ! empty($plugins)) {
+					$keys = array_keys($plugins);
+					$plugin_file = $plugin_slug.'/'.$keys[0];
+					$url = wp_nonce_url(add_query_arg(array(
 						'action' => 'activate',
 						'plugin' => $plugin_file,
 						'from'   => 'import',
-					), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file );
+					), admin_url('plugins.php')), 'activate-plugin_'.$plugin_file);
 					$action = sprintf(
 						'<a href="%s" aria-label="%s">%s</a>',
-						esc_url( $url ),
+						esc_url($url),
 						/* translators: %s: Importer name */
-						esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
-						__( 'Run Importer' )
+						esc_attr(sprintf(__('Run %s'), $data[0])),
+						__('Run Importer')
 					);
 
 					$is_plugin_installed = true;
 				}
 			}
 
-			if ( empty( $action ) ) {
-				if ( is_main_site() ) {
-					$url = wp_nonce_url( add_query_arg( array(
+			if (empty($action)) {
+				if (is_main_site()) {
+					$url = wp_nonce_url(add_query_arg(array(
 						'action' => 'install-plugin',
 						'plugin' => $plugin_slug,
 						'from'   => 'import',
-					), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug );
+					), self_admin_url('update.php')), 'install-plugin_'.$plugin_slug);
 					$action = sprintf(
 						'<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%3$s" aria-label="%4$s">%5$s</a>',
-						esc_url( $url ),
-						esc_attr( $plugin_slug ),
-						esc_attr( $data[0] ),
+						esc_url($url),
+						esc_attr($plugin_slug),
+						esc_attr($data[0]),
 						/* translators: %s: Importer name */
-						esc_attr( sprintf( __( 'Install %s' ), $data[0] ) ),
-						__( 'Install Now' )
+						esc_attr(sprintf(__('Install %s'), $data[0])),
+						__('Install Now')
 					);
 				} else {
 					$action = sprintf(
 						/* translators: URL to wp-admin/import.php */
-						__( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ),
-						get_admin_url( get_current_network_id(), 'import.php' )
+						__('This importer is not installed. Please install importers from <a href="%s">the main site</a>.'),
+						get_admin_url(get_current_network_id(), 'import.php')
 					);
 				}
 			}
 		} else {
-			$url = add_query_arg( array(
+			$url = add_query_arg(array(
 				'import' => $importer_id,
-			), self_admin_url( 'admin.php' ) );
+			), self_admin_url('admin.php'));
 			$action = sprintf(
 				'<a href="%1$s" aria-label="%2$s">%3$s</a>',
-				esc_url( $url ),
+				esc_url($url),
 				/* translators: %s: Importer name */
-				esc_attr( sprintf( __( 'Run %s' ), $data[0] ) ),
-				__( 'Run Importer' )
+				esc_attr(sprintf(__('Run %s'), $data[0])),
+				__('Run Importer')
 			);
 
 			$is_plugin_installed = true;
 		}
 
-		if ( ! $is_plugin_installed && is_main_site() ) {
-			$url = add_query_arg( array(
+		if ( ! $is_plugin_installed && is_main_site()) {
+			$url = add_query_arg(array(
 				'tab'       => 'plugin-information',
 				'plugin'    => $plugin_slug,
 				'from'      => 'import',
 				'TB_iframe' => 'true',
 				'width'     => 600,
 				'height'    => 550,
-			), network_admin_url( 'plugin-install.php' ) );
+			), network_admin_url('plugin-install.php'));
 			$action .= sprintf(
 				' | <a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
-				esc_url( $url ),
+				esc_url($url),
 				/* translators: %s: Importer name */
-				esc_attr( sprintf( __( 'More information about %s' ), $data[0] ) ),
-				__( 'Details' )
+				esc_attr(sprintf(__('More information about %s'), $data[0])),
+				__('Details')
 			);
 		}
 
@@ -193,8 +193,8 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
-	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+if (current_user_can('install_plugins'))
+	echo '<p>'.sprintf(__('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url(network_admin_url('plugin-install.php?tab=search&type=tag&s=importer'))).'</p>';
 ?>
 
 </div>
@@ -203,4 +203,4 @@ 
 wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +8 added lines, -5 removed lines

@@ -73,10 +73,12 @@ 
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
-		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
-		continue;
+	if ( isset( $importers[ $pop_importer ] ) ) {
+			continue;
+	}
+	if ( isset( $importers[ $pop_data['importer-id'] ] ) ) {
+			continue;
+	}
 
 	// Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
 	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
@@ -193,8 +195,9 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
+if ( current_user_can('install_plugins') ) {
 	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+}
 ?>
 
 </div>

src/wp-admin/user-new.php

Spacing +165 added lines, -165 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() ) {
-	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
+if (is_multisite()) {
+	if ( ! current_user_can('create_users') && ! current_user_can('promote_users')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to add users to this network.').'</p>',
 			403
 		);
 	}
-} elseif ( ! current_user_can( 'create_users' ) ) {
+} elseif ( ! current_user_can('create_users')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to create users.').'</p>',
 		403
 	);
 }
 
-if ( is_multisite() ) {
-	add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
+if (is_multisite()) {
+	add_filter('wpmu_signup_user_notification_email', 'admin_created_user_email');
 }
 
-if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
 	$user_details = null;
-	$user_email = wp_unslash( $_REQUEST['email'] );
-	if ( false !== strpos( $user_email, '@' ) ) {
-		$user_details = get_user_by( 'email', $user_email );
+	$user_email = wp_unslash($_REQUEST['email']);
+	if (false !== strpos($user_email, '@')) {
+		$user_details = get_user_by('email', $user_email);
 	} else {
-		if ( is_super_admin() ) {
-			$user_details = get_user_by( 'login', $user_email );
+		if (is_super_admin()) {
+			$user_details = get_user_by('login', $user_email);
 		} else {
-			wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
+			wp_redirect(add_query_arg(array('update' => 'enter_email'), 'user-new.php'));
 			die();
 		}
 	}
 
-	if ( !$user_details ) {
-		wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) );
+	if ( ! $user_details) {
+		wp_redirect(add_query_arg(array('update' => 'does_not_exist'), 'user-new.php'));
 		die();
 	}
 
-	if ( ! current_user_can( 'promote_user', $user_details->ID ) ) {
+	if ( ! current_user_can('promote_user', $user_details->ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to add users to this network.').'</p>',
 			403
 		);
 	}
@@ -63,18 +63,18 @@ 
 	$redirect = 'user-new.php';
 	$username = $user_details->user_login;
 	$user_id = $user_details->ID;
-	if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
-		$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+	if (($username != null && ! is_super_admin($user_id)) && (array_key_exists($blog_id, get_blogs_of_user($user_id)))) {
+		$redirect = add_query_arg(array('update' => 'addexisting'), 'user-new.php');
 	} else {
-		if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-			add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-			$redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' );
+		if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+			add_existing_user_to_blog(array('user_id' => $user_id, 'role' => $_REQUEST['role']));
+			$redirect = add_query_arg(array('update' => 'addnoconfirmation', 'user_id' => $user_id), 'user-new.php');
 		} else {
-			$newuser_key = substr( md5( $user_id ), 0, 5 );
-			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+			$newuser_key = substr(md5($user_id), 0, 5);
+			add_option('new_user_'.$newuser_key, array('user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST['role']));
 
 			$roles = get_editable_roles();
-			$role = $roles[ $_REQUEST['role'] ];
+			$role = $roles[$_REQUEST['role']];
 
 			/**
 			 * Fires immediately after a user is invited to join a site, but before the notification is sent.
@@ -85,52 +85,52 @@ 
 			 * @param array  $role        The role of invited user.
 			 * @param string $newuser_key The key of the invitation.
 			 */
-			do_action( 'invite_user', $user_id, $role, $newuser_key );
+			do_action('invite_user', $user_id, $role, $newuser_key);
 
 			/* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
-			$message = __( 'Hi,
+			$message = __('Hi,
 
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 
 Please click the following link to confirm the invite:
 %4$s' );
-			wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
-			$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+			wp_mail($new_user_email, sprintf(__('[%s] Joining confirmation'), wp_specialchars_decode(get_option('blogname'))), sprintf($message, get_option('blogname'), home_url(), wp_specialchars_decode(translate_user_role($role['name'])), home_url("/newbloguser/$newuser_key/")));
+			$redirect = add_query_arg(array('update' => 'add'), 'user-new.php');
 		}
 	}
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	die();
-} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'create-user', '_wpnonce_create-user' );
+} elseif (isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action']) {
+	check_admin_referer('create-user', '_wpnonce_create-user');
 
-	if ( ! current_user_can( 'create_users' ) ) {
+	if ( ! current_user_can('create_users')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to create users.').'</p>',
 			403
 		);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$user_id = edit_user();
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
+			if (current_user_can('list_users'))
+				$redirect = 'users.php?update=add&id='.$user_id;
 			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
-			wp_redirect( $redirect );
+				$redirect = add_query_arg('update', 'add', 'user-new.php');
+			wp_redirect($redirect);
 			die();
 		}
 	} else {
 		// Adding a new user to this site
-		$new_user_email = wp_unslash( $_REQUEST['email'] );
-		$user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
-		if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
-			$add_user_errors = $user_details[ 'errors' ];
+		$new_user_email = wp_unslash($_REQUEST['email']);
+		$user_details = wpmu_validate_user_signup($_REQUEST['user_login'], $new_user_email);
+		if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+			$add_user_errors = $user_details['errors'];
 		} else {
 			/**
 			 * Filters the user_login, also known as the username, before it is added to the site.
@@ -139,24 +139,24 @@ 
 			 *
 			 * @param string $user_login The sanitized username.
 			 */
-			$new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
-				add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
+			$new_user_login = apply_filters('pre_user_login', sanitize_user(wp_unslash($_REQUEST['user_login']), true));
+			if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+				add_filter('wpmu_signup_user_notification', '__return_false'); // Disable confirmation email
+				add_filter('wpmu_welcome_user_notification', '__return_false'); // Disable welcome email
 			}
-			wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-				$key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
-				$new_user = wpmu_activate_signup( $key );
-				if ( is_wp_error( $new_user ) ) {
-					$redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' );
+			wpmu_signup_user($new_user_login, $new_user_email, array('add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role']));
+			if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+				$key = $wpdb->get_var($wpdb->prepare("SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email));
+				$new_user = wpmu_activate_signup($key);
+				if (is_wp_error($new_user)) {
+					$redirect = add_query_arg(array('update' => 'addnoconfirmation'), 'user-new.php');
 				} else {
-					$redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' );
+					$redirect = add_query_arg(array('update' => 'addnoconfirmation', 'user_id' => $new_user['user_id']), 'user-new.php');
 				}
 			} else {
-				$redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );
+				$redirect = add_query_arg(array('update' => 'newuserconfirmation'), 'user-new.php');
 			}
-			wp_redirect( $redirect );
+			wp_redirect($redirect);
 			die();
 		}
 	}
@@ -166,49 +166,49 @@ 
 $parent_file = 'users.php';
 
 $do_both = false;
-if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+if (is_multisite() && current_user_can('promote_users') && current_user_can('create_users'))
 	$do_both = true;
 
-$help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
+$help = '<p>'.__('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.').'</p>';
 
-if ( is_multisite() ) {
-	$help .= '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' .
-	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.') . '</p>';
+if (is_multisite()) {
+	$help .= '<p>'.__('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.').'</p>'.
+	'<p>'.__('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.').'</p>';
 } else {
-	$help .= '<p>' . __('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.') . '</p>' .
+	$help .= '<p>'.__('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.').'</p>'.
 
-	'<p>' . __('By default, new users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don&#8217;t want to send the new user a welcome email.') . '</p>';
+	'<p>'.__('By default, new users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don&#8217;t want to send the new user a welcome email.').'</p>';
 }
 
-$help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
+$help .= '<p>'.__('Remember to click the Add New User button at the bottom of this screen when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'      => 'user-roles',
 'title'   => __('User Roles'),
-'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
-				'<ul>' .
-				'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
-				'<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
-				'<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
-				'<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
-				'<li>' . __('Administrators have access to all the administration features.') . '</li>' .
+'content' => '<p>'.__('Here is a basic overview of the different user roles and the permissions associated with each one:').'</p>'.
+				'<ul>'.
+				'<li>'.__('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.').'</li>'.
+				'<li>'.__('Contributors can write and manage their posts but not publish posts or upload media files.').'</li>'.
+				'<li>'.__('Authors can publish and manage their own posts, and are able to upload files.').'</li>'.
+				'<li>'.__('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.').'</li>'.
+				'<li>'.__('Administrators have access to all the administration features.').'</li>'.
 				'</ul>'
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</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/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');
-wp_enqueue_script( 'user-profile' );
+wp_enqueue_script('user-profile');
 
 /**
  * Filters whether to enable user auto-complete for non-super admins in Multisite.
@@ -217,26 +217,26 @@ 
  *
  * @param bool $enable Whether to enable auto-complete for non-super admins. Default false.
  */
-if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
-	&& ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+if (is_multisite() && current_user_can('promote_users') && ! wp_is_large_network('users')
+	&& (is_super_admin() || apply_filters('autocomplete_users_for_site_admins', false))
 ) {
-	wp_enqueue_script( 'user-suggest' );
+	wp_enqueue_script('user-suggest');
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$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)));
 			}
 		}
 
-		switch ( $_GET['update'] ) {
+		switch ($_GET['update']) {
 			case "newuserconfirmation":
 				$messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
 				break;
@@ -244,11 +244,11 @@ 
 				$messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.');
 				break;
 			case "addnoconfirmation":
-				if ( empty( $edit_link ) ) {
-					$messages[] = __( 'User has been added to your site.' );
+				if (empty($edit_link)) {
+					$messages[] = __('User has been added to your site.');
 				} else {
 					/* translators: %s: edit page url */
-					$messages[] = sprintf( __( 'User has been added to your site. <a href="%s">Edit user</a>' ), $edit_link );
+					$messages[] = sprintf(__('User has been added to your site. <a href="%s">Edit user</a>'), $edit_link);
 				}
 				break;
 			case "addexisting":
@@ -262,40 +262,40 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
+		if ('add' == $_GET['update'])
 			$messages[] = __('User added.');
 	}
 }
 ?>
 <div class="wrap">
 <h1 id="add-new-user"><?php
-if ( current_user_can( 'create_users' ) ) {
-	echo _x( 'Add New User', 'user' );
-} elseif ( current_user_can( 'promote_users' ) ) {
-	echo _x( 'Add Existing User', 'user' );
+if (current_user_can('create_users')) {
+	echo _x('Add New User', 'user');
+} elseif (current_user_can('promote_users')) {
+	echo _x('Add Existing User', 'user');
 } ?>
 </h1>
 
-<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
+			foreach ($errors->get_error_messages() as $err)
 				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
 <?php endif;
 
-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>';
 } ?>
 
-<?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
+<?php 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>
@@ -303,15 +303,15 @@ 
 <div id="ajax-response"></div>
 
 <?php
-if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
-	if ( !is_super_admin() ) {
-		echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
+if (is_multisite()) {
+	if ($do_both)
+		echo '<h2 id="add-existing-user">'.__('Add Existing User').'</h2>';
+	if ( ! is_super_admin()) {
+		echo '<p>'.__('Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.').'</p>';
 		$label = __('Email');
 		$type  = 'email';
 	} else {
-		echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
+		echo '<p>'.__('Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.').'</p>';
 		$label = __('Email or Username');
 		$type  = 'text';
 	}
@@ -322,10 +322,10 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="adduser" />
-<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
+<?php wp_nonce_field('add-user', '_wpnonce_add-user') ?>
 
 <table class="form-table">
 	<tr class="form-field form-required">
@@ -335,14 +335,14 @@ 
 	<tr class="form-field">
 		<th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="adduser-role">
-			<?php wp_dropdown_roles( get_option('default_role') ); ?>
+			<?php wp_dropdown_roles(get_option('default_role')); ?>
 			</select>
 		</td>
 	</tr>
-<?php if ( current_user_can( 'manage_network_users' ) ) { ?>
+<?php if (current_user_can('manage_network_users')) { ?>
 	<tr>
 		<th scope="row"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label></td>
+		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e('Add the user without sending an email that requires their confirmation.'); ?></label></td>
 	</tr>
 <?php } ?>
 </table>
@@ -358,48 +358,48 @@ 
  *
  * @param string $type A contextual string specifying which type of new user form the hook follows.
  */
-do_action( 'user_new_form', 'add-existing-user' );
+do_action('user_new_form', 'add-existing-user');
 ?>
-<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+<?php submit_button(__('Add Existing User'), 'primary', 'adduser', true, array('id' => 'addusersub')); ?>
 </form>
 <?php
 } // is_multisite()
 
-if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
+if (current_user_can('create_users')) {
+	if ($do_both)
+		echo '<h2 id="create-new-user">'.__('Add New User').'</h2>';
 ?>
 <p><?php _e('Create a brand new user and add them to this site.'); ?></p>
 <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"<?php
 	/** This action is documented in wp-admin/user-new.php */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="createuser" />
-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
+<?php wp_nonce_field('create-user', '_wpnonce_create-user'); ?>
 <?php
 // Load up the passed data, else set to a default.
-$creating = isset( $_POST['createuser'] );
+$creating = isset($_POST['createuser']);
 
-$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
-$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
-$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
-$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
-$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
-$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
-$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
+$new_user_login = $creating && isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
+$new_user_firstname = $creating && isset($_POST['first_name']) ? wp_unslash($_POST['first_name']) : '';
+$new_user_lastname = $creating && isset($_POST['last_name']) ? wp_unslash($_POST['last_name']) : '';
+$new_user_email = $creating && isset($_POST['email']) ? wp_unslash($_POST['email']) : '';
+$new_user_uri = $creating && isset($_POST['url']) ? wp_unslash($_POST['url']) : '';
+$new_user_role = $creating && isset($_POST['role']) ? wp_unslash($_POST['role']) : '';
+$new_user_send_notification = $creating && ! isset($_POST['send_user_notification']) ? false : true;
+$new_user_ignore_pass = $creating && isset($_POST['noconfirmation']) ? wp_unslash($_POST['noconfirmation']) : '';
 
 ?>
 <table class="form-table">
 	<tr class="form-field form-required">
 		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
+		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 	</tr>
 	<tr class="form-field form-required">
 		<th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
+		<td><input name="email" type="email" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
 	</tr>
-<?php if ( !is_multisite() ) { ?>
+<?php if ( ! is_multisite()) { ?>
 	<tr class="form-field">
 		<th scope="row"><label for="first_name"><?php _e('First Name') ?> </label></th>
 		<td><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr($new_user_firstname); ?>" /></td>
@@ -410,82 +410,82 @@ 
 	</tr>
 	<tr class="form-field">
 		<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
-		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
+		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
 	</tr>
 	<tr class="form-field form-required user-pass1-wrap">
 		<th scope="row">
 			<label for="pass1">
-				<?php _e( 'Password' ); ?>
-				<span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
+				<?php _e('Password'); ?>
+				<span class="description hide-if-js"><?php _e('(required)'); ?></span>
 			</label>
 		</th>
 		<td>
 			<input class="hidden" value=" " /><!-- #24364 workaround -->
-			<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+			<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e('Show password'); ?></button>
 			<div class="wp-pwd hide-if-js">
-				<?php $initial_password = wp_generate_password( 24 ); ?>
+				<?php $initial_password = wp_generate_password(24); ?>
 				<span class="password-input-wrapper">
-					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr($initial_password); ?>" aria-describedby="pass-strength-result" />
 				</span>
-				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 					<span class="dashicons dashicons-hidden"></span>
-					<span class="text"><?php _e( 'Hide' ); ?></span>
+					<span class="text"><?php _e('Hide'); ?></span>
 				</button>
-				<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-					<span class="text"><?php _e( 'Cancel' ); ?></span>
+				<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Cancel password change'); ?>">
+					<span class="text"><?php _e('Cancel'); ?></span>
 				</button>
 				<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 			</div>
 		</td>
 	</tr>
 	<tr class="form-field form-required user-pass2-wrap hide-if-js">
-		<th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+		<th scope="row"><label for="pass2"><?php _e('Repeat Password'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
 		<td>
 		<input name="pass2" type="password" id="pass2" autocomplete="off" />
 		</td>
 	</tr>
 	<tr class="pw-weak">
-		<th><?php _e( 'Confirm Password' ); ?></th>
+		<th><?php _e('Confirm Password'); ?></th>
 		<td>
 			<label>
 				<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-				<?php _e( 'Confirm use of weak password' ); ?>
+				<?php _e('Confirm use of weak password'); ?>
 			</label>
 		</td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e( 'Send User Notification' ) ?></th>
-		<td><label for="send_user_notification"><input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked( $new_user_send_notification ); ?> /> <?php _e( 'Send the new user an email about their account.' ); ?></label></td>
+		<th scope="row"><?php _e('Send User Notification') ?></th>
+		<td><label for="send_user_notification"><input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked($new_user_send_notification); ?> /> <?php _e('Send the new user an email about their account.'); ?></label></td>
 	</tr>
 <?php } // !is_multisite ?>
 	<tr class="form-field">
 		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
-			if ( !$new_user_role )
-				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			if ( ! $new_user_role)
+				$new_user_role = ! empty($current_role) ? $current_role : get_option('default_role');
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>
 		</td>
 	</tr>
-	<?php if ( is_multisite() && current_user_can( 'manage_network_users' ) ) { ?>
+	<?php if (is_multisite() && current_user_can('manage_network_users')) { ?>
 	<tr>
 		<th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label></td>
+		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked($new_user_ignore_pass); ?> /> <?php _e('Add the user without sending an email that requires their confirmation.'); ?></label></td>
 	</tr>
 	<?php } ?>
 </table>
 
 <?php
 /** This action is documented in wp-admin/user-new.php */
-do_action( 'user_new_form', 'add-new-user' );
+do_action('user_new_form', 'add-new-user');
 ?>
 
-<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
+<?php submit_button(__('Add New User'), 'primary', 'createuser', true, array('id' => 'createusersub')); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
 </div>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/options.php

Spacing +91 added lines, -91 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $title = __('Settings');
 $this_file = 'options.php';
@@ -27,7 +27,7 @@ 
 $capability = 'manage_options';
 
 // This is for back compat and will eventually be removed.
-if ( empty($option_page) ) {
+if (empty($option_page)) {
 	$option_page = 'options';
 } else {
 
@@ -41,70 +41,70 @@ 
 	 *
 	 * @param string $capability The capability used for the page, which is manage_options by default.
 	 */
-	$capability = apply_filters( "option_page_capability_{$option_page}", $capability );
+	$capability = apply_filters("option_page_capability_{$option_page}", $capability);
 }
 
-if ( ! current_user_can( $capability ) ) {
+if ( ! current_user_can($capability)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to manage these items.').'</p>',
 		403
 	);
 }
 
 // Handle admin email change requests
-if ( is_multisite() ) {
-	if ( ! empty($_GET[ 'adminhash' ] ) ) {
-		$new_admin_details = get_option( 'adminhash' );
+if (is_multisite()) {
+	if ( ! empty($_GET['adminhash'])) {
+		$new_admin_details = get_option('adminhash');
 		$redirect = 'options-general.php?updated=false';
-		if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'adminhash' ] ) && !empty($new_admin_details[ 'newemail' ]) ) {
-			update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
-			delete_option( 'adminhash' );
-			delete_option( 'new_admin_email' );
+		if (is_array($new_admin_details) && hash_equals($new_admin_details['hash'], $_GET['adminhash']) && ! empty($new_admin_details['newemail'])) {
+			update_option('admin_email', $new_admin_details['newemail']);
+			delete_option('adminhash');
+			delete_option('new_admin_email');
 			$redirect = 'options-general.php?updated=true';
 		}
-		wp_redirect( admin_url( $redirect ) );
+		wp_redirect(admin_url($redirect));
 		exit;
-	} elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
-		check_admin_referer( 'dismiss-' . get_current_blog_id() . '-new_admin_email' );
-		delete_option( 'adminhash' );
-		delete_option( 'new_admin_email' );
-		wp_redirect( admin_url( 'options-general.php?updated=true' ) );
+	} elseif ( ! empty($_GET['dismiss']) && 'new_admin_email' == $_GET['dismiss']) {
+		check_admin_referer('dismiss-'.get_current_blog_id().'-new_admin_email');
+		delete_option('adminhash');
+		delete_option('new_admin_email');
+		wp_redirect(admin_url('options-general.php?updated=true'));
 		exit;
 	}
 }
 
-if ( is_multisite() && ! is_super_admin() && 'update' != $action ) {
+if (is_multisite() && ! is_super_admin() && 'update' != $action) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to delete these items.').'</p>',
 		403
 	);
 }
 
 $whitelist_options = array(
-	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
-	'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
-	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
-	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-	'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
+	'general' => array('blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG'),
+	'discussion' => array('default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration'),
+	'media' => array('thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type'),
+	'reading' => array('posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public'),
+	'writing' => array('default_category', 'default_email_category', 'default_link_category', 'default_post_format')
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8')))
 	$whitelist_options['reading'][] = 'blog_charset';
 
-if ( get_site_option( 'initial_db_version' ) < 32453 ) {
+if (get_site_option('initial_db_version') < 32453) {
 	$whitelist_options['writing'][] = 'use_smilies';
 	$whitelist_options['writing'][] = 'use_balanceTags';
 }
 
-if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
+if ( ! is_multisite()) {
+	if ( ! defined('WP_SITEURL'))
 		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
+	if ( ! defined('WP_HOME'))
 		$whitelist_options['general'][] = 'home';
 
 	$whitelist_options['general'][] = 'admin_email';
@@ -117,7 +117,7 @@ 
 	$whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
 	// If upload_url_path and upload_path are both default values, they're locked.
-	if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+	if (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path'))) {
 		$whitelist_options['media'][] = 'upload_path';
 		$whitelist_options['media'][] = 'upload_url_path';
 	}
@@ -131,7 +131,7 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
+	if (apply_filters('enable_post_by_email_configuration', true))
 		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 }
 
@@ -142,86 +142,86 @@ 
  *
  * @param array White list options.
  */
-$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
+$whitelist_options = apply_filters('whitelist_options', $whitelist_options);
 
 /*
  * If $_GET['action'] == 'update' we are saving settings sent from a settings page
  */
-if ( 'update' == $action ) {
-	if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
+if ('update' == $action) {
+	if ('options' == $option_page && ! isset($_POST['option_page'])) { // This is for back compat and will eventually be removed.
 		$unregistered = true;
-		check_admin_referer( 'update-options' );
+		check_admin_referer('update-options');
 	} else {
 		$unregistered = false;
-		check_admin_referer( $option_page . '-options' );
+		check_admin_referer($option_page.'-options');
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( ! isset($whitelist_options[$option_page]))
+		wp_die(__('<strong>ERROR</strong>: options page not found.'));
 
-	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
-		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
+	if ('options' == $option_page) {
+		if (is_multisite() && ! is_super_admin())
+			wp_die(__('Sorry, you are not allowed to modify unregistered settings for this site.'));
+		$options = explode(',', wp_unslash($_POST['page_options']));
 	} else {
-		$options = $whitelist_options[ $option_page ];
+		$options = $whitelist_options[$option_page];
 	}
 
-	if ( 'general' == $option_page ) {
+	if ('general' == $option_page) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
+		if ( ! empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash($_POST['date_format']))
 			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
+		if ( ! empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash($_POST['time_format']))
 			$_POST['time_format'] = $_POST['time_format_custom'];
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
-		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
+		if ( ! empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string'])) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
 			$_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
 			$_POST['timezone_string'] = '';
 		}
 
 		// Handle translation install.
-		if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
-			require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+		if ( ! empty($_POST['WPLANG']) && ( ! is_multisite() || is_super_admin())) { // @todo: Skip if already installed
+			require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-			if ( wp_can_install_language_pack() ) {
-				$language = wp_download_language_pack( $_POST['WPLANG'] );
-				if ( $language ) {
+			if (wp_can_install_language_pack()) {
+				$language = wp_download_language_pack($_POST['WPLANG']);
+				if ($language) {
 					$_POST['WPLANG'] = $language;
 				}
 			}
 		}
 	}
 
-	if ( $options ) {
-		foreach ( $options as $option ) {
-			if ( $unregistered ) {
-				_deprecated_argument( 'options.php', '2.7.0',
+	if ($options) {
+		foreach ($options as $option) {
+			if ($unregistered) {
+				_deprecated_argument('options.php', '2.7.0',
 					sprintf(
 						/* translators: %s: the option/setting */
-						__( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
-						'<code>' . $option . '</code>'
+						__('The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API'),
+						'<code>'.$option.'</code>'
 					)
 				);
 			}
 
-			$option = trim( $option );
+			$option = trim($option);
 			$value = null;
-			if ( isset( $_POST[ $option ] ) ) {
-				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
-				$value = wp_unslash( $value );
+			if (isset($_POST[$option])) {
+				$value = $_POST[$option];
+				if ( ! is_array($value))
+					$value = trim($value);
+				$value = wp_unslash($value);
 			}
-			update_option( $option, $value );
+			update_option($option, $value);
 		}
 
 		// Switch translation in case WPLANG was changed.
-		$language = get_option( 'WPLANG' );
-		if ( $language ) {
-			load_default_textdomain( $language );
+		$language = get_option('WPLANG');
+		if ($language) {
+			load_default_textdomain($language);
 		} else {
-			unload_textdomain( 'default' );
+			unload_textdomain('default');
 		}
 	}
 
@@ -229,38 +229,38 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
+	if ( ! count(get_settings_errors()))
 		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
 	 * Redirect back to the settings page that was submitted
 	 */
-	$goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
-	wp_redirect( $goback );
+	$goback = add_query_arg('settings-updated', 'true', wp_get_referer());
+	wp_redirect($goback);
 	exit;
 }
 
-include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+include(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-  <h1><?php esc_html_e( 'All Settings' ); ?></h1>
+  <h1><?php esc_html_e('All Settings'); ?></h1>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
   <input type="hidden" name="option_page" value="options" />
   <table class="form-table">
 <?php
-$options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );
+$options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
 
-foreach ( (array) $options as $option ) :
+foreach ((array) $options as $option) :
 	$disabled = false;
-	if ( $option->option_name == '' )
+	if ($option->option_name == '')
 		continue;
-	if ( is_serialized( $option->option_value ) ) {
-		if ( is_serialized_string( $option->option_value ) ) {
+	if (is_serialized($option->option_value)) {
+		if (is_serialized_string($option->option_value)) {
 			// This is a serialized string, so we should display it.
-			$value = maybe_unserialize( $option->option_value );
+			$value = maybe_unserialize($option->option_value);
 			$options_to_update[] = $option->option_name;
 			$class = 'all-options';
 		} else {
@@ -273,28 +273,28 @@ 
 		$options_to_update[] = $option->option_name;
 		$class = 'all-options';
 	}
-	$name = esc_attr( $option->option_name );
+	$name = esc_attr($option->option_name);
 	?>
 <tr>
-	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
+	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html($option->option_name); ?></label></th>
 <td>
-<?php if ( strpos( $value, "\n" ) !== false ) : ?>
+<?php if (strpos($value, "\n") !== false) : ?>
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
-		echo esc_textarea( $value );
+		echo esc_textarea($value);
 	?></textarea>
 	<?php else: ?>
-		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
+		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr($value) ?>"<?php disabled($disabled, true) ?> />
 	<?php endif ?></td>
 </tr>
 <?php endforeach; ?>
   </table>
 
-<input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
+<input type="hidden" name="page_options" value="<?php echo esc_attr(implode(',', $options_to_update)); ?>" />
 
-<?php submit_button( __( 'Save Changes' ), 'primary', 'Update' ); ?>
+<?php submit_button(__('Save Changes'), 'primary', 'Update'); ?>
 
   </form>
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +38 added lines, -24 removed lines

@@ -93,8 +93,9 @@ 
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	$whitelist_options['reading'][] = 'blog_charset';
+}
 
 if ( get_site_option( 'initial_db_version' ) < 32453 ) {
 	$whitelist_options['writing'][] = 'use_smilies';
@@ -102,10 +103,12 @@ 
 }
 
 if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
-		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
-		$whitelist_options['general'][] = 'home';
+	if ( !defined( 'WP_SITEURL' ) ) {
+			$whitelist_options['general'][] = 'siteurl';
+	}
+	if ( !defined( 'WP_HOME' ) ) {
+			$whitelist_options['general'][] = 'home';
+	}
 
 	$whitelist_options['general'][] = 'admin_email';
 	$whitelist_options['general'][] = 'users_can_register';
@@ -131,9 +134,10 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
-		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
-}
+	if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+			$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+	}
+	}
 
 /**
  * Filters the options white list.
@@ -156,12 +160,14 @@ 
 		check_admin_referer( $option_page . '-options' );
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( !isset( $whitelist_options[ $option_page ] ) ) {
+			wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	}
 
 	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
+		if ( is_multisite() && ! is_super_admin() ) {
+					wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
+		}
 		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
 	} else {
 		$options = $whitelist_options[ $option_page ];
@@ -169,10 +175,12 @@ 
 
 	if ( 'general' == $option_page ) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
-			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
-			$_POST['time_format'] = $_POST['time_format_custom'];
+		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) ) {
+					$_POST['date_format'] = $_POST['date_format_custom'];
+		}
+		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) ) {
+					$_POST['time_format'] = $_POST['time_format_custom'];
+		}
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
 		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
@@ -209,8 +217,9 @@ 
 			$value = null;
 			if ( isset( $_POST[ $option ] ) ) {
 				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
+				if ( ! is_array( $value ) ) {
+									$value = trim( $value );
+				}
 				$value = wp_unslash( $value );
 			}
 			update_option( $option, $value );
@@ -229,8 +238,9 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
-		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	if ( !count( get_settings_errors() ) ) {
+			add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	}
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
@@ -255,8 +265,9 @@ 
 
 foreach ( (array) $options as $option ) :
 	$disabled = false;
-	if ( $option->option_name == '' )
-		continue;
+	if ( $option->option_name == '' ) {
+			continue;
+	}
 	if ( is_serialized( $option->option_value ) ) {
 		if ( is_serialized_string( $option->option_value ) ) {
 			// This is a serialized string, so we should display it.
@@ -282,11 +293,14 @@ 
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
 		echo esc_textarea( $value );
 	?></textarea>
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
 	<?php endif ?></td>
 </tr>
-<?php endforeach; ?>
+<?php endforeach;
+}
+?>
   </table>
 
 <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />

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

Spacing +110 added lines, -110 removed lines

@@ -8,82 +8,82 @@ 
  */
 
 /** 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') )
+if ( ! current_user_can('manage_sites'))
 	wp_die(__('Sorry, you are not allowed to edit this site.'));
 
 $wp_list_table = _get_list_table('WP_Users_List_Table');
 $wp_list_table->prepare_items();
 
-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 users list' ),
-	'heading_pagination' => __( 'Site users list navigation' ),
-	'heading_list'       => __( 'Site users list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter site users list'),
+	'heading_pagination' => __('Site users list navigation'),
+	'heading_list'       => __('Site users list'),
+));
 
-$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( 'update', wp_get_referer() );
+$_SERVER['REQUEST_URI'] = remove_query_arg('update', $_SERVER['REQUEST_URI']);
+$referer = remove_query_arg('update', 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.'));
 
-$details = get_blog_details( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_blog_details($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( ! can_edit_network( $details->site_id ) )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id))
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-$is_main_site = is_main_site( $id );
+$is_main_site = is_main_site($id);
 
-switch_to_blog( $id );
+switch_to_blog($id);
 
 $action = $wp_list_table->current_action();
 
-if ( $action ) {
+if ($action) {
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'newuser':
-			check_admin_referer( 'add-user', '_wpnonce_add-new-user' );
+			check_admin_referer('add-user', '_wpnonce_add-new-user');
 			$user = $_POST['user'];
-			if ( ! is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
+			if ( ! is_array($_POST['user']) || empty($user['username']) || empty($user['email'])) {
 				$update = 'err_new';
 			} else {
-				$password = wp_generate_password( 12, false);
-				$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+				$password = wp_generate_password(12, false);
+				$user_id = wpmu_create_user(esc_html(strtolower($user['username'])), $password, esc_html($user['email']));
 
-				if ( false === $user_id ) {
+				if (false === $user_id) {
 		 			$update = 'err_new_dup';
 				} else {
-					add_user_to_blog( $id, $user_id, $_POST['new_role'] );
+					add_user_to_blog($id, $user_id, $_POST['new_role']);
 					$update = 'newuser';
 					/**
 					  * Fires after a user has been created via the network site-users.php page.
@@ -92,20 +92,20 @@ 
 					  *
 					  * @param int $user_id ID of the newly created user.
 					  */
-					do_action( 'network_site_users_created_user', $user_id );
+					do_action('network_site_users_created_user', $user_id);
 				}
 			}
 			break;
 
 		case 'adduser':
-			check_admin_referer( 'add-user', '_wpnonce_add-user' );
-			if ( !empty( $_POST['newuser'] ) ) {
+			check_admin_referer('add-user', '_wpnonce_add-user');
+			if ( ! empty($_POST['newuser'])) {
 				$update = 'adduser';
 				$newuser = $_POST['newuser'];
-				$user = get_user_by( 'login', $newuser );
-				if ( $user && $user->exists() ) {
-					if ( ! is_user_member_of_blog( $user->ID, $id ) )
-						add_user_to_blog( $id, $user->ID, $_POST['new_role'] );
+				$user = get_user_by('login', $newuser);
+				if ($user && $user->exists()) {
+					if ( ! is_user_member_of_blog($user->ID, $id))
+						add_user_to_blog($id, $user->ID, $_POST['new_role']);
 					else
 						$update = 'err_add_member';
 				} else {
@@ -117,48 +117,48 @@ 
 			break;
 
 		case 'remove':
-			if ( ! current_user_can( 'remove_users' )  )
+			if ( ! current_user_can('remove_users'))
 				die(__('You can&#8217;t remove users.'));
-			check_admin_referer( 'bulk-users' );
+			check_admin_referer('bulk-users');
 
 			$update = 'remove';
-			if ( isset( $_REQUEST['users'] ) ) {
+			if (isset($_REQUEST['users'])) {
 				$userids = $_REQUEST['users'];
 
-				foreach ( $userids as $user_id ) {
+				foreach ($userids as $user_id) {
 					$user_id = (int) $user_id;
-					remove_user_from_blog( $user_id, $id );
+					remove_user_from_blog($user_id, $id);
 				}
-			} elseif ( isset( $_GET['user'] ) ) {
-				remove_user_from_blog( $_GET['user'] );
+			} elseif (isset($_GET['user'])) {
+				remove_user_from_blog($_GET['user']);
 			} else {
 				$update = 'err_remove';
 			}
 			break;
 
 		case 'promote':
-			check_admin_referer( 'bulk-users' );
+			check_admin_referer('bulk-users');
 			$editable_roles = get_editable_roles();
-			if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
+			if (empty($editable_roles[$_REQUEST['new_role']]))
 				wp_die(__('You can&#8217;t give users that role.'));
 
-			if ( isset( $_REQUEST['users'] ) ) {
+			if (isset($_REQUEST['users'])) {
 				$userids = $_REQUEST['users'];
 				$update = 'promote';
-				foreach ( $userids as $user_id ) {
+				foreach ($userids as $user_id) {
 					$user_id = (int) $user_id;
 
 					// If the user doesn't already belong to the blog, bail.
-					if ( ! is_user_member_of_blog( $user_id ) ) {
+					if ( ! is_user_member_of_blog($user_id)) {
 						wp_die(
-							'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-							'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
+							'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+							'<p>'.__('One of the selected users is not a member of this site.').'</p>',
 							403
 						);
 					}
 
-					$user = get_userdata( $user_id );
-					$user->set_role( $_REQUEST['new_role'] );
+					$user = get_userdata($user_id);
+					$user->set_role($_REQUEST['new_role']);
 				}
 			} else {
 				$update = 'err_promote';
@@ -166,20 +166,20 @@ 
 			break;
 	}
 
-	wp_safe_redirect( add_query_arg( 'update', $update, $referer ) );
+	wp_safe_redirect(add_query_arg('update', $update, $referer));
 	exit();
 }
 
 restore_current_blog();
 
-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_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';
@@ -191,10 +191,10 @@ 
  *
  * @param bool $bool Whether to show the Add Existing User form. Default true.
  */
-if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
-	wp_enqueue_script( 'user-suggest' );
+if ( ! wp_is_large_network('users') && apply_filters('show_network_site_users_add_existing_form', true))
+	wp_enqueue_script('user-suggest');
 
-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <script type="text/javascript">
 var current_site_id = <?php echo $id; ?>;
@@ -203,58 +203,58 @@ 
 
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
-<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
+<p class="edit-site-actions"><a href="<?php echo esc_url(get_home_url($id, '/')); ?>"><?php _e('Visit'); ?></a> | <a href="<?php echo esc_url(get_admin_url($id)); ?>"><?php _e('Dashboard'); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
+network_edit_site_nav(array(
 	'blog_id'  => $id,
 	'selected' => 'site-users'
-) );
+));
 
-if ( isset($_GET['update']) ) :
-	switch($_GET['update']) {
+if (isset($_GET['update'])) :
+	switch ($_GET['update']) {
 	case 'adduser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.__('User added.').'</p></div>';
 		break;
 	case 'err_add_member':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+		echo '<div id="message" class="error notice is-dismissible"><p>'.__('User is already a member of this site.').'</p></div>';
 		break;
 	case 'err_add_notfound':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+		echo '<div id="message" class="error notice is-dismissible"><p>'.__('Enter the username of an existing user.').'</p></div>';
 		break;
 	case 'promote':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.__('Changed roles.').'</p></div>';
 		break;
 	case 'err_promote':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+		echo '<div id="message" class="error notice is-dismissible"><p>'.__('Select a user to change role.').'</p></div>';
 		break;
 	case 'remove':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.__('User removed from this site.').'</p></div>';
 		break;
 	case 'err_remove':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+		echo '<div id="message" class="error notice is-dismissible"><p>'.__('Select a user to remove.').'</p></div>';
 		break;
 	case 'newuser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.__('User created.').'</p></div>';
 		break;
 	case 'err_new':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
+		echo '<div id="message" class="error notice is-dismissible"><p>'.__('Enter the username and email.').'</p></div>';
 		break;
 	case 'err_new_dup':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
+		echo '<div id="message" class="error notice is-dismissible"><p>'.__('Duplicated username or email address.').'</p></div>';
 		break;
 	}
 endif; ?>
 
 <form class="search-form" method="get">
-<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
-<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+<?php $wp_list_table->search_box(__('Search Users'), 'user'); ?>
+<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 </form>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="site-users.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(); ?>
 
@@ -266,27 +266,27 @@ 
  *
  * @since 3.1.0
  */
-do_action( 'network_site_users_after_list_table' );
+do_action('network_site_users_after_list_table');
 
 /** This filter is documented in wp-admin/network/site-users.php */
-if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
-<h2 id="add-existing-user"><?php _e( 'Add Existing User' ); ?></h2>
+if (current_user_can('promote_users') && apply_filters('show_network_site_users_add_existing_form', true)) : ?>
+<h2 id="add-existing-user"><?php _e('Add Existing User'); ?></h2>
 <form action="site-users.php?action=adduser" id="adduser" method="post">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="newuser"><?php _e( 'Username' ); ?></label></th>
+			<th scope="row"><label for="newuser"><?php _e('Username'); ?></label></th>
 			<td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="new_role_adduser"><?php _e( 'Role' ); ?></label></th>
+			<th scope="row"><label for="new_role_adduser"><?php _e('Role'); ?></label></th>
 			<td><select name="new_role" id="new_role_adduser">
-			<?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
+			<?php wp_dropdown_roles(get_option('default_role')); ?>
 			</select></td>
 		</tr>
 	</table>
-	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
-	<?php submit_button( __( 'Add User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-existing-user' ) ); ?>
+	<?php wp_nonce_field('add-user', '_wpnonce_add-user') ?>
+	<?php submit_button(__('Add User'), 'primary', 'add-user', true, array('id' => 'submit-add-existing-user')); ?>
 </form>
 <?php endif; ?>
 
@@ -298,33 +298,33 @@ 
  *
  * @param bool $bool Whether to show the Add New User form. Default true.
  */
-if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
-<h2 id="add-new-user"><?php _e( 'Add New User' ); ?></h2>
+if (current_user_can('create_users') && apply_filters('show_network_site_users_add_new_form', true)) : ?>
+<h2 id="add-new-user"><?php _e('Add New User'); ?></h2>
 <form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="user_username"><?php _e('Username') ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="user_username" /></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="user_email"><?php _e('Email') ?></label></th>
 			<td><input type="text" class="regular-text" name="user[email]" id="user_email" /></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="new_role_newuser"><?php _e( 'Role' ); ?></label></th>
+			<th scope="row"><label for="new_role_newuser"><?php _e('Role'); ?></label></th>
 			<td><select name="new_role" id="new_role_newuser">
-			<?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
+			<?php wp_dropdown_roles(get_option('default_role')); ?>
 			</select></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 wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
-	<?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
+	<?php wp_nonce_field('add-user', '_wpnonce_add-new-user') ?>
+	<?php submit_button(__('Add New User'), 'primary', 'add-user', true, array('id' => 'submit-add-user')); ?>
 </form>
 <?php endif; ?>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');