ntwb / wordpress

src/wp-admin/update.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Update/Install Plugin/Theme administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Update/Install Plugin/Theme administration panel.
+	 *
+	 * @package WordPress
+	 * @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 );

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( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
+	if ('update-selected' == $action) {
+		if ( ! current_user_can('update_plugins'))
+			wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins'))
+			wp_die(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		if ( ! current_user_can('upload_plugins')) {
+			wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions 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(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes'))
+			wp_die(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		if ( ! current_user_can('upload_themes')) {
+			wp_die(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
+		if ( ! current_user_can( 'update_plugins' ) ) {
+					wp_die( __( 'You do not have sufficient permissions 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(__('You do not have sufficient permissions to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions to update plugins for this site.'));
+		if ( ! current_user_can('update_plugins') ) {
+					wp_die(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+		if ( ! current_user_can('install_plugins') ) {
+					wp_die( __( 'You do not have sufficient permissions 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(__('You do not have sufficient permissions to update themes for this site.'));
+		if ( ! current_user_can('update_themes') ) {
+					wp_die(__('You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to update themes for this site.' ) );
+		if ( ! current_user_can( 'update_themes' ) ) {
+					wp_die( __( 'You do not have sufficient permissions 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( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+		if ( ! current_user_can('install_themes') ) {
+					wp_die( __( 'You do not have sufficient permissions 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/credits.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Credits administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Credits administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +53 added lines, -53 removed lines

@@ -7,88 +7,88 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require_once( dirname( __FILE__ ) . '/includes/credits.php' );
+require_once(dirname(__FILE__).'/admin.php');
+require_once(dirname(__FILE__).'/includes/credits.php');
 
-$title = __( 'Credits' );
+$title = __('Credits');
 
-list( $display_version ) = explode( '-', $wp_version );
+list($display_version) = explode('-', $wp_version);
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap about-wrap">
 
-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
+<h1><?php printf(__('Welcome to WordPress %s'), $display_version); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf(__('Thank you for updating! WordPress %s makes your site more connected and responsive.'), $display_version); ?></div>
 
-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 <h2 class="nav-tab-wrapper wp-clearfix">
-	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+	<a href="about.php" class="nav-tab"><?php _e('What&#8217;s New'); ?></a>
+	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e('Credits'); ?></a>
+	<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 </h2>
 
 <?php
 
 $credits = wp_credits();
 
-if ( ! $credits ) {
+if ( ! $credits) {
 	echo '<p class="about-description">';
 	/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-	printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+	printf(__('WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.'),
 		'https://wordpress.org/about/',
-		__( 'https://make.wordpress.org/' )
+		__('https://make.wordpress.org/')
 	);
 	echo '</p>';
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
-echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
+echo '<p class="about-description">'.__('WordPress is created by a worldwide team of passionate individuals.')."</p>\n";
 
-foreach ( $credits['groups'] as $group_slug => $group_data ) {
-	if ( $group_data['name'] ) {
-		if ( 'Translators' == $group_data['name'] ) {
+foreach ($credits['groups'] as $group_slug => $group_data) {
+	if ($group_data['name']) {
+		if ('Translators' == $group_data['name']) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+			$title = _x('Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section');
+		} elseif (isset($group_data['placeholders'])) {
+			$title = vsprintf(translate($group_data['name']), $group_data['placeholders']);
 		} else {
-			$title = translate( $group_data['name'] );
+			$title = translate($group_data['name']);
 		}
 
-		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
+		echo '<h3 class="wp-people-group">'.esc_html($title)."</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty($group_data['shuffle']))
+		shuffle($group_data['data']); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
-	switch ( $group_data['type'] ) {
+	switch ($group_data['type']) {
 		case 'list' :
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles']);
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		case 'libraries' :
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_build_object_link');
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		default:
 			$compact = 'compact' == $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
-			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
-				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
+			$classes = 'wp-people-group '.($compact ? 'compact' : '');
+			echo '<ul class="'.$classes.'" id="wp-people-group-'.$group_slug.'">'."\n";
+			foreach ($group_data['data'] as $person_data) {
+				echo '<li class="wp-person" id="wp-person-'.esc_attr($person_data[2]).'">'."\n\t";
+				echo '<a href="'.esc_url(sprintf($credits['data']['profiles'], $person_data[2])).'" class="web">';
 				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$data = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
 				$size *= 2;
-				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
-				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				$data2x = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
+				echo '<img src="'.esc_url($data['url']).'" srcset="'.esc_url($data2x['url']).' 2x" class="gravatar" alt="" />'."\n";
+				echo esc_html($person_data[0])."</a>\n\t";
+				if ( ! $compact)
+					echo '<span class="title">'.translate($person_data[3])."</span>\n";
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
@@ -99,24 +99,24 @@ 
 ?>
 <p class="clear"><?php
 	/* translators: %s: https://make.wordpress.org/ */
-	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-		__( 'https://make.wordpress.org/' )
+	printf(__('Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.'),
+		__('https://make.wordpress.org/')
 	);
 ?></p>
 
 </div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 return;
 
 // These are strings returned by the API that we want to be translatable
-__( 'Project Leaders' );
-__( 'Core Contributors to WordPress %s' );
-__( 'Contributing Developers' );
-__( 'Cofounder, Project Lead' );
-__( 'Lead Developer' );
-__( 'Release Lead' );
-__( 'Core Developer' );
-__( 'External Libraries' );
+__('Project Leaders');
+__('Core Contributors to WordPress %s');
+__('Contributing Developers');
+__('Cofounder, Project Lead');
+__('Lead Developer');
+__('Release Lead');
+__('Core Developer');
+__('External Libraries');

Braces +7 added lines, -4 removed lines

@@ -62,8 +62,10 @@ 
 		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty( $group_data['shuffle'] ) ) {
+			shuffle( $group_data['data'] );
+	}
+	// We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
 	switch ( $group_data['type'] ) {
 		case 'list' :
@@ -87,8 +89,9 @@ 
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				if ( ! $compact ) {
+									echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";

src/wp-admin/press-this.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Press This Display and Handler.
- *
- * @package WordPress
- * @subpackage Press_This
- */
+			 * Press This Display and Handler.
+			 *
+			 * @package WordPress
+			 * @subpackage Press_This
+			 */
 
 define('IFRAME_REQUEST' , true);
 

Spacing +7 added lines, -7 removed lines

@@ -6,15 +6,15 @@ 
  * @subpackage Press_This
  */
 
-define('IFRAME_REQUEST' , true);
+define('IFRAME_REQUEST', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+if ( ! current_user_can('edit_posts') || ! current_user_can(get_post_type_object('post')->cap->create_posts)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to create posts as this user.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to create posts as this user.').'</p>',
 		403
 	);
 }
@@ -22,8 +22,8 @@ 
 /**
  * @global WP_Press_This $wp_press_this
  */
-if ( empty( $GLOBALS['wp_press_this'] ) ) {
-	include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+if (empty($GLOBALS['wp_press_this'])) {
+	include(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 }
 
 $GLOBALS['wp_press_this']->html();

src/wp-admin/setup-config.php

Switch Indentation +133 added lines, -133 removed lines

@@ -111,37 +111,37 @@ 
 }
 
 switch($step) {
-	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			setup_config_display_header( 'language-chooser' );
-			echo '<h1 class="screen-reader-text">Select a default language</h1>';
-			echo '<form id="setup" method="post" action="?step=0">';
-			wp_install_language_form( $languages );
-			echo '</form>';
-			break;
-		}
+		case -1:
+			if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+				setup_config_display_header( 'language-chooser' );
+				echo '<h1 class="screen-reader-text">Select a default language</h1>';
+				echo '<form id="setup" method="post" action="?step=0">';
+				wp_install_language_form( $languages );
+				echo '</form>';
+				break;
+			}
 
-		// Deliberately fall through if we can't reach the translations API.
+			// Deliberately fall through if we can't reach the translations API.
 
-	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
-				$GLOBALS['wp_locale'] = new WP_Locale();
+		case 0:
+			if ( ! empty( $language ) ) {
+				$loaded_language = wp_download_language_pack( $language );
+				if ( $loaded_language ) {
+					load_default_textdomain( $loaded_language );
+					$GLOBALS['wp_locale'] = new WP_Locale();
+				}
 			}
-		}
 
-		setup_config_display_header();
-		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
-			$step_1 .= '&amp;noapi';
-		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
-		}
-?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
+			setup_config_display_header();
+			$step_1 = 'setup-config.php?step=1';
+			if ( isset( $_REQUEST['noapi'] ) ) {
+				$step_1 .= '&amp;noapi';
+			}
+			if ( ! empty( $loaded_language ) ) {
+				$step_1 .= '&amp;language=' . $loaded_language;
+			}
+	?>
+	<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
 <ol>
 	<li><?php _e( 'Database name' ); ?></li>
@@ -151,37 +151,37 @@ 
 	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
 <p><?php
-	/* translators: %s: wp-config.php */
-	printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
-		'<code>wp-config.php</code>'
-	);
-	?>
-	<strong><?php
-		/* translators: 1: wp-config-sample.php, 2: wp-config.php */
-		printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
-			'<code>wp-config-sample.php</code>',
+		/* translators: %s: wp-config.php */
+		printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
 			'<code>wp-config.php</code>'
 		);
-	?></strong>
+		?>
+		<strong><?php
+			/* translators: 1: wp-config-sample.php, 2: wp-config.php */
+			printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
+				'<code>wp-config-sample.php</code>',
+				'<code>wp-config.php</code>'
+			);
+		?></strong>
 	<?php
-	/* translators: %s: Codex URL */
-	printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
-	);
-?></p>
+		/* translators: %s: Codex URL */
+		printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
+			__( 'https://codex.wordpress.org/Editing_wp-config.php' )
+		);
+	?></p>
 <p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
-<?php
-	break;
+	<?php
+		break;
 
-	case 1:
-		load_default_textdomain( $language );
-		$GLOBALS['wp_locale'] = new WP_Locale();
+		case 1:
+			load_default_textdomain( $language );
+			$GLOBALS['wp_locale'] = new WP_Locale();
 
-		setup_config_display_header();
-	?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
+			setup_config_display_header();
+		?>
+	<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
 	<table class="form-table">
@@ -204,9 +204,9 @@ 
 			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
 			<td><?php
-				/* translators: %s: localhost */
-				printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
-			?></td>
+					/* translators: %s: localhost */
+					printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
+				?></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
@@ -215,113 +215,113 @@ 
 		</tr>
 	</table>
 	<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
+		<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
 	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 <?php
-	break;
+		break;
 
-	case 2:
-	load_default_textdomain( $language );
-	$GLOBALS['wp_locale'] = new WP_Locale();
+		case 2:
+		load_default_textdomain( $language );
+		$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+		$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
+		$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
+		$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
+		$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
+		$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
 
-	$step_1 = 'setup-config.php?step=1';
-	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
-		$step_1 .= '&amp;noapi';
-	}
+		$step_1 = 'setup-config.php?step=1';
+		$install = 'install.php';
+		if ( isset( $_REQUEST['noapi'] ) ) {
+			$step_1 .= '&amp;noapi';
+		}
 
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
-	} else {
-		$install .= '?language=en_US';
-	}
+		if ( ! empty( $language ) ) {
+			$step_1 .= '&amp;language=' . $language;
+			$install .= '?language=' . $language;
+		} else {
+			$install .= '?language=en_US';
+		}
 
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+		$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+		if ( empty( $prefix ) )
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
 
-	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+		// Validate $prefix: it can only contain letters, numbers and underscores.
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
 
-	// Test the db connection.
-	/**#@+
+		// Test the db connection.
+		/**#@+
 	 * @ignore
 	 */
-	define('DB_NAME', $dbname);
-	define('DB_USER', $uname);
-	define('DB_PASSWORD', $pwd);
-	define('DB_HOST', $dbhost);
-	/**#@-*/
+		define('DB_NAME', $dbname);
+		define('DB_USER', $uname);
+		define('DB_PASSWORD', $pwd);
+		define('DB_HOST', $dbhost);
+		/**#@-*/
 
-	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
-	require_wp_db();
+		// Re-construct $wpdb with these new values.
+		unset( $wpdb );
+		require_wp_db();
 
-	/*
+		/*
 	 * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
 	 * fire this manually. We'll fail here if the values are no good.
 	 */
-	$wpdb->db_connect();
-
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
-
-	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
-	try {
-		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
-		$max = strlen($chars) - 1;
-		for ( $i = 0; $i < 8; $i++ ) {
-			$key = '';
-			for ( $j = 0; $j < 64; $j++ ) {
-				$key .= substr( $chars, random_int( 0, $max ), 1 );
-			}
-			$secret_keys[] = $key;
-		}
-	} catch ( Exception $ex ) {
-		$no_api = isset( $_POST['noapi'] );
+		$wpdb->db_connect();
 
-		if ( ! $no_api ) {
-			$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-		}
+		if ( ! empty( $wpdb->error ) )
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
-		if ( $no_api || is_wp_error( $secret_keys ) ) {
-			$secret_keys = array();
+		// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
+		try {
+			$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
+			$max = strlen($chars) - 1;
 			for ( $i = 0; $i < 8; $i++ ) {
-				$secret_keys[] = wp_generate_password( 64, true, true );
+				$key = '';
+				for ( $j = 0; $j < 64; $j++ ) {
+					$key .= substr( $chars, random_int( 0, $max ), 1 );
+				}
+				$secret_keys[] = $key;
 			}
-		} else {
-			$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-			foreach ( $secret_keys as $k => $v ) {
-				$secret_keys[$k] = substr( $v, 28, 64 );
+		} catch ( Exception $ex ) {
+			$no_api = isset( $_POST['noapi'] );
+
+			if ( ! $no_api ) {
+				$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
 			}
-		}
-	}
 
-	$key = 0;
-	// Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
-			continue;
+			if ( $no_api || is_wp_error( $secret_keys ) ) {
+				$secret_keys = array();
+				for ( $i = 0; $i < 8; $i++ ) {
+					$secret_keys[] = wp_generate_password( 64, true, true );
+				}
+			} else {
+				$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
+				foreach ( $secret_keys as $k => $v ) {
+					$secret_keys[$k] = substr( $v, 28, 64 );
+				}
+			}
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
+		$key = 0;
+		// Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
+		foreach ( $config_file as $line_num => $line ) {
+			if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
+				$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+				continue;
+			}
 
-		$constant = $match[1];
-		$padding  = $match[2];
+			if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+				continue;
 
-		switch ( $constant ) {
+			$constant = $match[1];
+			$padding  = $match[2];
+
+			switch ( $constant ) {
 			case 'DB_NAME'     :
 			case 'DB_USER'     :
 			case 'DB_PASSWORD' :
@@ -343,7 +343,7 @@ 
 			case 'NONCE_SALT'       :
 				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
 				break;
-		}
+			}
 	}
 	unset( $line );
 

Spacing +130 added lines, -130 removed lines

@@ -28,46 +28,46 @@ 
  */
 error_reporting(0);
 
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+define('ABSPATH', dirname(dirname(__FILE__)).'/');
 
-require( ABSPATH . 'wp-settings.php' );
+require(ABSPATH.'wp-settings.php');
 
 /** Load WordPress Administration Upgrade API */
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 /** Load WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
 nocache_headers();
 
 // Support wp-config-sample.php one level up, for the develop repo.
-if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
-	$config_file = file( ABSPATH . 'wp-config-sample.php' );
-elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
-	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
+if (file_exists(ABSPATH.'wp-config-sample.php'))
+	$config_file = file(ABSPATH.'wp-config-sample.php');
+elseif (file_exists(dirname(ABSPATH).'/wp-config-sample.php'))
+	$config_file = file(dirname(ABSPATH).'/wp-config-sample.php');
 else
-	wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.' ) );
+	wp_die(__('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.'));
 
 // Check if wp-config.php has been created
-if ( file_exists( ABSPATH . 'wp-config.php' ) )
-	wp_die( '<p>' . sprintf(
+if (file_exists(ABSPATH.'wp-config.php'))
+	wp_die('<p>'.sprintf(
 			/* translators: %s: install.php */
-			__( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
+			__("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>."),
 			'install.php'
-		) . '</p>'
+		).'</p>'
 	);
 
 // Check if wp-config.php exists above the root directory but is not part of another install
-if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
-	wp_die( '<p>' . sprintf(
+if (@file_exists(ABSPATH.'../wp-config.php') && ! @file_exists(ABSPATH.'../wp-settings.php')) {
+	wp_die('<p>'.sprintf(
 			/* translators: %s: install.php */
-			__( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
+			__("The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>."),
 			'install.php'
-		) . '</p>'
+		).'</p>'
 	);
 }
 
-$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
+$step = isset($_GET['step']) ? (int) $_GET['step'] : -1;
 
 /**
  * Display setup wp-config.php file header.
@@ -80,43 +80,43 @@ 
  *
  * @param string|array $body_classes
  */
-function setup_config_display_header( $body_classes = array() ) {
+function setup_config_display_header($body_classes = array()) {
 	$body_classes = (array) $body_classes;
 	$body_classes[] = 'wp-core-ui';
-	if ( is_rtl() ) {
+	if (is_rtl()) {
 		$body_classes[] = 'rtl';
 	}
 
-	header( 'Content-Type: text/html; charset=utf-8' );
+	header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
-	<title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
-	<?php wp_admin_css( 'install', true ); ?>
+	<title><?php _e('WordPress &rsaquo; Setup Configuration File'); ?></title>
+	<?php wp_admin_css('install', true); ?>
 </head>
-<body class="<?php echo implode( ' ', $body_classes ); ?>">
-<p id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<body class="<?php echo implode(' ', $body_classes); ?>">
+<p id="logo"><a href="<?php esc_attr_e('https://wordpress.org/'); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></p>
 <?php
 } // end function setup_config_display_header();
 
 $language = '';
-if ( ! empty( $_REQUEST['language'] ) ) {
-	$language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
-} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+if ( ! empty($_REQUEST['language'])) {
+	$language = preg_replace('/[^a-zA-Z_]/', '', $_REQUEST['language']);
+} elseif (isset($GLOBALS['wp_local_package'])) {
 	$language = $GLOBALS['wp_local_package'];
 }
 
-switch($step) {
+switch ($step) {
 	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			setup_config_display_header( 'language-chooser' );
+		if (wp_can_install_language_pack() && empty($language) && ($languages = wp_get_available_translations())) {
+			setup_config_display_header('language-chooser');
 			echo '<h1 class="screen-reader-text">Select a default language</h1>';
 			echo '<form id="setup" method="post" action="?step=0">';
-			wp_install_language_form( $languages );
+			wp_install_language_form($languages);
 			echo '</form>';
 			break;
 		}
@@ -124,134 +124,134 @@ 
 		// Deliberately fall through if we can't reach the translations API.
 
 	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
+		if ( ! empty($language)) {
+			$loaded_language = wp_download_language_pack($language);
+			if ($loaded_language) {
+				load_default_textdomain($loaded_language);
 				$GLOBALS['wp_locale'] = new WP_Locale();
 			}
 		}
 
 		setup_config_display_header();
 		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
+		if (isset($_REQUEST['noapi'])) {
 			$step_1 .= '&amp;noapi';
 		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
+		if ( ! empty($loaded_language)) {
+			$step_1 .= '&amp;language='.$loaded_language;
 		}
 ?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
-<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
+<h1 class="screen-reader-text"><?php _e('Before getting started') ?></h1>
+<p><?php _e('Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.') ?></p>
 <ol>
-	<li><?php _e( 'Database name' ); ?></li>
-	<li><?php _e( 'Database username' ); ?></li>
-	<li><?php _e( 'Database password' ); ?></li>
-	<li><?php _e( 'Database host' ); ?></li>
-	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
+	<li><?php _e('Database name'); ?></li>
+	<li><?php _e('Database username'); ?></li>
+	<li><?php _e('Database password'); ?></li>
+	<li><?php _e('Database host'); ?></li>
+	<li><?php _e('Table prefix (if you want to run more than one WordPress in a single database)'); ?></li>
 </ol>
 <p><?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
+	printf(__('We&#8217;re going to use this information to create a %s file.'),
 		'<code>wp-config.php</code>'
 	);
 	?>
 	<strong><?php
 		/* translators: 1: wp-config-sample.php, 2: wp-config.php */
-		printf( __( 'If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
+		printf(__('If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.'),
 			'<code>wp-config-sample.php</code>',
 			'<code>wp-config.php</code>'
 		);
 	?></strong>
 	<?php
 	/* translators: %s: Codex URL */
-	printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
-		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
+	printf(__('Need more help? <a href="%s">We got it</a>.'),
+		__('https://codex.wordpress.org/Editing_wp-config.php')
 	);
 ?></p>
-<p><?php _e( 'In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;' ); ?></p>
+<p><?php _e('In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;'); ?></p>
 
-<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
+<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e('Let&#8217;s go!'); ?></a></p>
 <?php
 	break;
 
 	case 1:
-		load_default_textdomain( $language );
+		load_default_textdomain($language);
 		$GLOBALS['wp_locale'] = new WP_Locale();
 
 		setup_config_display_header();
 	?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
+<h1 class="screen-reader-text"><?php _e('Set up your database connection') ?></h1>
 <form method="post" action="setup-config.php?step=2">
-	<p><?php _e( 'Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.' ); ?></p>
+	<p><?php _e('Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host.'); ?></p>
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
+			<th scope="row"><label for="dbname"><?php _e('Database Name'); ?></label></th>
 			<td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
-			<td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
+			<td><?php _e('The name of the database you want to use with WordPress.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="uname"><?php _e( 'Username' ); ?></label></th>
-			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
-			<td><?php _e( 'Your database username.' ); ?></td>
+			<th scope="row"><label for="uname"><?php _e('Username'); ?></label></th>
+			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars(_x('username', 'example username'), ENT_QUOTES); ?>" /></td>
+			<td><?php _e('Your database username.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
-			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
-			<td><?php _e( 'Your database password.' ); ?></td>
+			<th scope="row"><label for="pwd"><?php _e('Password'); ?></label></th>
+			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars(_x('password', 'example password'), ENT_QUOTES); ?>" autocomplete="off" /></td>
+			<td><?php _e('Your database password.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
+			<th scope="row"><label for="dbhost"><?php _e('Database Host'); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
 			<td><?php
 				/* translators: %s: localhost */
-				printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
+				printf(__('You should be able to get this info from your web host, if %s doesn&#8217;t work.'), '<code>localhost</code>');
 			?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
+			<th scope="row"><label for="prefix"><?php _e('Table Prefix'); ?></label></th>
 			<td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td>
-			<td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
+			<td><?php _e('If you want to run multiple WordPress installations in a single database, change this.'); ?></td>
 		</tr>
 	</table>
-	<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
-	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
+	<?php if (isset($_GET['noapi'])) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
+	<input type="hidden" name="language" value="<?php echo esc_attr($language); ?>" />
+	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars(__('Submit'), ENT_QUOTES); ?>" class="button button-large" /></p>
 </form>
 <?php
 	break;
 
 	case 2:
-	load_default_textdomain( $language );
+	load_default_textdomain($language);
 	$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+	$dbname = trim(wp_unslash($_POST['dbname']));
+	$uname = trim(wp_unslash($_POST['uname']));
+	$pwd = trim(wp_unslash($_POST['pwd']));
+	$dbhost = trim(wp_unslash($_POST['dbhost']));
+	$prefix = trim(wp_unslash($_POST['prefix']));
 
 	$step_1 = 'setup-config.php?step=1';
 	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
+	if (isset($_REQUEST['noapi'])) {
 		$step_1 .= '&amp;noapi';
 	}
 
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
+	if ( ! empty($language)) {
+		$step_1 .= '&amp;language='.$language;
+		$install .= '?language='.$language;
 	} else {
 		$install .= '?language=en_US';
 	}
 
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+	$tryagain_link = '</p><p class="step"><a href="'.$step_1.'" onclick="javascript:history.go(-1);return false;" class="button button-large">'.__('Try again').'</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	if (empty($prefix))
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" must not be empty.'.$tryagain_link));
 
 	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	if (preg_match('|[^a-z0-9_]|i', $prefix))
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.'.$tryagain_link));
 
 	// Test the db connection.
 	/**#@+
@@ -264,7 +264,7 @@ 
 	/**#@-*/
 
 	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
+	unset($wpdb);
 	require_wp_db();
 
 	/*
@@ -273,64 +273,64 @@ 
 	 */
 	$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	if ( ! empty($wpdb->error))
+		wp_die($wpdb->error->get_error_message().$tryagain_link);
 
 	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
 	try {
 		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
 		$max = strlen($chars) - 1;
-		for ( $i = 0; $i < 8; $i++ ) {
+		for ($i = 0; $i < 8; $i++) {
 			$key = '';
-			for ( $j = 0; $j < 64; $j++ ) {
-				$key .= substr( $chars, random_int( 0, $max ), 1 );
+			for ($j = 0; $j < 64; $j++) {
+				$key .= substr($chars, random_int(0, $max), 1);
 			}
 			$secret_keys[] = $key;
 		}
-	} catch ( Exception $ex ) {
-		$no_api = isset( $_POST['noapi'] );
+	} catch (Exception $ex) {
+		$no_api = isset($_POST['noapi']);
 
-		if ( ! $no_api ) {
-			$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+		if ( ! $no_api) {
+			$secret_keys = wp_remote_get('https://api.wordpress.org/secret-key/1.1/salt/');
 		}
 
-		if ( $no_api || is_wp_error( $secret_keys ) ) {
+		if ($no_api || is_wp_error($secret_keys)) {
 			$secret_keys = array();
-			for ( $i = 0; $i < 8; $i++ ) {
-				$secret_keys[] = wp_generate_password( 64, true, true );
+			for ($i = 0; $i < 8; $i++) {
+				$secret_keys[] = wp_generate_password(64, true, true);
 			}
 		} else {
-			$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-			foreach ( $secret_keys as $k => $v ) {
-				$secret_keys[$k] = substr( $v, 28, 64 );
+			$secret_keys = explode("\n", wp_remote_retrieve_body($secret_keys));
+			foreach ($secret_keys as $k => $v) {
+				$secret_keys[$k] = substr($v, 28, 64);
 			}
 		}
 	}
 
 	$key = 0;
 	// Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+	foreach ($config_file as $line_num => $line) {
+		if ('$table_prefix  =' == substr($line, 0, 16)) {
+			$config_file[$line_num] = '$table_prefix  = \''.addcslashes($prefix, "\\'")."';\r\n";
 			continue;
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+		if ( ! preg_match('/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match))
 			continue;
 
 		$constant = $match[1];
 		$padding  = $match[2];
 
-		switch ( $constant ) {
+		switch ($constant) {
 			case 'DB_NAME'     :
 			case 'DB_USER'     :
 			case 'DB_PASSWORD' :
 			case 'DB_HOST'     :
-				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
+				$config_file[$line_num] = "define('".$constant."',".$padding."'".addcslashes(constant($constant), "\\'")."');\r\n";
 				break;
 			case 'DB_CHARSET'  :
-				if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
-					$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'utf8mb4');\r\n";
+				if ('utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap('utf8mb4'))) {
+					$config_file[$line_num] = "define('".$constant."',".$padding."'utf8mb4');\r\n";
 				}
 				break;
 			case 'AUTH_KEY'         :
@@ -341,30 +341,30 @@ 
 			case 'SECURE_AUTH_SALT' :
 			case 'LOGGED_IN_SALT'   :
 			case 'NONCE_SALT'       :
-				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
+				$config_file[$line_num] = "define('".$constant."',".$padding."'".$secret_keys[$key++]."');\r\n";
 				break;
 		}
 	}
-	unset( $line );
+	unset($line);
 
-	if ( ! is_writable(ABSPATH) ) :
+	if ( ! is_writable(ABSPATH)) :
 		setup_config_display_header();
 ?>
 <p><?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'Sorry, but I can&#8217;t write the %s file.' ), '<code>wp-config.php</code>' );
+	printf(__('Sorry, but I can&#8217;t write the %s file.'), '<code>wp-config.php</code>');
 ?></p>
 <p><?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'You can create the %s manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+	printf(__('You can create the %s manually and paste the following text into it.'), '<code>wp-config.php</code>');
 ?></p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
-		foreach ( $config_file as $line ) {
+		foreach ($config_file as $line) {
 			echo htmlentities($line, ENT_COMPAT, 'UTF-8');
 		}
 ?></textarea>
-<p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p><?php _e('After you&#8217;ve done that, click &#8220;Run the install.&#8221;'); ?></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e('Run the install'); ?></a></p>
 <script>
 (function(){
 if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
@@ -380,28 +380,28 @@ 
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
-		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
-			$path_to_wp_config = ABSPATH . 'wp-config.php';
+		if (file_exists(ABSPATH.'wp-config-sample.php'))
+			$path_to_wp_config = ABSPATH.'wp-config.php';
 		else
-			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+			$path_to_wp_config = dirname(ABSPATH).'/wp-config.php';
 
-		$handle = fopen( $path_to_wp_config, 'w' );
-		foreach ( $config_file as $line ) {
-			fwrite( $handle, $line );
+		$handle = fopen($path_to_wp_config, 'w');
+		foreach ($config_file as $line) {
+			fwrite($handle, $line);
 		}
-		fclose( $handle );
-		chmod( $path_to_wp_config, 0666 );
+		fclose($handle);
+		chmod($path_to_wp_config, 0666);
 		setup_config_display_header();
 ?>
-<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
-<p><?php _e( 'All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;' ); ?></p>
+<h1 class="screen-reader-text"><?php _e('Successful database connection') ?></h1>
+<p><?php _e('All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;'); ?></p>
 
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e('Run the install'); ?></a></p>
 <?php
 	endif;
 	break;
 }
 ?>
-<?php wp_print_scripts( 'language-chooser' ); ?>
+<?php wp_print_scripts('language-chooser'); ?>
 </body>
 </html>

Braces +28 added lines, -16 removed lines

@@ -41,21 +41,23 @@ 
 nocache_headers();
 
 // Support wp-config-sample.php one level up, for the develop repo.
-if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+if ( file_exists( ABSPATH . 'wp-config-sample.php' ) ) {
 	$config_file = file( ABSPATH . 'wp-config-sample.php' );
-elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
+} elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) ) {
 	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
-else
+} else {
 	wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.' ) );
+}
 
 // Check if wp-config.php has been created
-if ( file_exists( ABSPATH . 'wp-config.php' ) )
+if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
 	wp_die( '<p>' . sprintf(
 			/* translators: %s: install.php */
 			__( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
 			'install.php'
 		) . '</p>'
 	);
+}
 
 // Check if wp-config.php exists above the root directory but is not part of another install
 if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
@@ -90,7 +92,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -246,12 +251,14 @@ 
 
 	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	if ( empty( $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	}
 
 	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	}
 
 	// Test the db connection.
 	/**#@+
@@ -273,8 +280,9 @@ 
 	 */
 	$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	if ( ! empty( $wpdb->error ) ) {
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	}
 
 	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
 	try {
@@ -315,8 +323,9 @@ 
 			continue;
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
+		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
+					continue;
+		}
 
 		$constant = $match[1];
 		$padding  = $match[2];
@@ -375,15 +384,18 @@ 
 })();
 </script>
 <?php
-	else :
+	else {
+		:
 		/*
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
 		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
 			$path_to_wp_config = ABSPATH . 'wp-config.php';
-		else
-			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+	}
+		else {
+					$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+		}
 
 		$handle = fopen( $path_to_wp_config, 'w' );
 		foreach ( $config_file as $line ) {

src/wp-admin/export.php

Indentation +4 added lines, -4 removed lines

@@ -280,10 +280,10 @@
 </fieldset>
 <?php
 /**
- * Fires at the end of the export filters form.
- *
- * @since 3.5.0
- */
+		 * Fires at the end of the export filters form.
+		 *
+		 * @since 3.5.0
+		 */
 do_action( 'export_filters' );
 ?>
 

Spacing +89 added lines, -89 removed lines

@@ -7,13 +7,13 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('export') )
+if ( ! current_user_can('export'))
 	wp_die(__('You do not have sufficient permissions to export the content of this site.'));
 
 /** Load WordPress export API */
-require_once( ABSPATH . 'wp-admin/includes/export.php' );
+require_once(ABSPATH.'wp-admin/includes/export.php');
 $title = __('Export');
 
 /**
@@ -40,60 +40,60 @@ 
 </script>
 <?php
 }
-add_action( 'admin_head', 'export_add_js' );
+add_action('admin_head', 'export_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
-		'<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
-) );
+	'content' => '<p>'.__('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.').'</p>'.
+		'<p>'.__('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Export_Screen" target="_blank">Documentation on Export</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_Export_Screen" target="_blank">Documentation on Export</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 // If the 'download' URL parameter is set, a WXR export file is baked and returned.
-if ( isset( $_GET['download'] ) ) {
+if (isset($_GET['download'])) {
 	$args = array();
 
-	if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) {
+	if ( ! isset($_GET['content']) || 'all' == $_GET['content']) {
 		$args['content'] = 'all';
-	} elseif ( 'posts' == $_GET['content'] ) {
+	} elseif ('posts' == $_GET['content']) {
 		$args['content'] = 'post';
 
-		if ( $_GET['cat'] )
+		if ($_GET['cat'])
 			$args['category'] = (int) $_GET['cat'];
 
-		if ( $_GET['post_author'] )
+		if ($_GET['post_author'])
 			$args['author'] = (int) $_GET['post_author'];
 
-		if ( $_GET['post_start_date'] || $_GET['post_end_date'] ) {
+		if ($_GET['post_start_date'] || $_GET['post_end_date']) {
 			$args['start_date'] = $_GET['post_start_date'];
 			$args['end_date'] = $_GET['post_end_date'];
 		}
 
-		if ( $_GET['post_status'] )
+		if ($_GET['post_status'])
 			$args['status'] = $_GET['post_status'];
-	} elseif ( 'pages' == $_GET['content'] ) {
+	} elseif ('pages' == $_GET['content']) {
 		$args['content'] = 'page';
 
-		if ( $_GET['page_author'] )
+		if ($_GET['page_author'])
 			$args['author'] = (int) $_GET['page_author'];
 
-		if ( $_GET['page_start_date'] || $_GET['page_end_date'] ) {
+		if ($_GET['page_start_date'] || $_GET['page_end_date']) {
 			$args['start_date'] = $_GET['page_start_date'];
 			$args['end_date'] = $_GET['page_end_date'];
 		}
 
-		if ( $_GET['page_status'] )
+		if ($_GET['page_status'])
 			$args['status'] = $_GET['page_status'];
-	} elseif ( 'attachment' == $_GET['content'] ) {
+	} elseif ('attachment' == $_GET['content']) {
 		$args['content'] = 'attachment';
 
-		if ( $_GET['attachment_start_date'] || $_GET['attachment_end_date'] ) {
+		if ($_GET['attachment_start_date'] || $_GET['attachment_end_date']) {
 			$args['start_date'] = $_GET['attachment_start_date'];
 			$args['end_date'] = $_GET['attachment_end_date'];
 		}
@@ -109,13 +109,13 @@ 
 	 *
 	 * @param array $args The arguments to send to the exporter.
 	 */
-	$args = apply_filters( 'export_args', $args );
+	$args = apply_filters('export_args', $args);
 
-	export_wp( $args );
+	export_wp($args);
 	die();
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 /**
  * Create the date options fields for exporting a given post type.
@@ -127,151 +127,151 @@ 
  *
  * @param string $post_type The post type. Default 'post'.
  */
-function export_date_options( $post_type = 'post' ) {
+function export_date_options($post_type = 'post') {
 	global $wpdb, $wp_locale;
 
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	$months = $wpdb->get_results($wpdb->prepare("
 		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 		FROM $wpdb->posts
 		WHERE post_type = %s AND post_status != 'auto-draft'
 		ORDER BY post_date DESC
-	", $post_type ) );
+	", $post_type));
 
-	$month_count = count( $months );
-	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+	$month_count = count($months);
+	if ( ! $month_count || (1 == $month_count && 0 == $months[0]->month))
 		return;
 
-	foreach ( $months as $date ) {
-		if ( 0 == $date->year )
+	foreach ($months as $date) {
+		if (0 == $date->year)
 			continue;
 
-		$month = zeroise( $date->month, 2 );
-		echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';
+		$month = zeroise($date->month, 2);
+		echo '<option value="'.$date->year.'-'.$month.'">'.$wp_locale->get_month($month).' '.$date->year.'</option>';
 	}
 }
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
 <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
 <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.'); ?></p>
 
-<h2><?php _e( 'Choose what to export' ); ?></h2>
+<h2><?php _e('Choose what to export'); ?></h2>
 <form method="get" id="export-filters">
 <fieldset>
-<legend class="screen-reader-text"><?php _e( 'Content to export' ); ?></legend>
+<legend class="screen-reader-text"><?php _e('Content to export'); ?></legend>
 <input type="hidden" name="download" value="true" />
-<p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e( 'All content' ); ?></label></p>
-<p class="description" id="all-content-desc"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.' ); ?></p>
+<p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e('All content'); ?></label></p>
+<p class="description" id="all-content-desc"><?php _e('This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.'); ?></p>
 
-<p><label><input type="radio" name="content" value="posts" /> <?php _e( 'Posts' ); ?></label></p>
+<p><label><input type="radio" name="content" value="posts" /> <?php _e('Posts'); ?></label></p>
 <ul id="post-filters" class="export-filters">
 	<li>
-		<label><span class="label-responsive"><?php _e( 'Categories:' ); ?></span>
-		<?php wp_dropdown_categories( array( 'show_option_all' => __('All') ) ); ?>
+		<label><span class="label-responsive"><?php _e('Categories:'); ?></span>
+		<?php wp_dropdown_categories(array('show_option_all' => __('All'))); ?>
 		</label>
 	</li>
 	<li>
-		<label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
+		<label><span class="label-responsive"><?php _e('Authors:'); ?></span>
 		<?php
-		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'" );
-		wp_dropdown_users( array(
+		$authors = $wpdb->get_col("SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'");
+		wp_dropdown_users(array(
 			'include' => $authors,
 			'name' => 'post_author',
 			'multi' => true,
-			'show_option_all' => __( 'All' ),
+			'show_option_all' => __('All'),
 			'show' => 'display_name_with_login',
-		) ); ?>
+		)); ?>
 		</label>
 	</li>
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
-		<label for="post-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+		<legend class="screen-reader-text"><?php _e('Date range:'); ?></legend>
+		<label for="post-start-date" class="label-responsive"><?php _e('Start date:'); ?></label>
 		<select name="post_start_date" id="post-start-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
 			<?php export_date_options(); ?>
 		</select>
-		<label for="post-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+		<label for="post-end-date" class="label-responsive"><?php _e('End date:'); ?></label>
 		<select name="post_end_date" id="post-end-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
 			<?php export_date_options(); ?>
 		</select>
 		</fieldset>
 	</li>
 	<li>
-		<label for="post-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
+		<label for="post-status" class="label-responsive"><?php _e('Status:'); ?></label>
 		<select name="post_status" id="post-status">
-			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
-			foreach ( $post_stati as $status ) : ?>
-			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
+			<option value="0"><?php _e('All'); ?></option>
+			<?php $post_stati = get_post_stati(array('internal' => false), 'objects');
+			foreach ($post_stati as $status) : ?>
+			<option value="<?php echo esc_attr($status->name); ?>"><?php echo esc_html($status->label); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</li>
 </ul>
 
-<p><label><input type="radio" name="content" value="pages" /> <?php _e( 'Pages' ); ?></label></p>
+<p><label><input type="radio" name="content" value="pages" /> <?php _e('Pages'); ?></label></p>
 <ul id="page-filters" class="export-filters">
 	<li>
-		<label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
+		<label><span class="label-responsive"><?php _e('Authors:'); ?></span>
 		<?php
-		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'" );
-		wp_dropdown_users( array(
+		$authors = $wpdb->get_col("SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'");
+		wp_dropdown_users(array(
 			'include' => $authors,
 			'name' => 'page_author',
 			'multi' => true,
-			'show_option_all' => __( 'All' ),
+			'show_option_all' => __('All'),
 			'show' => 'display_name_with_login',
-		) ); ?>
+		)); ?>
 		</label>
 	</li>
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
-		<label for="page-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+		<legend class="screen-reader-text"><?php _e('Date range:'); ?></legend>
+		<label for="page-start-date" class="label-responsive"><?php _e('Start date:'); ?></label>
 		<select name="page_start_date" id="page-start-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'page' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('page'); ?>
 		</select>
-		<label for="page-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+		<label for="page-end-date" class="label-responsive"><?php _e('End date:'); ?></label>
 		<select name="page_end_date" id="page-end-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'page' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('page'); ?>
 		</select>
 		</fieldset>
 	</li>
 	<li>
-		<label for="page-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
+		<label for="page-status" class="label-responsive"><?php _e('Status:'); ?></label>
 		<select name="page_status" id="page-status">
-			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php foreach ( $post_stati as $status ) : ?>
-			<option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
+			<option value="0"><?php _e('All'); ?></option>
+			<?php foreach ($post_stati as $status) : ?>
+			<option value="<?php echo esc_attr($status->name); ?>"><?php echo esc_html($status->label); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</li>
 </ul>
 
-<?php foreach ( get_post_types( array( '_builtin' => false, 'can_export' => true ), 'objects' ) as $post_type ) : ?>
-<p><label><input type="radio" name="content" value="<?php echo esc_attr( $post_type->name ); ?>" /> <?php echo esc_html( $post_type->label ); ?></label></p>
+<?php foreach (get_post_types(array('_builtin' => false, 'can_export' => true), 'objects') as $post_type) : ?>
+<p><label><input type="radio" name="content" value="<?php echo esc_attr($post_type->name); ?>" /> <?php echo esc_html($post_type->label); ?></label></p>
 <?php endforeach; ?>
 
-<p><label><input type="radio" name="content" value="attachment" /> <?php _e( 'Media' ); ?></label></p>
+<p><label><input type="radio" name="content" value="attachment" /> <?php _e('Media'); ?></label></p>
 <ul id="attachment-filters" class="export-filters">
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
-		<label for="attachment-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
+		<legend class="screen-reader-text"><?php _e('Date range:'); ?></legend>
+		<label for="attachment-start-date" class="label-responsive"><?php _e('Start date:'); ?></label>
 		<select name="attachment_start_date" id="attachment-start-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'attachment' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('attachment'); ?>
 		</select>
-		<label for="attachment-end-date" class="label-responsive"><?php _e( 'End date:' ); ?></label>
+		<label for="attachment-end-date" class="label-responsive"><?php _e('End date:'); ?></label>
 		<select name="attachment_end_date" id="attachment-end-date">
-			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
-			<?php export_date_options( 'attachment' ); ?>
+			<option value="0"><?php _e('&mdash; Select &mdash;'); ?></option>
+			<?php export_date_options('attachment'); ?>
 		</select>
 		</fieldset>
 	</li>
@@ -284,11 +284,11 @@ 
  *
  * @since 3.5.0
  */
-do_action( 'export_filters' );
+do_action('export_filters');
 ?>
 
-<?php submit_button( __('Download Export File') ); ?>
+<?php submit_button(__('Download Export File')); ?>
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +24 added lines, -17 removed lines

@@ -9,8 +9,9 @@ 
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('export') )
+if ( !current_user_can('export') ) {
 	wp_die(__('You do not have sufficient permissions to export the content of this site.'));
+}
 
 /** Load WordPress export API */
 require_once( ABSPATH . 'wp-admin/includes/export.php' );
@@ -64,32 +65,37 @@ 
 	} elseif ( 'posts' == $_GET['content'] ) {
 		$args['content'] = 'post';
 
-		if ( $_GET['cat'] )
-			$args['category'] = (int) $_GET['cat'];
+		if ( $_GET['cat'] ) {
+					$args['category'] = (int) $_GET['cat'];
+		}
 
-		if ( $_GET['post_author'] )
-			$args['author'] = (int) $_GET['post_author'];
+		if ( $_GET['post_author'] ) {
+					$args['author'] = (int) $_GET['post_author'];
+		}
 
 		if ( $_GET['post_start_date'] || $_GET['post_end_date'] ) {
 			$args['start_date'] = $_GET['post_start_date'];
 			$args['end_date'] = $_GET['post_end_date'];
 		}
 
-		if ( $_GET['post_status'] )
-			$args['status'] = $_GET['post_status'];
+		if ( $_GET['post_status'] ) {
+					$args['status'] = $_GET['post_status'];
+		}
 	} elseif ( 'pages' == $_GET['content'] ) {
 		$args['content'] = 'page';
 
-		if ( $_GET['page_author'] )
-			$args['author'] = (int) $_GET['page_author'];
+		if ( $_GET['page_author'] ) {
+					$args['author'] = (int) $_GET['page_author'];
+		}
 
 		if ( $_GET['page_start_date'] || $_GET['page_end_date'] ) {
 			$args['start_date'] = $_GET['page_start_date'];
 			$args['end_date'] = $_GET['page_end_date'];
 		}
 
-		if ( $_GET['page_status'] )
-			$args['status'] = $_GET['page_status'];
+		if ( $_GET['page_status'] ) {
+					$args['status'] = $_GET['page_status'];
+		}
 	} elseif ( 'attachment' == $_GET['content'] ) {
 		$args['content'] = 'attachment';
 
@@ -97,8 +103,7 @@ 
 			$args['start_date'] = $_GET['attachment_start_date'];
 			$args['end_date'] = $_GET['attachment_end_date'];
 		}
-	}
-	else {
+	} else {
 		$args['content'] = $_GET['content'];
 	}
 
@@ -138,12 +143,14 @@ 
 	", $post_type ) );
 
 	$month_count = count( $months );
-	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
-		return;
+	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
+			return;
+	}
 
 	foreach ( $months as $date ) {
-		if ( 0 == $date->year )
-			continue;
+		if ( 0 == $date->year ) {
+					continue;
+		}
 
 		$month = zeroise( $date->month, 2 );
 		echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';

src/wp-admin/link-manager.php

Indentation +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Link Management Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+		 * Link Management Administration Screen.
+		 *
+		 * @package WordPress
+		 * @subpackage Administration
+		 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -45,14 +45,14 @@ 
 'title'		=> __('Overview'),
 'content'	=>
 	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
+	'<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
+	'<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
 ) );
 get_current_screen()->add_help_tab( array(
 'id'		=> 'deleting-links',
 'title'		=> __('Deleting Links'),
 'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
+	'<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(

Spacing +33 added lines, -33 removed lines

@@ -7,31 +7,31 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
-	wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
+require_once(dirname(__FILE__).'/admin.php');
+if ( ! current_user_can('manage_links'))
+	wp_die(__('You do not have sufficient permissions to edit the links for this site.'));
 
 $wp_list_table = _get_list_table('WP_Links_List_Table');
 
 // Handle bulk deletes
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {
-	check_admin_referer( 'bulk-bookmarks' );
+if ($doaction && isset($_REQUEST['linkcheck'])) {
+	check_admin_referer('bulk-bookmarks');
 
-	if ( 'delete' == $doaction ) {
+	if ('delete' == $doaction) {
 		$bulklinks = (array) $_REQUEST['linkcheck'];
-		foreach ( $bulklinks as $link_id ) {
+		foreach ($bulklinks as $link_id) {
 			$link_id = (int) $link_id;
 
-			wp_delete_link( $link_id );
+			wp_delete_link($link_id);
 		}
 
-		wp_redirect( add_query_arg('deleted', count( $bulklinks ), admin_url( 'link-manager.php' ) ) );
+		wp_redirect(add_query_arg('deleted', count($bulklinks), admin_url('link-manager.php')));
 		exit;
 	}
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -40,49 +40,49 @@ 
 $title = __('Links');
 $this_file = $parent_file = 'link-manager.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php').'</p>'.
+    '<p>'.__('Links may be separated into Link Categories; these are different than the categories used on your posts.').'</p>'.
+    '<p>'.__('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'deleting-links',
 'title'		=> __('Deleting Links'),
 'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
-) );
+    '<p>'.__('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Links_Screen" target="_blank">Documentation on Managing Links</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/Links_Screen" target="_blank">Documentation on Managing Links</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_list' => __( 'Links list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_list' => __('Links list'),
+));
 
-include_once( ABSPATH . 'wp-admin/admin-header.php' );
+include_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links'))
 	wp_die(__("You do not have sufficient permissions to edit the links for this site."));
 
 ?>
 
 <div class="wrap nosubsub">
-<h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+<h1><?php echo esc_html($title); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(wp_unslash($_REQUEST['s'])));
 }
 ?>
 </h1>
 
 <?php
-if ( isset($_REQUEST['deleted']) ) {
+if (isset($_REQUEST['deleted'])) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>';
 	$deleted = (int) $_REQUEST['deleted'];
 	printf(_n('%s link deleted.', '%s links deleted', $deleted), $deleted);
@@ -93,7 +93,7 @@ 
 
 <form id="posts-filter" method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Links' ), 'link' ); ?>
+<?php $wp_list_table->search_box(__('Search Links'), 'link'); ?>
 
 <?php $wp_list_table->display(); ?>
 
@@ -103,4 +103,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +4 added lines, -2 removed lines

@@ -8,8 +8,9 @@ 
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
+if ( ! current_user_can( 'manage_links' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to edit the links for this site.' ) );
+}
 
 $wp_list_table = _get_list_table('WP_Links_List_Table');
 
@@ -67,8 +68,9 @@ 
 
 include_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links') ) {
 	wp_die(__("You do not have sufficient permissions to edit the links for this site."));
+}
 
 ?>
 

src/wp-admin/plugins.php

Indentation +11 added lines, -11 removed lines

@@ -493,17 +493,17 @@
 
 <?php
 /**
- * Fires before the plugins list table is rendered.
- *
- * This hook also fires before the plugins list table is rendered in the Network Admin.
- *
- * Please note: The 'active' portion of the hook name does not refer to whether the current
- * view is for active plugins, but rather all plugins actively-installed.
- *
- * @since 3.0.0
- *
- * @param array $plugins_all An array containing all installed plugins.
- */
+	 * Fires before the plugins list table is rendered.
+	 *
+	 * This hook also fires before the plugins list table is rendered in the Network Admin.
+	 *
+	 * Please note: The 'active' portion of the hook name does not refer to whether the current
+	 * view is for active plugins, but rather all plugins actively-installed.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param array $plugins_all An array containing all installed plugins.
+	 */
 do_action( 'pre_current_active_plugins', $plugins['all'] );
 ?>
 

Spacing +196 added lines, -196 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( __( 'You do not have sufficient permissions to manage plugins for this site.' ) );
+if ( ! current_user_can('activate_plugins'))
+	wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions 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,129 +364,129 @@ 
 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>' . 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>'.sprintf(
 		/* translators: 1: Plugin Browser/Installer URL, 2: WordPress Plugin Directory URL 3: local plugin directory */
-		__( 'You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your %3$s directory. Once a plugin has been installed, you can activate it here.' ),
+		__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s" target="_blank">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your %3$s directory. Once a plugin has been installed, you can activate it here.'),
 		'plugin-install.php',
 		'https://wordpress.org/plugins/',
 		'<code>/wp-content/plugins</code>'
-	) . '</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>
@@ -504,13 +504,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 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">
@@ -526,4 +526,4 @@ 
 <?php
 wp_print_request_filesystem_credentials_modal();
 
-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( __( 'You do not have sufficient permissions 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(__('You do not have sufficient permissions to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions to activate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('You do not have sufficient permissions 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(__('You do not have sufficient permissions to deactivate plugins for this site.'));
+			if ( ! current_user_can('activate_plugins') ) {
+							wp_die(__('You do not have sufficient permissions 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" />
@@ -424,12 +437,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
@@ -452,12 +466,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/user-edit.php

Indentation +34 added lines, -34 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Edit user administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Edit user administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -50,9 +50,9 @@ 
 ) );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</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_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 $wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
@@ -270,12 +270,12 @@ 
 </tr>
 <?php
 /**
- * Fires at the end of the 'Personal Options' settings table on the user editing screen.
- *
- * @since 2.7.0
- *
- * @param WP_User $profileuser The current WP_User object.
- */
+	 * Fires at the end of the 'Personal Options' settings table on the user editing screen.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param WP_User $profileuser The current WP_User object.
+	 */
 do_action( 'personal_options', $profileuser );
 ?>
 
@@ -483,15 +483,15 @@ 
 
 <?php
 /**
- * Filter the display of the password fields.
- *
- * @since 1.5.1
- * @since 2.8.0 Added the `$profileuser` parameter.
- * @since 4.4.0 Now evaluated only in user-edit.php.
- *
- * @param bool    $show        Whether to show the password fields. Default true.
- * @param WP_User $profileuser User object for the current user to edit.
- */
+		 * Filter the display of the password fields.
+		 *
+		 * @since 1.5.1
+		 * @since 2.8.0 Added the `$profileuser` parameter.
+		 * @since 4.4.0 Now evaluated only in user-edit.php.
+		 *
+		 * @param bool    $show        Whether to show the password fields. Default true.
+		 * @param WP_User $profileuser User object for the current user to edit.
+		 */
 if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
 ?>
 </table>
@@ -600,17 +600,17 @@ 
 
 <?php
 /**
- * Filter whether to display additional capabilities for the user.
- *
- * The 'Additional Capabilities' section will only be enabled if
- * the number of the user's capabilities exceeds their number of
- * roles.
- *
- * @since 2.8.0
- *
- * @param bool    $enable      Whether to display the capabilities. Default true.
- * @param WP_User $profileuser The current WP_User object.
- */
+	 * Filter whether to display additional capabilities for the user.
+	 *
+	 * The 'Additional Capabilities' section will only be enabled if
+	 * the number of the user's capabilities exceeds their number of
+	 * roles.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param bool    $enable      Whether to display the capabilities. Default true.
+	 * @param WP_User $profileuser The current WP_User object.
+	 */
 if ( count( $profileuser->caps ) > count( $profileuser->roles )
 	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
 ) : ?>

Spacing +173 added lines, -173 removed lines

@@ -7,57 +7,57 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
+wp_reset_vars(array('action', 'user_id', 'wp_http_referer'));
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
-	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+if ( ! defined('IS_PROFILE_PAGE'))
+	define('IS_PROFILE_PAGE', ($user_id == $current_user->ID));
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE)
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
-	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
-	wp_die( __('Invalid user ID.') );
+elseif ( ! $user_id && ! IS_PROFILE_PAGE)
+	wp_die(__('Invalid user ID.'));
+elseif ( ! get_userdata($user_id))
+	wp_die(__('Invalid user ID.'));
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if (current_user_can('edit_users') && ! IS_PROFILE_PAGE)
 	$submenu_file = 'users.php';
 else
 	$submenu_file = 'profile.php';
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if (current_user_can('edit_users') && ! is_user_admin())
 	$parent_file = 'users.php';
 else
 	$parent_file = 'profile.php';
 
-$profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
-	'<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
-	'<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
-	'<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
-	'<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
+$profile_help = '<p>'.__('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.').'</p>'.
+	'<p>'.__('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.').'</p>'.
+	'<p>'.__('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.').'</p>'.
+	'<p>'.__('You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.').'</p>'.
+	'<p>'.__('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.').'</p>'.
+	'<p>'.__('Remember to click the Update Profile button when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $profile_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</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_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-$wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg(array('update', 'delete_count', 'user_id'), $wp_http_referer);
 
-$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+$user_can_edit = current_user_can('edit_posts') || current_user_can('edit_pages');
 
 /**
  * Filter whether to allow administrators on Multisite to edit every user.
@@ -72,46 +72,46 @@ 
  *
  * @param bool $allow Whether to allow editing of any user. Default true.
  */
-if ( is_multisite()
-	&& ! current_user_can( 'manage_network_users' )
+if (is_multisite()
+	&& ! current_user_can('manage_network_users')
 	&& $user_id != $current_user->ID
-	&& ! apply_filters( 'enable_edit_any_user_configuration', true )
+	&& ! apply_filters('enable_edit_any_user_configuration', true)
 ) {
-	wp_die( __( 'You do not have permission to edit this user.' ) );
+	wp_die(__('You do not have permission to edit this user.'));
 }
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
-if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+if (is_multisite() && IS_PROFILE_PAGE && isset($_GET['newuseremail']) && $current_user->ID) {
+	$new_email = get_user_meta($current_user->ID, '_new_email', true);
+	if ($new_email && $new_email['hash'] == $_GET['newuseremail']) {
 		$user = new stdClass;
 		$user->ID = $current_user->ID;
-		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+		$user->user_email = esc_html(trim($new_email['newemail']));
+		if ($wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login))) {
+			$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login));
 		}
-		wp_update_user( $user );
-		delete_user_meta( $current_user->ID, '_new_email' );
-		wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) );
+		wp_update_user($user);
+		delete_user_meta($current_user->ID, '_new_email');
+		wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 		die();
 	} else {
-		wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
+		wp_redirect(add_query_arg(array('error' => 'new-email'), self_admin_url('profile.php')));
 	}
-} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) {
-	delete_user_meta( $current_user->ID, '_new_email' );
-	wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+} elseif (is_multisite() && IS_PROFILE_PAGE && ! empty($_GET['dismiss']) && $current_user->ID.'_new_email' == $_GET['dismiss']) {
+	delete_user_meta($current_user->ID, '_new_email');
+	wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 	die();
 }
 
 switch ($action) {
 case 'update':
 
-check_admin_referer('update-user_' . $user_id);
+check_admin_referer('update-user_'.$user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('You do not have permission to edit this user.'));
 
-if ( IS_PROFILE_PAGE ) {
+if (IS_PROFILE_PAGE) {
 	/**
 	 * Fires before the page loads on the 'Your Profile' editing screen.
 	 *
@@ -121,7 +121,7 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'personal_options_update', $user_id );
+	do_action('personal_options_update', $user_id);
 } else {
 	/**
 	 * Fires before the page loads on the 'Edit User' screen.
@@ -130,29 +130,29 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'edit_user_profile_update', $user_id );
+	do_action('edit_user_profile_update', $user_id);
 }
 
 // Update the email address in signups, if present.
-if ( is_multisite() ) {
-	$user = get_userdata( $user_id );
+if (is_multisite()) {
+	$user = get_userdata($user_id);
 
-	if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-		$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
+	if ($user->user_login && isset($_POST['email']) && is_email($_POST['email']) && $wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login))) {
+		$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login));
 	}
 }
 
 // Update the user.
-$errors = edit_user( $user_id );
+$errors = edit_user($user_id);
 
 // Grant or revoke super admin status if requested.
-if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
-	empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins) && empty($_POST['super_admin']) == is_super_admin($user_id)) {
+	empty($_POST['super_admin']) ? revoke_super_admin($user_id) : grant_super_admin($user_id);
 }
 
-if ( !is_wp_error( $errors ) ) {
-	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
+if ( ! is_wp_error($errors)) {
+	$redirect = add_query_arg('updated', true, get_edit_user_link($user_id));
+	if ($wp_http_referer)
 		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
 	wp_redirect($redirect);
 	exit;
@@ -161,62 +161,62 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('You do not have permission to edit this user.'));
 
-$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
+$sessions = WP_Session_Tokens::get_instance($profileuser->ID);
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
-<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
+<?php if ( ! IS_PROFILE_PAGE && is_super_admin($profileuser->ID) && current_user_can('manage_network_options')) { ?>
 	<div class="updated"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['updated']) ) : ?>
+<?php if (isset($_GET['updated'])) : ?>
 <div id="message" class="updated notice is-dismissible">
-	<?php if ( IS_PROFILE_PAGE ) : ?>
+	<?php if (IS_PROFILE_PAGE) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
 	<?php else: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
 	<?php endif; ?>
-	<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
-	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
+	<?php if ($wp_http_referer && false === strpos($wp_http_referer, 'user-new.php') && ! IS_PROFILE_PAGE) : ?>
+	<p><a href="<?php echo esc_url($wp_http_referer); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $_GET['error'] ) ) : ?>
+<?php if (isset($_GET['error'])) : ?>
 <div class="notice notice-error">
-	<?php if ( 'new-email' == $_GET['error'] ) : ?>
-	<p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
+	<?php if ('new-email' == $_GET['error']) : ?>
+	<p><?php _e('Error while saving the new email address. Please try again.'); ?></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
-<div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
+<div class="error"><p><?php echo implode("</p>\n<p>", $errors->get_error_messages()); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
 <h1>
 <?php
-echo esc_html( $title );
-if ( ! IS_PROFILE_PAGE ) {
-	if ( current_user_can( 'create_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+echo esc_html($title);
+if ( ! IS_PROFILE_PAGE) {
+	if (current_user_can('create_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a>
+	<?php } elseif (is_multisite() && current_user_can('promote_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add Existing', 'user'); ?></a>
 	<?php }
 } ?>
 </h1>
-<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
+<form id="your-profile" action="<?php echo esc_url(self_admin_url(IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php')); ?>" method="post" novalidate="novalidate"<?php
 	/**
 	 * Fires inside the your-profile form tag on the user editing screen.
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_edit_form_tag' );
+	do_action('user_edit_form_tag');
 ?>>
-<?php wp_nonce_field('update-user_' . $user_id) ?>
-<?php if ( $wp_http_referer ) : ?>
+<?php wp_nonce_field('update-user_'.$user_id) ?>
+<?php if ($wp_http_referer) : ?>
 	<input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
 <?php endif; ?>
 <p>
@@ -224,16 +224,16 @@ 
 <input type="hidden" name="checkuser_id" value="<?php echo get_current_user_id(); ?>" />
 </p>
 
-<h2><?php _e( 'Personal Options' ); ?></h2>
+<h2><?php _e('Personal Options'); ?></h2>
 
 <table class="form-table">
-<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
+<?php if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 	<tr class="user-rich-editing-wrap">
-		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<th scope="row"><?php _e('Visual Editor'); ?></th>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty($profileuser->rich_editing)) checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
 	</tr>
 <?php endif; ?>
-<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
+<?php if (count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker')) : ?>
 <tr class="user-admin-color-wrap">
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php
@@ -248,23 +248,23 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'admin_color_scheme_picker', $user_id );
+	do_action('admin_color_scheme_picker', $user_id);
 ?></td>
 </tr>
 <?php
 endif; // $_wp_admin_css_colors
-if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
+if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 <tr class="user-comment-shortcuts-wrap">
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<th scope="row"><?php _e('Keyboard Shortcuts'); ?></th>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty($profileuser->comment_shortcuts)) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
-<th scope="row"><?php _e( 'Toolbar' ); ?></th>
+<th scope="row"><?php _e('Toolbar'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>
 <label for="admin_bar_front">
-<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
-<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
+<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked(_get_admin_bar_pref('front', $profileuser->ID)); ?> />
+<?php _e('Show Toolbar when viewing site'); ?></label><br />
 </fieldset>
 </td>
 </tr>
@@ -276,12 +276,12 @@ 
  *
  * @param WP_User $profileuser The current WP_User object.
  */
-do_action( 'personal_options', $profileuser );
+do_action('personal_options', $profileuser);
 ?>
 
 </table>
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
 		 *
@@ -291,11 +291,11 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'profile_personal_options', $profileuser );
+		do_action('profile_personal_options', $profileuser);
 	}
 ?>
 
-<h2><?php _e( 'Name' ); ?></h2>
+<h2><?php _e('Name'); ?></h2>
 
 <table class="form-table">
 	<tr class="user-user-login-wrap">
@@ -303,33 +303,33 @@ 
 		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
 	</tr>
 
-<?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
+<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin()) : ?>
 <tr class="user-role-wrap"><th><label for="role"><?php _e('Role') ?></label></th>
 <td><select name="role" id="role">
 <?php
 // Compare user role against currently editable roles
-$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role  = reset( $user_roles );
+$user_roles = array_intersect(array_values($profileuser->roles), array_keys(get_editable_roles()));
+$user_role  = reset($user_roles);
 
 // print the full list of roles with the primary one selected.
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
-	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
+if ($user_role)
+	echo '<option value="">'.__('&mdash; No role for this site &mdash;').'</option>';
 else
-	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+	echo '<option value="" selected="selected">'.__('&mdash; No role for this site &mdash;').'</option>';
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins)) { ?>
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
-<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
+<?php if ($profileuser->user_email != get_site_option('admin_email') || ! is_super_admin($profileuser->ID)) : ?>
+<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked(is_super_admin($profileuser->ID)); ?> /> <?php _e('Grant this user super admin privileges for the Network.'); ?></label></p>
 <?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<p><?php _e('Super admin privileges cannot be removed because this user has the network admin email.'); ?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -358,26 +358,26 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
+			if ( ! empty($profileuser->first_name))
 				$public_display['display_firstname'] = $profileuser->first_name;
 
-			if ( !empty($profileuser->last_name) )
+			if ( ! empty($profileuser->last_name))
 				$public_display['display_lastname'] = $profileuser->last_name;
 
-			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+			if ( ! empty($profileuser->first_name) && ! empty($profileuser->last_name)) {
+				$public_display['display_firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
+				$public_display['display_lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
-				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			if ( ! in_array($profileuser->display_name, $public_display)) // Only add this if it isn't duplicated elsewhere
+				$public_display = array('display_displayname' => $profileuser->display_name) + $public_display;
 
-			$public_display = array_map( 'trim', $public_display );
-			$public_display = array_unique( $public_display );
+			$public_display = array_map('trim', $public_display);
+			$public_display = array_unique($public_display);
 
-			foreach ( $public_display as $id => $item ) {
+			foreach ($public_display as $id => $item) {
 		?>
-			<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+			<option <?php selected($profileuser->display_name, $item); ?>><?php echo $item; ?></option>
 		<?php
 			}
 		?>
@@ -386,26 +386,26 @@ 
 </tr>
 </table>
 
-<h2><?php _e( 'Contact Info' ); ?></h2>
+<h2><?php _e('Contact Info'); ?></h2>
 
 <table class="form-table">
 <tr class="user-email-wrap">
 	<th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
+	<td><input type="email" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text ltr" />
 	<?php
-	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
+	$new_email = get_user_meta($current_user->ID, '_new_email', true);
+	if ($new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID) : ?>
 	<div class="updated inline">
 	<p><?php
 		printf(
 			/* translators: %s: new email */
-			__( 'There is a pending change of your email to %s.' ),
-			'<code>' . $new_email['newemail'] . '</code>'
+			__('There is a pending change of your email to %s.'),
+			'<code>'.$new_email['newemail'].'</code>'
 		);
 		printf(
 			' <a href="%1$s">%2$s</a>',
-			esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ),
-			__( 'Cancel' )
+			esc_url(self_admin_url('profile.php?dismiss='.$current_user->ID.'_new_email')),
+			__('Cancel')
 		);
 	?></p>
 	</div>
@@ -415,11 +415,11 @@ 
 
 <tr class="user-url-wrap">
 	<th><label for="url"><?php _e('Website') ?></label></th>
-	<td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ) ?>" class="regular-text code" /></td>
+	<td><input type="url" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
 </tr>
 
 <?php
-	foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+	foreach (wp_get_user_contact_methods($profileuser) as $name => $desc) {
 ?>
 <tr class="user-<?php echo $name; ?>-wrap">
 	<th><label for="<?php echo $name; ?>">
@@ -434,7 +434,7 @@ 
 		 *
 		 * @param string $desc The translatable label for the contactmethod.
 		 */
-		echo apply_filters( "user_{$name}_label", $desc );
+		echo apply_filters("user_{$name}_label", $desc);
 		?>
 	</label></th>
 	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
@@ -444,7 +444,7 @@ 
 ?>
 </table>
 
-<h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
+<h2><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h2>
 
 <table class="form-table">
 <tr class="user-description-wrap">
@@ -453,16 +453,16 @@ 
 	<p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
 </tr>
 
-<?php if ( get_option( 'show_avatars' ) ) : ?>
+<?php if (get_option('show_avatars')) : ?>
 <tr class="user-profile-picture">
-	<th><?php _e( 'Profile Picture' ); ?></th>
+	<th><?php _e('Profile Picture'); ?></th>
 	<td>
-		<?php echo get_avatar( $user_id ); ?>
+		<?php echo get_avatar($user_id); ?>
 		<p class="description"><?php
-			if ( IS_PROFILE_PAGE ) {
+			if (IS_PROFILE_PAGE) {
 				/* translators: %s: Gravatar URL */
-				$description = sprintf( __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
-					__( 'https://en.gravatar.com/' )
+				$description = sprintf(__('You can change your profile picture on <a href="%s">Gravatar</a>.'),
+					__('https://en.gravatar.com/')
 				);
 			} else {
 				$description = '';
@@ -475,7 +475,7 @@ 
 			 *
 			 * @param string $description The description that will be printed.
 			 */
-			echo apply_filters( 'user_profile_picture_description', $description );
+			echo apply_filters('user_profile_picture_description', $description);
 		?></p>
 	</td>
 </tr>
@@ -492,80 +492,80 @@ 
  * @param bool    $show        Whether to show the password fields. Default true.
  * @param WP_User $profileuser User object for the current user to edit.
  */
-if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
+if ($show_password_fields = apply_filters('show_password_fields', true, $profileuser)) :
 ?>
 </table>
 
-<h2><?php _e( 'Account Management' ); ?></h2>
+<h2><?php _e('Account Management'); ?></h2>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
-	<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
+	<th><label for="pass1"><?php _e('New Password'); ?></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( 'Generate Password' ); ?></button>
+		<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e('Generate Password'); ?></button>
 		<div class="wp-pwd hide-if-js">
 			<span class="password-input-wrapper">
-				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
+				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr(wp_generate_password(24)); ?>" 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="user-pass2-wrap hide-if-js">
-	<th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
+	<th scope="row"><label for="pass2"><?php _e('Repeat New Password'); ?></label></th>
 	<td>
 	<input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
-	<p class="description"><?php _e( 'Type your new password again.' ); ?></p>
+	<p class="description"><?php _e('Type your new password again.'); ?></p>
 	</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>
 <?php endif; ?>
 
 <?php
-if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
+if (IS_PROFILE_PAGE && count($sessions->get_all()) === 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'You are only logged in at this location.' ); ?>
+				<?php _e('You are only logged in at this location.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( IS_PROFILE_PAGE && count( $sessions->get_all() ) > 1 ) : ?>
+<?php elseif (IS_PROFILE_PAGE && count($sessions->get_all()) > 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
+				<?php _e('Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all() ) : ?>
+<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all()) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td>
-			<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
+			<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e('Log Out Everywhere'); ?></button></p>
 			<p class="description">
 				<?php
 				/* translators: 1: User's display name. */
-				printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
+				printf(__('Log %s out of all locations.'), $profileuser->display_name);
 				?>
 			</p>
 		</td>
@@ -575,7 +575,7 @@ 
 </table>
 
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
 		 *
@@ -585,7 +585,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'show_user_profile', $profileuser );
+		do_action('show_user_profile', $profileuser);
 	} else {
 		/**
 		 * Fires after the 'About the User' settings table on the 'Edit User' screen.
@@ -594,7 +594,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'edit_user_profile', $profileuser );
+		do_action('edit_user_profile', $profileuser);
 	}
 ?>
 
@@ -611,21 +611,21 @@ 
  * @param bool    $enable      Whether to display the capabilities. Default true.
  * @param WP_User $profileuser The current WP_User object.
  */
-if ( count( $profileuser->caps ) > count( $profileuser->roles )
-	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
+if (count($profileuser->caps) > count($profileuser->roles)
+	&& apply_filters('additional_capabilities_display', true, $profileuser)
 ) : ?>
-<h2><?php _e( 'Additional Capabilities' ); ?></h2>
+<h2><?php _e('Additional Capabilities'); ?></h2>
 <table class="form-table">
 <tr class="user-capabilities-wrap">
-	<th scope="row"><?php _e( 'Capabilities' ); ?></th>
+	<th scope="row"><?php _e('Capabilities'); ?></th>
 	<td>
 <?php
 	$output = '';
-	foreach ( $profileuser->caps as $cap => $value ) {
-		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
+	foreach ($profileuser->caps as $cap => $value) {
+		if ( ! $wp_roles->is_role($cap)) {
+			if ('' != $output)
 				$output .= ', ';
-			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+			$output .= $value ? $cap : sprintf(__('Denied: %s'), $cap);
 		}
 	}
 	echo $output;
@@ -638,7 +638,7 @@ 
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
 
-<?php submit_button( IS_PROFILE_PAGE ? __('Update Profile') : __('Update User') ); ?>
+<?php submit_button(IS_PROFILE_PAGE ? __('Update Profile') : __('Update User')); ?>
 
 </form>
 </div>
@@ -652,4 +652,4 @@ 
 	}
 </script>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +52 added lines, -27 removed lines

@@ -13,28 +13,32 @@ 
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
+if ( ! defined( 'IS_PROFILE_PAGE' ) ) {
 	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+}
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE ) {
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
+} elseif ( ! $user_id && ! IS_PROFILE_PAGE ) {
 	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
+} elseif ( ! get_userdata( $user_id ) ) {
 	wp_die( __('Invalid user ID.') );
+}
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if ( current_user_can('edit_users') && !IS_PROFILE_PAGE ) {
 	$submenu_file = 'users.php';
-else
+} else {
 	$submenu_file = 'profile.php';
+}
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if ( current_user_can('edit_users') && !is_user_admin() ) {
 	$parent_file = 'users.php';
-else
+} else {
 	$parent_file = 'profile.php';
+}
 
 $profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
 	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
@@ -108,8 +112,9 @@ 
 
 check_admin_referer('update-user_' . $user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_id) ) {
 	wp_die(__('You do not have permission to edit this user.'));
+}
 
 if ( IS_PROFILE_PAGE ) {
 	/**
@@ -152,8 +157,9 @@ 
 
 if ( !is_wp_error( $errors ) ) {
 	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
-		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+	if ( $wp_http_referer ) {
+			$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
+	}
 	wp_redirect($redirect);
 	exit;
 }
@@ -161,8 +167,9 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( !current_user_can('edit_user', $user_id) ) {
 	wp_die(__('You do not have permission to edit this user.'));
+}
 
 $sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
 
@@ -176,9 +183,12 @@ 
 <div id="message" class="updated notice is-dismissible">
 	<?php if ( IS_PROFILE_PAGE ) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
-	<?php else: ?>
+	<?php else {
+	: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
-	<?php endif; ?>
+	<?php endif;
+}
+?>
 	<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
 	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
@@ -230,7 +240,10 @@ 
 <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
 	<tr class="user-rich-editing-wrap">
 		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) {
+	checked( 'false', $profileuser->rich_editing );
+}
+?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
 	</tr>
 <?php endif; ?>
 <?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
@@ -256,7 +269,10 @@ 
 if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 <tr class="user-comment-shortcuts-wrap">
 <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) {
+	checked( 'true', $profileuser->comment_shortcuts );
+}
+?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
@@ -315,10 +331,11 @@ 
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
+if ( $user_role ) {
 	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
-else
+} else {
 	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+}
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
@@ -328,8 +345,11 @@ 
 <td>
 <?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
-<?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<?php else {
+	: ?>
+<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' );
+}
+?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -358,19 +378,23 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
-				$public_display['display_firstname'] = $profileuser->first_name;
+			if ( !empty($profileuser->first_name) ) {
+							$public_display['display_firstname'] = $profileuser->first_name;
+			}
 
-			if ( !empty($profileuser->last_name) )
-				$public_display['display_lastname'] = $profileuser->last_name;
+			if ( !empty($profileuser->last_name) ) {
+							$public_display['display_lastname'] = $profileuser->last_name;
+			}
 
 			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
 				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
 				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
+			if ( !in_array( $profileuser->display_name, $public_display ) ) {
+				// Only add this if it isn't duplicated elsewhere
 				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			}
 
 			$public_display = array_map( 'trim', $public_display );
 			$public_display = array_unique( $public_display );
@@ -623,8 +647,9 @@ 
 	$output = '';
 	foreach ( $profileuser->caps as $cap => $value ) {
 		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
-				$output .= ', ';
+			if ( '' != $output ) {
+							$output .= ', ';
+			}
 			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
 		}
 	}

src/wp-admin/options-permalink.php

Spacing +91 added lines, -91 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
-		'<p>' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.').'</p>'.
+		'<p>'.__('This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.').'</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'      => 'permalink-settings',
 	'title'   => __('Permalink Settings'),
-	'content' => '<p>' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '</p>' .
-		'<p>' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
-		'<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.').'</p>'.
+		'<p>'.__('If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.').'</p>'.
+		'<p>'.__('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.').'</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'      => 'custom-structures',
 	'title'   => __('Custom Structures'),
-	'content' => '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.').'</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()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Permalinks_Screen" target="_blank">Documentation on Permalinks Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Permalinks" target="_blank">Documentation on Using Permalinks</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_Permalinks_Screen" target="_blank">Documentation on Permalinks Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Permalinks" target="_blank">Documentation on Using Permalinks</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 add_filter('admin_head', 'options_permalink_add_js');
 
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
-$permalink_structure = get_option( 'permalink_structure' );
+$permalink_structure = get_option('permalink_structure');
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite())
 	$prefix = '/index.php';
 
 /**
@@ -62,93 +62,93 @@ 
  * network. If the `permalink_structure` option has been changed to remove this
  * base prefix, WordPress core can no longer account for the possible collision.
  */
-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
+if (is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos($permalink_structure, '/blog/')) {
 	$blog_prefix = '/blog';
 }
 
-if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
+if (isset($_POST['permalink_structure']) || isset($_POST['category_base'])) {
 	check_admin_referer('update-permalink');
 
-	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
+	if (isset($_POST['permalink_structure'])) {
+		if (isset($_POST['selection']) && 'custom' != $_POST['selection'])
 			$permalink_structure = $_POST['selection'];
 		else
 			$permalink_structure = $_POST['permalink_structure'];
 
-		if ( ! empty( $permalink_structure ) ) {
-			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
-				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+		if ( ! empty($permalink_structure)) {
+			$permalink_structure = preg_replace('#/+#', '/', '/'.str_replace('#', '', $permalink_structure));
+			if ($prefix && $blog_prefix)
+				$permalink_structure = $prefix.preg_replace('#^/?index\.php#', '', $permalink_structure);
 			else
-				$permalink_structure = $blog_prefix . $permalink_structure;
+				$permalink_structure = $blog_prefix.$permalink_structure;
 		}
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 	}
 
-	if ( isset( $_POST['category_base'] ) ) {
+	if (isset($_POST['category_base'])) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
-		$wp_rewrite->set_category_base( $category_base );
+		if ( ! empty($category_base))
+			$category_base = $blog_prefix.preg_replace('#/+#', '/', '/'.str_replace('#', '', $category_base));
+		$wp_rewrite->set_category_base($category_base);
 	}
 
-	if ( isset( $_POST['tag_base'] ) ) {
+	if (isset($_POST['tag_base'])) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
-		$wp_rewrite->set_tag_base( $tag_base );
+		if ( ! empty($tag_base))
+			$tag_base = $blog_prefix.preg_replace('#/+#', '/', '/'.str_replace('#', '', $tag_base));
+		$wp_rewrite->set_tag_base($tag_base);
 	}
 
-	wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
+	wp_redirect(admin_url('options-permalink.php?settings-updated=true'));
 	exit;
 }
 
-$category_base       = get_option( 'category_base' );
-$tag_base            = get_option( 'tag_base' );
+$category_base       = get_option('category_base');
+$tag_base            = get_option('tag_base');
 $update_required     = false;
 
-if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
+if ($iis7_permalinks) {
+	if (( ! file_exists($home_path.'web.config') && win_is_writable($home_path)) || win_is_writable($home_path.'web.config'))
 		$writable = true;
 	else
 		$writable = false;
-} elseif ( $is_nginx ) {
+} elseif ($is_nginx) {
 	$writable = false;
 } else {
-	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
+	if (( ! file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')) {
 		$writable = true;
 	} else {
 		$writable = false;
-		$existing_rules  = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) );
-		$new_rules       = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) );
-		$update_required = ( $new_rules !== $existing_rules );
+		$existing_rules  = array_filter(extract_from_markers($home_path.'.htaccess', 'WordPress'));
+		$new_rules       = array_filter(explode("\n", $wp_rewrite->mod_rewrite_rules()));
+		$update_required = ($new_rules !== $existing_rules);
 	}
 }
 
-if ( $wp_rewrite->using_index_permalinks() )
+if ($wp_rewrite->using_index_permalinks())
 	$usingpi = true;
 else
 	$usingpi = false;
 
 flush_rewrite_rules();
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
-if ( ! empty( $_GET['settings-updated'] ) ) : ?>
+if ( ! empty($_GET['settings-updated'])) : ?>
 <div id="message" class="updated notice is-dismissible"><p><?php
-if ( ! is_multisite() ) {
-	if ( $iis7_permalinks ) {
-		if ( $permalink_structure && ! $usingpi && ! $writable ) {
+if ( ! is_multisite()) {
+	if ($iis7_permalinks) {
+		if ($permalink_structure && ! $usingpi && ! $writable) {
 			_e('You should update your web.config now.');
-		} elseif ( $permalink_structure && ! $usingpi && $writable ) {
+		} elseif ($permalink_structure && ! $usingpi && $writable) {
 			_e('Permalink structure updated. Remove write access on web.config file now!');
 		} else {
 			_e('Permalink structure updated.');
 		}
-	} elseif ( $is_nginx ) {
+	} elseif ($is_nginx) {
 		_e('Permalink structure updated.');
 	} else {
-		if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) {
+		if ($permalink_structure && ! $usingpi && ! $writable && $update_required) {
 			_e('You should update your .htaccess now.');
 		} else {
 			_e('Permalink structure updated.');
@@ -162,58 +162,58 @@ 
 <?php endif; ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 
-  <p><?php _e( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.' ); ?></p>
+  <p><?php _e('WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
-	$permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
-	$category_base = preg_replace( '|^/?blog|', '', $category_base );
-	$tag_base = preg_replace( '|^/?blog|', '', $tag_base );
+if (is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos($permalink_structure, '/blog/')) {
+	$permalink_structure = preg_replace('|^/?blog|', '', $permalink_structure);
+	$category_base = preg_replace('|^/?blog|', '', $category_base);
+	$tag_base = preg_replace('|^/?blog|', '', $tag_base);
 }
 
 $structures = array(
 	0 => '',
-	1 => $prefix . '/%year%/%monthnum%/%day%/%postname%/',
-	2 => $prefix . '/%year%/%monthnum%/%postname%/',
-	3 => $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
-	4 => $prefix . '/%postname%/',
+	1 => $prefix.'/%year%/%monthnum%/%day%/%postname%/',
+	2 => $prefix.'/%year%/%monthnum%/%postname%/',
+	3 => $prefix.'/'._x('archives', 'sample permalink base').'/%post_id%',
+	4 => $prefix.'/%postname%/',
 );
 ?>
 <h2 class="title"><?php _e('Common Settings'); ?></h2>
 <table class="form-table permalink-structure">
 	<tr>
-		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'Plain' ); ?></label></th>
+		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e('Plain'); ?></label></th>
 		<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'.date('Y').'/'.date('m').'/'.date('d').'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'.date('Y').'/'.date('m').'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'._x('archives', 'sample permalink base').'/123'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[4]); ?>" <?php checked($structures[4], $permalink_structure); ?> /> <?php _e('Post name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th>
-			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
+			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( ! in_array($permalink_structure, $structures)); ?> />
 			<?php _e('Custom Structure'); ?>
 			</label>
 		</th>
 		<td>
-			<code><?php echo get_option('home') . $blog_prefix; ?></code>
+			<code><?php echo get_option('home').$blog_prefix; ?></code>
 			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
 		</td>
 	</tr>
@@ -222,12 +222,12 @@ 
 <h2 class="title"><?php _e('Optional'); ?></h2>
 <p><?php
 /* translators: %s is a placeholder that must come at the start of the URL. */
-printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix ); ?></p>
+printf(__('If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.'), get_option('home').$blog_prefix.$prefix); ?></p>
 
 <table class="form-table">
 	<tr>
 		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
+		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr($category_base); ?>" class="regular-text code" /></td>
 	</tr>
 	<tr>
 		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
@@ -240,33 +240,33 @@ 
 
 <?php submit_button(); ?>
   </form>
-<?php if ( !is_multisite() ) { ?>
-<?php if ( $iis7_permalinks ) :
-	if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) :
-		if ( file_exists($home_path . 'web.config') ) : ?>
+<?php if ( ! is_multisite()) { ?>
+<?php if ($iis7_permalinks) :
+	if (isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable) :
+		if (file_exists($home_path.'web.config')) : ?>
 <p><?php _e('If your <code>web.config</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->iis7_url_rewrite_rules()); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
 		<?php else : ?>
 <p><?php _e('If the root directory of your site were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
+	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
-<?php elseif ( $is_nginx ) : ?>
-	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
+<?php elseif ($is_nginx) : ?>
+	<p><?php _e('<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.'); ?></p>
 <?php else:
-	if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) : ?>
+	if ($permalink_structure && ! $usingpi && ! $writable && $update_required) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->mod_rewrite_rules()); ?></textarea></p>
 </form>
 	<?php endif; ?>
 <?php endif; ?>
@@ -274,4 +274,4 @@ 
 
 </div>
 
-<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +39 added lines, -25 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
@@ -53,8 +54,9 @@ 
 $permalink_structure = get_option( 'permalink_structure' );
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite() ) {
 	$prefix = '/index.php';
+}
 
 /**
  * In a subdirectory configuration of multisite, the `/blog` prefix is used by
@@ -70,32 +72,36 @@ 
 	check_admin_referer('update-permalink');
 
 	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
-			$permalink_structure = $_POST['selection'];
-		else
-			$permalink_structure = $_POST['permalink_structure'];
+		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) {
+					$permalink_structure = $_POST['selection'];
+		} else {
+					$permalink_structure = $_POST['permalink_structure'];
+		}
 
 		if ( ! empty( $permalink_structure ) ) {
 			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
-				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
-			else
-				$permalink_structure = $blog_prefix . $permalink_structure;
+			if ( $prefix && $blog_prefix ) {
+							$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+			} else {
+							$permalink_structure = $blog_prefix . $permalink_structure;
+			}
 		}
 		$wp_rewrite->set_permalink_structure( $permalink_structure );
 	}
 
 	if ( isset( $_POST['category_base'] ) ) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		if ( ! empty( $category_base ) ) {
+					$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		}
 		$wp_rewrite->set_category_base( $category_base );
 	}
 
 	if ( isset( $_POST['tag_base'] ) ) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		if ( ! empty( $tag_base ) ) {
+					$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		}
 		$wp_rewrite->set_tag_base( $tag_base );
 	}
 
@@ -108,11 +114,12 @@ 
 $update_required     = false;
 
 if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
-		$writable = true;
-	else
-		$writable = false;
-} elseif ( $is_nginx ) {
+	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') ) {
+			$writable = true;
+	} else {
+			$writable = false;
+	}
+	} elseif ( $is_nginx ) {
 	$writable = false;
 } else {
 	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
@@ -125,10 +132,11 @@ 
 	}
 }
 
-if ( $wp_rewrite->using_index_permalinks() )
+if ( $wp_rewrite->using_index_permalinks() ) {
 	$usingpi = true;
-else
+} else {
 	$usingpi = false;
+}
 
 flush_rewrite_rules();
 
@@ -250,23 +258,29 @@ 
 	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
-		<?php else : ?>
+		<?php else {
+	: ?>
 <p><?php _e('If the root directory of your site were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
+	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) );
+}
+?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
 <?php elseif ( $is_nginx ) : ?>
 	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
-<?php else:
+<?php else {
+	:
 	if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() );
+}
+?></textarea></p>
 </form>
 	<?php endif; ?>
 <?php endif; ?>