ntwb / wordpress

src/wp-admin/media-upload.php

Spacing +22 added lines, -22 removed lines

@@ -9,47 +9,47 @@ 
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
-	define( 'IFRAME_REQUEST' , true );
+if ( ! isset($_GET['inline']))
+	define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ), 403 );
+if ( ! current_user_can('upload_files')) {
+	wp_die(__('Sorry, you are not allowed to upload files.'), 403);
 }
 
 wp_enqueue_script('plupload-handlers');
 wp_enqueue_script('image-edit');
-wp_enqueue_script('set-post-thumbnail' );
+wp_enqueue_script('set-post-thumbnail');
 wp_enqueue_style('imgareaselect');
-wp_enqueue_script( 'media-gallery' );
+wp_enqueue_script('media-gallery');
 
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 // IDs should be integers
 $ID = isset($ID) ? (int) $ID : 0;
-$post_id = isset($post_id)? (int) $post_id : 0;
+$post_id = isset($post_id) ? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset( $action ) && $action == 'edit' && !$ID ) {
+if (isset($action) && $action == 'edit' && ! $ID) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Invalid item ID.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Invalid item ID.').'</p>',
 		403
 	);
 }
 
-if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+if ( ! empty($_REQUEST['post_id']) && ! current_user_can('edit_post', $_REQUEST['post_id'])) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 		403
 	);
 }
 
 // Upload type: image, video, file, ..?
-if ( isset($_GET['type']) ) {
+if (isset($_GET['type'])) {
 	$type = strval($_GET['type']);
 } else {
 	/**
@@ -60,11 +60,11 @@ 
 	 * @param string $type The default media upload type. Possible values include
 	 *                     'image', 'audio', 'video', 'file', etc. Default 'file'.
 	 */
-	$type = apply_filters( 'media_upload_default_type', 'file' );
+	$type = apply_filters('media_upload_default_type', 'file');
 }
 
 // Tab: gallery, library, or type-specific.
-if ( isset($_GET['tab']) ) {
+if (isset($_GET['tab'])) {
 	$tab = strval($_GET['tab']);
 } else {
 	/**
@@ -74,13 +74,13 @@ 
 	 *
 	 * @param string $type The default media popup tab. Default 'type' (From Computer).
 	 */
-	$tab = apply_filters( 'media_upload_default_tab', 'type' );
+	$tab = apply_filters('media_upload_default_tab', 'type');
 }
 
 $body_id = 'media-upload';
 
 // Let the action code decide how to handle the request.
-if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+if ($tab == 'type' || $tab == 'type_url' || ! array_key_exists($tab, media_upload_tabs())) {
 	/**
 	 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
 	 * media popup based on the current tab.
@@ -95,7 +95,7 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "media_upload_$type" );
+	do_action("media_upload_$type");
 } else {
 	/**
 	 * Fires inside limited and specific upload-tab views in the legacy
@@ -107,6 +107,6 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "media_upload_$tab" );
+	do_action("media_upload_$tab");
 }
 

src/wp-admin/plugin-editor.php

Spacing +92 added lines, -92 removed lines

@@ -7,98 +7,98 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'plugin-editor.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('plugin-editor.php'));
 	exit();
 }
 
-if ( !current_user_can('edit_plugins') )
-	wp_die( __('Sorry, you are not allowed to edit plugins for this site.') );
+if ( ! current_user_can('edit_plugins'))
+	wp_die(__('Sorry, you are not allowed to edit plugins for this site.'));
 
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
 
-wp_reset_vars( array( 'action', 'error', 'file', 'plugin' ) );
+wp_reset_vars(array('action', 'error', 'file', 'plugin'));
 
 $plugins = get_plugins();
 
-if ( empty( $plugins ) ) {
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+if (empty($plugins)) {
+	include(ABSPATH.'wp-admin/admin-header.php');
 	?>
 	<div class="wrap">
-		<h1><?php echo esc_html( $title ); ?></h1>
-		<div id="message" class="error"><p><?php _e( 'You do not appear to have any plugins available at this time.' ); ?></p></div>
+		<h1><?php echo esc_html($title); ?></h1>
+		<div id="message" class="error"><p><?php _e('You do not appear to have any plugins available at this time.'); ?></p></div>
 	</div>
 	<?php
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
-if ( $file ) {
+if ($file) {
 	$plugin = $file;
-} elseif ( empty( $plugin ) ) {
+} elseif (empty($plugin)) {
 	$plugin = array_keys($plugins);
 	$plugin = $plugin[0];
 }
 
 $plugin_files = get_plugin_files($plugin);
 
-if ( empty($file) )
+if (empty($file))
 	$file = $plugin_files[0];
 
 $file = validate_file_to_edit($file, $plugin_files);
-$real_file = WP_PLUGIN_DIR . '/' . $file;
+$real_file = WP_PLUGIN_DIR.'/'.$file;
 $scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
-switch ( $action ) {
+switch ($action) {
 
 case 'update':
 
-	check_admin_referer('edit-plugin_' . $file);
+	check_admin_referer('edit-plugin_'.$file);
 
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	if ( is_writeable($real_file) ) {
+	$newcontent = wp_unslash($_POST['newcontent']);
+	if (is_writeable($real_file)) {
 		$f = fopen($real_file, 'w+');
 		fwrite($f, $newcontent);
 		fclose($f);
 
-		$network_wide = is_plugin_active_for_network( $file );
+		$network_wide = is_plugin_active_for_network($file);
 
 		// Deactivate so we can test it.
-		if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
-			if ( is_plugin_active($file) )
+		if (is_plugin_active($file) || isset($_POST['phperror'])) {
+			if (is_plugin_active($file))
 				deactivate_plugins($file, true);
 
-			if ( ! is_network_admin() ) {
-				update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin()) {
+				update_option('recently_activated', array($file => time()) + (array) get_option('recently_activated'));
 			} else {
-				update_site_option( 'recently_activated', array( $file => time() ) + (array) get_site_option( 'recently_activated' ) );
+				update_site_option('recently_activated', array($file => time()) + (array) get_site_option('recently_activated'));
 			}
 
-			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
+			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_'.$file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=".$network_wide));
 			exit;
 		}
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+		wp_redirect(self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto"));
 	} else {
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
+		wp_redirect(self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto"));
 	}
 	exit;
 
 default:
 
-	if ( isset($_GET['liveupdate']) ) {
-		check_admin_referer('edit-plugin-test_' . $file);
+	if (isset($_GET['liveupdate'])) {
+		check_admin_referer('edit-plugin-test_'.$file);
 
 		$error = validate_plugin($file);
-		if ( is_wp_error($error) )
-			wp_die( $error );
+		if (is_wp_error($error))
+			wp_die($error);
 
-		if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
-			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
+		if (( ! empty($_GET['networkwide']) && ! is_plugin_active_for_network($file)) || ! is_plugin_active($file))
+			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty($_GET['networkwide'])); // we'll override this later if the plugin can be included without fatal error
 
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+		wp_redirect(self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto"));
 		exit;
 	}
 
@@ -112,97 +112,97 @@ 
 	 *
 	 * @param array $editable_extensions An array of editable plugin file extensions.
 	 */
-	$editable_extensions = (array) apply_filters( 'editable_extensions', $editable_extensions );
+	$editable_extensions = (array) apply_filters('editable_extensions', $editable_extensions);
 
-	if ( ! is_file($real_file) ) {
+	if ( ! is_file($real_file)) {
 		wp_die(sprintf('<p>%s</p>', __('No such file exists! Double check the name and try again.')));
 	} else {
 		// Get the extension of the file
-		if ( preg_match('/\.([^.]+)$/', $real_file, $matches) ) {
+		if (preg_match('/\.([^.]+)$/', $real_file, $matches)) {
 			$ext = strtolower($matches[1]);
 			// If extension is not in the acceptable list, skip it
-			if ( !in_array( $ext, $editable_extensions) )
+			if ( ! in_array($ext, $editable_extensions))
 				wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
 		}
 	}
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'overview',
 	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
-		'<p>' . __('Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
-		'<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.') . '</p>' .
-		'<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>' .
-		'<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
-		( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
-	) );
+		'<p>'.__('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.').'</p>'.
+		'<p>'.__('Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.').'</p>'.
+		'<p>'.__('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.').'</p>'.
+		'<p id="newcontent-description">'.__('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.').'</p>'.
+		'<p>'.__('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.').'</p>'.
+		(is_network_admin() ? '<p>'.__('Any edits to files from this screen will be reflected on all sites in the network.').'</p>' : '')
+	));
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Editor_Screen" target="_blank">Documentation on Editing Plugins</a>') . '</p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing 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/Plugins_Editor_Screen" target="_blank">Documentation on Editing Plugins</a>').'</p>'.
+		'<p>'.__('<a href="https://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing Plugins</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
+	update_recently_edited(WP_PLUGIN_DIR.'/'.$file);
 
-	$content = file_get_contents( $real_file );
+	$content = file_get_contents($real_file);
 
-	if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
-		$functions = wp_doc_link_parse( $content );
+	if ('.php' == substr($real_file, strrpos($real_file, '.'))) {
+		$functions = wp_doc_link_parse($content);
 
-		if ( !empty($functions) ) {
+		if ( ! empty($functions)) {
 			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function) {
-				$docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';
+			$docs_select .= '<option value="">'.__('Function Name&hellip;').'</option>';
+			foreach ($functions as $function) {
+				$docs_select .= '<option value="'.esc_attr($function).'">'.esc_html($function).'()</option>';
 			}
 			$docs_select .= '</select>';
 		}
 	}
 
-	$content = esc_textarea( $content );
+	$content = esc_textarea($content);
 	?>
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
 <?php elseif (isset($_GET['phperror'])) : ?>
  <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
 	<?php
-		if ( wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $file ) ) {
-			$iframe_url = add_query_arg( array(
+		if (wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_'.$file)) {
+			$iframe_url = add_query_arg(array(
 				'action'   => 'error_scrape',
-				'plugin'   => urlencode( $file ),
-				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
-			), admin_url( 'plugins.php' ) );
+				'plugin'   => urlencode($file),
+				'_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 endif; ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
 <big><?php
-	if ( is_plugin_active( $plugin ) ) {
-		if ( is_writeable( $real_file ) ) {
+	if (is_plugin_active($plugin)) {
+		if (is_writeable($real_file)) {
 			/* translators: %s: plugin file name */
-			echo sprintf( __( 'Editing %s (active)' ), '<strong>' . $file . '</strong>' );
+			echo sprintf(__('Editing %s (active)'), '<strong>'.$file.'</strong>');
 		} else {
 			/* translators: %s: plugin file name */
-			echo sprintf( __( 'Browsing %s (active)' ), '<strong>' . $file . '</strong>' );
+			echo sprintf(__('Browsing %s (active)'), '<strong>'.$file.'</strong>');
 		}
 	} else {
-		if ( is_writeable( $real_file ) ) {
+		if (is_writeable($real_file)) {
 			/* translators: %s: plugin file name */
-			echo sprintf( __( 'Editing %s (inactive)' ), '<strong>' . $file . '</strong>' );
+			echo sprintf(__('Editing %s (inactive)'), '<strong>'.$file.'</strong>');
 		} else {
 			/* translators: %s: plugin file name */
-			echo sprintf( __( 'Browsing %s (inactive)' ), '<strong>' . $file . '</strong>' );
+			echo sprintf(__('Browsing %s (inactive)'), '<strong>'.$file.'</strong>');
 		}
 	}
 	?></big>
@@ -212,9 +212,9 @@ 
 		<strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong>
 		<select name="plugin" id="plugin">
 <?php
-	foreach ( $plugins as $plugin_key => $a_plugin ) {
+	foreach ($plugins as $plugin_key => $a_plugin) {
 		$plugin_name = $a_plugin['Name'];
-		if ( $plugin_key == $plugin )
+		if ($plugin_key == $plugin)
 			$selected = " selected='selected'";
 		else
 			$selected = '';
@@ -224,55 +224,55 @@ 
 	}
 ?>
 		</select>
-		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
+		<?php submit_button(__('Select'), 'button', 'Submit', false); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
 
 <div id="templateside">
-	<h2><?php _e( 'Plugin Files' ); ?></h2>
+	<h2><?php _e('Plugin Files'); ?></h2>
 
 	<ul>
 <?php
-foreach ( $plugin_files as $plugin_file ) :
+foreach ($plugin_files as $plugin_file) :
 	// Get the extension of the file
-	if ( preg_match('/\.([^.]+)$/', $plugin_file, $matches) ) {
+	if (preg_match('/\.([^.]+)$/', $plugin_file, $matches)) {
 		$ext = strtolower($matches[1]);
 		// If extension is not in the acceptable list, skip it
-		if ( !in_array( $ext, $editable_extensions ) )
+		if ( ! in_array($ext, $editable_extensions))
 			continue;
 	} else {
 		// No extension found
 		continue;
 	}
 ?>
-		<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo $plugin_file ?></a></li>
+		<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode($plugin_file) ?>&amp;plugin=<?php echo urlencode($plugin) ?>"><?php echo $plugin_file ?></a></li>
 <?php endforeach; ?>
 	</ul>
 </div>
 <form name="template" id="template" action="plugin-editor.php" method="post">
-	<?php wp_nonce_field('edit-plugin_' . $file) ?>
+	<?php wp_nonce_field('edit-plugin_'.$file) ?>
 		<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
 		<input type="hidden" name="plugin" value="<?php echo esc_attr($plugin) ?>" />
 		<input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
 		</div>
-		<?php if ( !empty( $docs_select ) ) : ?>
-		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
+		<?php if ( ! empty($docs_select)) : ?>
+		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e('Look Up') ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode(get_locale()) ?>&amp;version=<?php echo urlencode($wp_version) ?>&amp;redirect=true'); }" /></div>
 		<?php endif; ?>
-<?php if ( is_writeable($real_file) ) : ?>
-	<?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
+<?php if (is_writeable($real_file)) : ?>
+	<?php if (in_array($file, (array) get_option('active_plugins', array()))) { ?>
 		<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
 	<?php } ?>
 	<p class="submit">
 	<?php
-		if ( isset($_GET['phperror']) ) {
+		if (isset($_GET['phperror'])) {
 			echo "<input type='hidden' name='phperror' value='1' />";
-			submit_button( __( 'Update File and Attempt to Reactivate' ), 'primary', 'submit', false );
+			submit_button(__('Update File and Attempt to Reactivate'), 'primary', 'submit', false);
 		} else {
-			submit_button( __( 'Update File' ), 'primary', 'submit', false );
+			submit_button(__('Update File'), 'primary', 'submit', false);
 		}
 	?>
 	</p>
@@ -291,4 +291,4 @@ 
 <?php
 	break;
 }
-include(ABSPATH . "wp-admin/admin-footer.php");
+include(ABSPATH."wp-admin/admin-footer.php");

src/wp-admin/ms-delete-site.php

Spacing +31 added lines, -31 removed lines

@@ -7,43 +7,43 @@ 
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-if ( ! current_user_can( 'delete_site' ) )
-	wp_die(__( 'Sorry, you are not allowed to delete this site.'));
+if ( ! current_user_can('delete_site'))
+	wp_die(__('Sorry, you are not allowed to delete this site.'));
 
-if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
-	if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
-		wpmu_delete_blog( $wpdb->blogid );
-		wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
+if (isset($_GET['h']) && $_GET['h'] != '' && get_option('delete_blog_hash') != false) {
+	if (hash_equals(get_option('delete_blog_hash'), $_GET['h'])) {
+		wpmu_delete_blog($wpdb->blogid);
+		wp_die(sprintf(__('Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.'), $current_site->site_name));
 	} else {
-		wp_die( __( "I'm sorry, the link you clicked is stale. Please select another option." ) );
+		wp_die(__("I'm sorry, the link you clicked is stale. Please select another option."));
 	}
 }
 
 $blog = get_blog_details();
 $user = wp_get_current_user();
 
-$title = __( 'Delete Site' );
+$title = __('Delete Site');
 $parent_file = 'tools.php';
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 echo '<div class="wrap">';
-echo '<h1>' . esc_html( $title ) . '</h1>';
+echo '<h1>'.esc_html($title).'</h1>';
 
-if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
-	check_admin_referer( 'delete-blog' );
+if (isset($_POST['action']) && $_POST['action'] == 'deleteblog' && isset($_POST['confirmdelete']) && $_POST['confirmdelete'] == '1') {
+	check_admin_referer('delete-blog');
 
-	$hash = wp_generate_password( 20, false );
-	update_option( 'delete_blog_hash', $hash );
+	$hash = wp_generate_password(20, false);
+	update_option('delete_blog_hash', $hash);
 
-	$url_delete = esc_url( admin_url( 'ms-delete-site.php?h=' . $hash ) );
+	$url_delete = esc_url(admin_url('ms-delete-site.php?h='.$hash));
 
 	/* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
-	$content = __( "Howdy ###USERNAME###,
+	$content = __("Howdy ###USERNAME###,
 
 You recently clicked the 'Delete Site' link on your site and filled in a
 form on that page.
@@ -66,30 +66,30 @@ 
 	 *
 	 * @param string $content The email content that will be sent to the user who deleted a site in a Multisite network.
 	 */
-	$content = apply_filters( 'delete_site_email_content', $content );
+	$content = apply_filters('delete_site_email_content', $content);
 
-	$content = str_replace( '###USERNAME###', $user->user_login, $content );
-	$content = str_replace( '###URL_DELETE###', $url_delete, $content );
-	$content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
+	$content = str_replace('###USERNAME###', $user->user_login, $content);
+	$content = str_replace('###URL_DELETE###', $url_delete, $content);
+	$content = str_replace('###SITE_NAME###', $current_site->site_name, $content);
 
-	wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
+	wp_mail(get_option('admin_email'), "[ ".wp_specialchars_decode(get_option('blogname'))." ] ".__('Delete My Site'), $content);
 	?>
 
-	<p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.' ) ?></p>
+	<p><?php _e('Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked.') ?></p>
 
 <?php } else {
 	?>
-	<p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
-	<p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
+	<p><?php printf(__('If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p>
+	<p><?php _e('Remember, once deleted your site cannot be restored.') ?></p>
 
 	<form method="post" name="deletedirect">
-		<?php wp_nonce_field( 'delete-blog' ) ?>
+		<?php wp_nonce_field('delete-blog') ?>
 		<input type="hidden" name="action" value="deleteblog" />
-		<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $blog->domain : $blog->domain . $blog->path ); ?></strong></label></p>
-		<?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
+		<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf(__("I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again."), is_subdomain_install() ? $blog->domain : $blog->domain.$blog->path); ?></strong></label></p>
+		<?php submit_button(__('Delete My Site Permanently')); ?>
 	</form>
  	<?php
 }
 echo '</div>';
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/comment.php

Spacing +107 added lines, -107 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -16,59 +16,59 @@ 
  * @global string $action
  */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars(array('action'));
 
-if ( isset( $_POST['deletecomment'] ) )
+if (isset($_POST['deletecomment']))
 	$action = 'deletecomment';
 
-if ( 'cdc' == $action )
+if ('cdc' == $action)
 	$action = 'delete';
-elseif ( 'mac' == $action )
+elseif ('mac' == $action)
 	$action = 'approve';
 
-if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
+if (isset($_GET['dt'])) {
+	if ('spam' == $_GET['dt'])
 		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
+	elseif ('trash' == $_GET['dt'])
 		$action = 'trash';
 }
 
-switch( $action ) {
+switch ($action) {
 
 case 'editcomment' :
 	$title = __('Edit Comment');
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
+			'<p>'.__('You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.').'</p>'.
+			'<p>'.__('You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</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/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'javascript:history.go(-1)'));
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	if ( ! current_user_can('edit_comment', $comment_id))
+		comment_footer_die(__('Sorry, you are not allowed to edit this comment.'));
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ('trash' == $comment->comment_approved)
+		comment_footer_die(__('This comment is in the Trash. Please move it out of the Trash if you want to edit it.'));
 
-	$comment = get_comment_to_edit( $comment_id );
+	$comment = get_comment_to_edit($comment_id);
 
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+	include(ABSPATH.'wp-admin/edit-form-comment.php');
 
 	break;
 
@@ -79,40 +79,40 @@ 
 
 	$title = __('Moderate Comment');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( ! $comment = get_comment( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
+	if ( ! $comment = get_comment($comment_id)) {
+		wp_redirect(admin_url('edit-comments.php?error=1'));
 		die();
 	}
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
+		wp_redirect(admin_url('edit-comments.php?error=2'));
 		die();
 	}
 
 	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+	if ($action == str_replace('1', 'approve', $comment->comment_approved)) {
+		wp_redirect(admin_url('edit-comments.php?same='.$comment_id));
 		die();
  	}
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$formaction    = $action . 'comment';
+	$formaction    = $action.'comment';
 	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
 	$nonce_action .= $comment_id;
 
 ?>
 <div class="wrap">
 
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
-switch ( $action ) {
+switch ($action) {
 	case 'spam' :
 		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = _x( 'Mark as Spam', 'comment' );
+		$button      = _x('Mark as Spam', 'comment');
 		break;
 	case 'trash' :
 		$caution_msg = __('You are about to move the following comment to the Trash:');
@@ -128,9 +128,9 @@ 
 		break;
 }
 
-if ( $comment->comment_approved != '0' ) { // if not unapproved
+if ($comment->comment_approved != '0') { // if not unapproved
 	$message = '';
-	switch ( $comment->comment_approved ) {
+	switch ($comment->comment_approved) {
 		case '1' :
 			$message = __('This comment is currently approved.');
 			break;
@@ -141,68 +141,68 @@ 
 			$message  = __('This comment is currently in the Trash.');
 			break;
 	}
-	if ( $message ) {
-		echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+	if ($message) {
+		echo '<div id="message" class="notice notice-info"><p>'.$message.'</p></div>';
 	}
 }
 ?>
-<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
+<div id="message" class="notice notice-warning"><p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p></div>
 
 <table class="form-table comment-ays">
 <tr>
 <th scope="row"><?php _e('Author'); ?></th>
-<td><?php comment_author( $comment ); ?></td>
+<td><?php comment_author($comment); ?></td>
 </tr>
-<?php if ( get_comment_author_email( $comment ) ) { ?>
+<?php if (get_comment_author_email($comment)) { ?>
 <tr>
 <th scope="row"><?php _e('Email'); ?></th>
-<td><?php comment_author_email( $comment ); ?></td>
+<td><?php comment_author_email($comment); ?></td>
 </tr>
 <?php } ?>
-<?php if ( get_comment_author_url( $comment ) ) { ?>
+<?php if (get_comment_author_url($comment)) { ?>
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
+<td><a href="<?php comment_author_url($comment); ?>"><?php comment_author_url($comment); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
-	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
+	<th scope="row"><?php /* translators: column name or table row header */ _e('In Response To'); ?></th>
 	<td>
 	<?php
 		$post_id = $comment->comment_post_ID;
-		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+		if (current_user_can('edit_post', $post_id)) {
+			$post_link = "<a href='".esc_url(get_edit_post_link($post_id))."'>";
+			$post_link .= esc_html(get_the_title($post_id)).'</a>';
 		} else {
-			$post_link = esc_html( get_the_title( $post_id ) );
+			$post_link = esc_html(get_the_title($post_id));
 		}
 		echo $post_link;
 
-		if ( $comment->comment_parent ) {
-			$parent      = get_comment( $comment->comment_parent );
-			$parent_link = esc_url( get_comment_link( $parent ) );
-			$name        = get_comment_author( $parent );
+		if ($comment->comment_parent) {
+			$parent      = get_comment($comment->comment_parent);
+			$parent_link = esc_url(get_comment_link($parent));
+			$name        = get_comment_author($parent);
 			printf(
 				/* translators: %s: comment link */
-				' | ' . __( 'In reply to %s.' ),
-				'<a href="' . $parent_link . '">' . $name . '</a>'
+				' | '.__('In reply to %s.'),
+				'<a href="'.$parent_link.'">'.$name.'</a>'
 			);
 		}
 	?>
 	</td>
 </tr>
 <tr>
-	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
+	<th scope="row"><?php _e('Submitted on'); ?></th>
 	<td>
 	<?php
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(__('%1$s at %2$s'),
 			/* translators: comment date format. See https://secure.php.net/date */
-			get_comment_date( __( 'Y/m/d' ), $comment ),
-			get_comment_date( __( 'g:i a' ), $comment )
+			get_comment_date(__('Y/m/d'), $comment),
+			get_comment_date(__('g:i a'), $comment)
 		);
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
-			echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+		if ('approved' === wp_get_comment_status($comment) && ! empty ($comment->comment_post_ID)) {
+			echo '<a href="'.esc_url(get_comment_link($comment)).'">'.$submitted.'</a>';
 		} else {
 			echo $submitted;
 		}
@@ -212,8 +212,8 @@ 
 <tr>
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td class="comment-content">
-	<?php comment_text( $comment ); ?>
-	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
+	<?php comment_text($comment); ?>
+	<p class="edit-comment"><a href="<?php echo admin_url("comment.php?action=editcomment&amp;c={$comment->comment_ID}"); ?>"><?php esc_attr_e('Edit'); ?></a></p>
 </td>
 </tr>
 </table>
@@ -221,11 +221,11 @@ 
 <form action="comment.php" method="get" class="comment-ays-submit">
 
 <p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a>
+	<?php submit_button($button, 'primary', 'submit', false); ?>
+	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e('Cancel'); ?></a>
 </p>
 
-<?php wp_nonce_field( $nonce_action ); ?>
+<?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
 <input type="hidden" name="noredir" value="1" />
@@ -242,75 +242,75 @@ 
 case 'unspamcomment'    :
 case 'approvecomment'   :
 case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	$comment_id = absint($_REQUEST['c']);
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
+	if (in_array($action, array('approvecomment', 'unapprovecomment')))
+		check_admin_referer('approve-comment_'.$comment_id);
 	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		check_admin_referer('delete-comment_'.$comment_id);
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'edit-comments.php'));
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
+		comment_footer_die(__('Sorry, you are not allowed to edit comments on this post.'));
 
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
+	if ('' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php'))
 		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
+	elseif ('' != wp_get_original_referer() && ! $noredir)
 		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	elseif (in_array($action, array('approvecomment', 'unapprovecomment')))
+		$redir = admin_url('edit-comments.php?p='.absint($comment->comment_post_ID));
 	else
 		$redir = admin_url('edit-comments.php');
 
-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+	$redir = remove_query_arg(array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir);
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'deletecomment' :
-			wp_delete_comment( $comment );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
+			wp_delete_comment($comment);
+			$redir = add_query_arg(array('deleted' => '1'), $redir);
 			break;
 		case 'trashcomment' :
-			wp_trash_comment( $comment );
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+			wp_trash_comment($comment);
+			$redir = add_query_arg(array('trashed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'untrashcomment' :
-			wp_untrash_comment( $comment );
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
+			wp_untrash_comment($comment);
+			$redir = add_query_arg(array('untrashed' => '1'), $redir);
 			break;
 		case 'spamcomment' :
-			wp_spam_comment( $comment );
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+			wp_spam_comment($comment);
+			$redir = add_query_arg(array('spammed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'unspamcomment' :
-			wp_unspam_comment( $comment );
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
+			wp_unspam_comment($comment);
+			$redir = add_query_arg(array('unspammed' => '1'), $redir);
 			break;
 		case 'approvecomment' :
-			wp_set_comment_status( $comment, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+			wp_set_comment_status($comment, 'approve');
+			$redir = add_query_arg(array('approved' => 1), $redir);
 			break;
 		case 'unapprovecomment' :
-			wp_set_comment_status( $comment, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+			wp_set_comment_status($comment, 'hold');
+			$redir = add_query_arg(array('unapproved' => 1), $redir);
 			break;
 	}
 
-	wp_redirect( $redir );
+	wp_redirect($redir);
 	die;
 
 case 'editedcomment' :
 
-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+	$comment_id = absint($_POST['comment_ID']);
+	$comment_post_id = absint($_POST['comment_post_ID']);
 
-	check_admin_referer( 'update-comment_' . $comment_id );
+	check_admin_referer('update-comment_'.$comment_id);
 
 	edit_comment();
 
-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = (empty($_POST['referredby']) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby']).'#comment-'.$comment_id;
 
 	/**
 	 * Filters the URI the user is redirected to after editing a comment in the admin.
@@ -320,14 +320,14 @@ 
 	 * @param string $location The URI the user will be redirected to.
 	 * @param int $comment_id The ID of the comment being edited.
 	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+	$location = apply_filters('comment_edit_redirect', $location, $comment_id);
+	wp_redirect($location);
 
 	exit();
 
 default:
-	wp_die( __('Unknown action.') );
+	wp_die(__('Unknown action.'));
 
 } // end switch
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +41 added lines, -31 removed lines

@@ -18,20 +18,23 @@ 
 global $action;
 wp_reset_vars( array('action') );
 
-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
+}
 
-if ( 'cdc' == $action )
+if ( 'cdc' == $action ) {
 	$action = 'delete';
-elseif ( 'mac' == $action )
+} elseif ( 'mac' == $action ) {
 	$action = 'approve';
+}
 
 if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
-		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
-		$action = 'trash';
-}
+	if ( 'spam' == $_GET['dt'] ) {
+			$action = 'spam';
+	} elseif ( 'trash' == $_GET['dt'] ) {
+			$action = 'trash';
+	}
+	}
 
 switch( $action ) {
 
@@ -57,14 +60,17 @@ 
 
 	$comment_id = absint( $_GET['c'] );
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( !$comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	}
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	}
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	}
 
 	$comment = get_comment_to_edit( $comment_id );
 
@@ -244,26 +250,30 @@ 
 case 'unapprovecomment' :
 	$comment_id = absint( $_REQUEST['c'] );
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+	} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+	}
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
-
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+	if ( !$comment = get_comment($comment_id) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+	}
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+	}
+
+	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') ) {
+			$redir = wp_get_referer();
+	} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+	} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	} else {
+			$redir = admin_url('edit-comments.php');
+	}
 
 	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
 

src/wp-admin/post-new.php

Spacing +26 added lines, -26 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /**
  * @global string  $post_type
@@ -16,28 +16,28 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( ! isset( $_GET['post_type'] ) ) {
+if ( ! isset($_GET['post_type'])) {
 	$post_type = 'post';
-} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) {
+} elseif (in_array($_GET['post_type'], get_post_types(array('show_ui' => true)))) {
 	$post_type = $_GET['post_type'];
 } else {
-	wp_die( __( 'Invalid post type.' ) );
+	wp_die(__('Invalid post type.'));
 }
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( 'post' == $post_type ) {
+if ('post' == $post_type) {
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
-} elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+} elseif ('attachment' == $post_type) {
+	if (wp_redirect(admin_url('media-new.php')))
 		exit;
 } else {
 	$submenu_file = "post-new.php?post_type=$post_type";
-	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+	if (isset($post_type_object) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true) {
 		$parent_file = $post_type_object->show_in_menu;
 		// What if there isn't a post-new.php item for this post type?
-		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
-			if (	isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+		if ( ! isset($_registered_pages[get_plugin_page_hookname("post-new.php?post_type=$post_type", $post_type_object->show_in_menu)])) {
+			if (isset($_registered_pages[get_plugin_page_hookname("edit.php?post_type=$post_type", $post_type_object->show_in_menu)])) {
 				// Fall back to edit.php for that post type, if it exists
 				$submenu_file = "edit.php?post_type=$post_type";
 			} else {
@@ -54,33 +54,33 @@ 
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) {
+if ( ! current_user_can($post_type_object->cap->edit_posts) || ! current_user_can($post_type_object->cap->create_posts)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to create posts as this user.').'</p>',
 		403
 	);
 }
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
-	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+if ( ! wp_next_scheduled('wp_scheduled_auto_draft_delete'))
+	wp_schedule_event(time(), 'daily', 'wp_scheduled_auto_draft_delete');
 
-wp_enqueue_script( 'autosave' );
+wp_enqueue_script('autosave');
 
-if ( is_multisite() ) {
-	add_action( 'admin_footer', '_admin_notice_post_locked' );
+if (is_multisite()) {
+	add_action('admin_footer', '_admin_notice_post_locked');
 } else {
-	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+	$check_users = get_users(array('fields' => 'ID', 'number' => 2));
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (count($check_users) > 1)
+		add_action('admin_footer', '_admin_notice_post_locked');
 
-	unset( $check_users );
+	unset($check_users);
 }
 
 // Show post form.
-$post = get_default_post_to_edit( $post_type, true );
+$post = get_default_post_to_edit($post_type, true);
 $post_ID = $post->ID;
-include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/edit-form-advanced.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/options-permalink.php

Spacing +95 added lines, -95 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( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('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,149 +62,149 @@ 
  * 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';
 }
 
-$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);
 	}
 }
 
 $using_index_permalinks = $wp_rewrite->using_index_permalinks();
 
-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;
 		}
 
-		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
+		$permalink_structure = sanitize_option('permalink_structure', $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);
 	}
 
-	$message = __( 'Permalink structure updated.' );
+	$message = __('Permalink structure updated.');
 
-	if ( $iis7_permalinks ) {
-		if ( $permalink_structure && ! $using_index_permalinks && ! $writable ) {
-			$message = __( 'You should update your web.config now.' );
-		} elseif ( $permalink_structure && ! $using_index_permalinks && $writable ) {
-			$message = __( 'Permalink structure updated. Remove write access on web.config file now!' );
+	if ($iis7_permalinks) {
+		if ($permalink_structure && ! $using_index_permalinks && ! $writable) {
+			$message = __('You should update your web.config now.');
+		} elseif ($permalink_structure && ! $using_index_permalinks && $writable) {
+			$message = __('Permalink structure updated. Remove write access on web.config file now!');
 		}
-	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
-		$message = __( 'You should update your .htaccess now.' );
+	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required) {
+		$message = __('You should update your .htaccess now.');
 	}
 
-	if ( ! get_settings_errors() ) {
-		add_settings_error( 'general', 'settings_updated', $message, 'updated' );
+	if ( ! get_settings_errors()) {
+		add_settings_error('general', 'settings_updated', $message, 'updated');
 	}
 
-	set_transient( 'settings_errors', get_settings_errors(), 30 );
+	set_transient('settings_errors', get_settings_errors(), 30);
 
-	wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
+	wp_redirect(admin_url('options-permalink.php?settings-updated=true'));
 	exit;
 }
 
 flush_rewrite_rules();
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <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>
@@ -213,12 +213,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>
@@ -231,33 +231,33 @@ 
 
 <?php submit_button(); ?>
   </form>
-<?php if ( !is_multisite() ) { ?>
-<?php if ( $iis7_permalinks ) :
-	if ( isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
-		if ( file_exists($home_path . 'web.config') ) : ?>
+<?php if ( ! is_multisite()) { ?>
+<?php if ($iis7_permalinks) :
+	if (isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $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 && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
+	if ($permalink_structure && ! $using_index_permalinks && ! $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; ?>
@@ -265,4 +265,4 @@ 
 
 </div>
 
-<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +36 added lines, -23 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( __( 'Sorry, you are not allowed 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
@@ -71,11 +73,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' ) ) {
@@ -94,17 +97,19 @@ 
 	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;
+			}
 		}
 
 		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
@@ -114,15 +119,17 @@ 
 
 	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 );
 	}
 
@@ -241,23 +248,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 && ! $using_index_permalinks && ! $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; ?>

src/wp-admin/post.php

Spacing +108 added lines, -108 removed lines

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

Braces +77 added lines, -52 removed lines

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

src/wp-admin/admin.php

Spacing +91 added lines, -91 removed lines

@@ -11,40 +11,40 @@ 
  *
  * @since 2.3.2
  */
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
+if ( ! defined('WP_NETWORK_ADMIN'))
 	define('WP_NETWORK_ADMIN', false);
 
-if ( ! defined('WP_USER_ADMIN') )
+if ( ! defined('WP_USER_ADMIN'))
 	define('WP_USER_ADMIN', false);
 
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN) {
 	define('WP_BLOG_ADMIN', true);
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+if (isset($_GET['import']) && ! defined('WP_LOAD_IMPORTERS'))
 	define('WP_LOAD_IMPORTERS', true);
 
-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
 nocache_headers();
 
-if ( get_option('db_upgraded') ) {
+if (get_option('db_upgraded')) {
 	flush_rewrite_rules();
-	update_option( 'db_upgraded',  false );
+	update_option('db_upgraded', false);
 
 	/**
 	 * Fires on the next page load after a successful DB upgrade.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'after_db_upgrade' );
-} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
-	if ( !is_multisite() ) {
-		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
+	do_action('after_db_upgrade');
+} elseif (get_option('db_version') != $wp_db_version && empty($_POST)) {
+	if ( ! is_multisite()) {
+		wp_redirect(admin_url('upgrade.php?_wp_http_referer='.urlencode(wp_unslash($_SERVER['REQUEST_URI']))));
 		exit;
 
 	/**
@@ -61,38 +61,38 @@ 
 	 *
 	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
 	 */
-	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
+	} elseif (apply_filters('do_mu_upgrade', true)) {
 		$c = get_blog_count();
 
 		/*
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
-			require_once( ABSPATH . WPINC . '/http.php' );
-			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+		if ($c <= 50 || ($c > 50 && mt_rand(0, (int) ($c / 50)) == 1)) {
+			require_once(ABSPATH.WPINC.'/http.php');
+			$response = wp_remote_get(admin_url('upgrade.php?step=1'), array('timeout' => 120, 'httpversion' => '1.1'));
 			/** This action is documented in wp-admin/network/upgrade.php */
-			do_action( 'after_mu_upgrade', $response );
+			do_action('after_mu_upgrade', $response);
 			unset($response);
 		}
 		unset($c);
 	}
 }
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 auth_redirect();
 
 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
+if ( ! wp_next_scheduled('wp_scheduled_delete') && ! wp_installing())
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
 
 set_screen_options();
 
-$date_format = __( 'F j, Y' );
-$time_format = __( 'g:i a' );
+$date_format = __('F j, Y');
+$time_format = __('g:i a');
 
-wp_enqueue_script( 'common' );
+wp_enqueue_script('common');
 
 
 
@@ -115,30 +115,30 @@ 
 
 $editing = false;
 
-if ( isset($_GET['page']) ) {
-	$plugin_page = wp_unslash( $_GET['page'] );
+if (isset($_GET['page'])) {
+	$plugin_page = wp_unslash($_GET['page']);
 	$plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if (isset($_REQUEST['post_type']) && post_type_exists($_REQUEST['post_type']))
 	$typenow = $_REQUEST['post_type'];
 else
 	$typenow = '';
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if (isset($_REQUEST['taxonomy']) && taxonomy_exists($_REQUEST['taxonomy']))
 	$taxnow = $_REQUEST['taxonomy'];
 else
 	$taxnow = '';
 
-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
+if (WP_NETWORK_ADMIN)
+	require(ABSPATH.'wp-admin/network/menu.php');
+elseif (WP_USER_ADMIN)
+	require(ABSPATH.'wp-admin/user/menu.php');
 else
-	require(ABSPATH . 'wp-admin/menu.php');
+	require(ABSPATH.'wp-admin/menu.php');
 
-if ( current_user_can( 'manage_options' ) ) {
-	wp_raise_memory_limit( 'admin' );
+if (current_user_can('manage_options')) {
+	wp_raise_memory_limit('admin');
 }
 
 /**
@@ -151,24 +151,24 @@ 
  *
  * @since 2.5.0
  */
-do_action( 'admin_init' );
+do_action('admin_init');
 
-if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
-		$the_parent = $pagenow . '?post_type=' . $typenow;
+if (isset($plugin_page)) {
+	if ( ! empty($typenow))
+		$the_parent = $pagenow.'?post_type='.$typenow;
 	else
 		$the_parent = $pagenow;
-	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
+	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent)) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
 		// Back-compat for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+		if (empty($page_hook) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php')) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
+			if ( ! empty($_SERVER['QUERY_STRING']))
+				$query_string = $_SERVER['QUERY_STRING'];
 			else
-				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+				$query_string = 'page='.$plugin_page;
+			wp_redirect(admin_url('tools.php?'.$query_string));
 			exit;
 		}
 	}
@@ -176,19 +176,19 @@ 
 }
 
 $hook_suffix = '';
-if ( isset( $page_hook ) ) {
+if (isset($page_hook)) {
 	$hook_suffix = $page_hook;
-} elseif ( isset( $plugin_page ) ) {
+} elseif (isset($plugin_page)) {
 	$hook_suffix = $plugin_page;
-} elseif ( isset( $pagenow ) ) {
+} elseif (isset($pagenow)) {
 	$hook_suffix = $pagenow;
 }
 
 set_current_screen();
 
 // Handle plugin admin pages.
-if ( isset($plugin_page) ) {
-	if ( $page_hook ) {
+if (isset($plugin_page)) {
+	if ($page_hook) {
 		/**
 		 * Fires before a particular screen is loaded.
 		 *
@@ -209,9 +209,9 @@ 
 		 *
 		 * @since 2.1.0
 		 */
-		do_action( 'load-' . $page_hook );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		do_action('load-'.$page_hook);
+		if ( ! isset($_GET['noheader']))
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -219,12 +219,12 @@ 
 		 * @ignore
 		 * @since 1.5.0
 		 */
-		do_action( $page_hook );
+		do_action($page_hook);
 	} else {
-		if ( validate_file($plugin_page) )
+		if (validate_file($plugin_page))
 			wp_die(__('Invalid plugin page'));
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
+		if ( ! (file_exists(WP_PLUGIN_DIR."/$plugin_page") && is_file(WP_PLUGIN_DIR."/$plugin_page")) && ! (file_exists(WPMU_PLUGIN_DIR."/$plugin_page") && is_file(WPMU_PLUGIN_DIR."/$plugin_page")))
 			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
 		/**
@@ -239,35 +239,35 @@ 
 		 *
 		 * @since 1.5.0
 		 */
-		do_action( 'load-' . $plugin_page );
+		do_action('load-'.$plugin_page);
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset($_GET['noheader']))
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
+		if (file_exists(WPMU_PLUGIN_DIR."/$plugin_page"))
+			include(WPMU_PLUGIN_DIR."/$plugin_page");
 		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+			include(WP_PLUGIN_DIR."/$plugin_page");
 	}
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	exit();
-} elseif ( isset( $_GET['import'] ) ) {
+} elseif (isset($_GET['import'])) {
 
 	$importer = $_GET['import'];
 
-	if ( ! current_user_can( 'import' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to import content.' ) );
+	if ( ! current_user_can('import')) {
+		wp_die(__('Sorry, you are not allowed to import content.'));
 	}
 
-	if ( validate_file($importer) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+	if (validate_file($importer)) {
+		wp_redirect(admin_url('import.php?invalid='.$importer));
 		exit;
 	}
 
-	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
+		wp_redirect(admin_url('import.php?invalid='.$importer));
 		exit;
 	}
 
@@ -278,16 +278,16 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'load-importer-' . $importer );
+	do_action('load-importer-'.$importer);
 
 	$parent_file = 'tools.php';
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if ( ! isset($_GET['noheader']))
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	define('WP_IMPORTING', true);
 
@@ -301,13 +301,13 @@ 
 	 *
 	 * @param bool $force Whether to force data to be filtered through kses. Default false.
 	 */
-	if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
-		kses_init_filters();  // Always filter imported data with kses on multisite.
+	if (apply_filters('force_filtered_html_on_import', false)) {
+		kses_init_filters(); // Always filter imported data with kses on multisite.
 	}
 
 	call_user_func($wp_importers[$importer][2]);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	// Make sure rules are flushed
 	flush_rewrite_rules(false);
@@ -326,28 +326,28 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'load-' . $pagenow );
+	do_action('load-'.$pagenow);
 
 	/*
 	 * The following hooks are fired to ensure backward compatibility.
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
-	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
-			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
-			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
-	} elseif( 'term.php' === $pagenow ) {
-		do_action( 'load-edit-tags.php' );
+	if ($typenow == 'page') {
+		if ($pagenow == 'post-new.php')
+			do_action('load-page-new.php');
+		elseif ($pagenow == 'post.php')
+			do_action('load-page.php');
+	}  elseif ($pagenow == 'edit-tags.php') {
+		if ($taxnow == 'category')
+			do_action('load-categories.php');
+		elseif ($taxnow == 'link_category')
+			do_action('load-edit-link-categories.php');
+	} elseif ('term.php' === $pagenow) {
+		do_action('load-edit-tags.php');
 	}
 }
 
-if ( ! empty( $_REQUEST['action'] ) ) {
+if ( ! empty($_REQUEST['action'])) {
 	/**
 	 * Fires when an 'action' request variable is sent.
 	 *
@@ -356,5 +356,5 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'admin_action_' . $_REQUEST['action'] );
+	do_action('admin_action_'.$_REQUEST['action']);
 }

Braces +59 added lines, -42 removed lines

@@ -15,18 +15,21 @@ 
 	define( 'WP_ADMIN', true );
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
+if ( ! defined('WP_NETWORK_ADMIN') ) {
 	define('WP_NETWORK_ADMIN', false);
+}
 
-if ( ! defined('WP_USER_ADMIN') )
+if ( ! defined('WP_USER_ADMIN') ) {
 	define('WP_USER_ADMIN', false);
+}
 
 if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
 	define('WP_BLOG_ADMIN', true);
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') ) {
 	define('WP_LOAD_IMPORTERS', true);
+}
 
 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
 
@@ -84,8 +87,9 @@ 
 auth_redirect();
 
 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
+}
 
 set_screen_options();
 
@@ -120,22 +124,25 @@ 
 	$plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 	$typenow = $_REQUEST['post_type'];
-else
+} else {
 	$typenow = '';
+}
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
 	$taxnow = $_REQUEST['taxonomy'];
-else
+} else {
 	$taxnow = '';
+}
 
-if ( WP_NETWORK_ADMIN )
+if ( WP_NETWORK_ADMIN ) {
 	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
+} elseif ( WP_USER_ADMIN ) {
 	require(ABSPATH . 'wp-admin/user/menu.php');
-else
+} else {
 	require(ABSPATH . 'wp-admin/menu.php');
+}
 
 if ( current_user_can( 'manage_options' ) ) {
 	wp_raise_memory_limit( 'admin' );
@@ -154,20 +161,22 @@ 
 do_action( 'admin_init' );
 
 if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
-		$the_parent = $pagenow . '?post_type=' . $typenow;
-	else
-		$the_parent = $pagenow;
+	if ( !empty($typenow) ) {
+			$the_parent = $pagenow . '?post_type=' . $typenow;
+	} else {
+			$the_parent = $pagenow;
+	}
 	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
 		// Back-compat for plugins using add_management_page().
 		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
-				$query_string = 'page=' . $plugin_page;
+			if ( !empty($_SERVER[ 'QUERY_STRING' ]) ) {
+							$query_string = $_SERVER[ 'QUERY_STRING' ];
+			} else {
+							$query_string = 'page=' . $plugin_page;
+			}
 			wp_redirect( admin_url('tools.php?' . $query_string) );
 			exit;
 		}
@@ -210,8 +219,9 @@ 
 		 * @since 2.1.0
 		 */
 		do_action( 'load-' . $page_hook );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if (! isset($_GET['noheader'])) {
+					require_once(ABSPATH . 'wp-admin/admin-header.php');
+		}
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -221,11 +231,13 @@ 
 		 */
 		do_action( $page_hook );
 	} else {
-		if ( validate_file($plugin_page) )
-			wp_die(__('Invalid plugin page'));
+		if ( validate_file($plugin_page) ) {
+					wp_die(__('Invalid plugin page'));
+		}
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) ) {
+					wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		}
 
 		/**
 		 * Fires before a particular screen is loaded.
@@ -241,13 +253,15 @@ 
 		 */
 		do_action( 'load-' . $plugin_page );
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( !isset($_GET['noheader'])) {
+					require_once(ABSPATH . 'wp-admin/admin-header.php');
+		}
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
-		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") ) {
+					include(WPMU_PLUGIN_DIR . "/$plugin_page");
+		} else {
+					include(WP_PLUGIN_DIR . "/$plugin_page");
+		}
 	}
 
 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -284,8 +298,9 @@ 
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if (! isset($_GET['noheader'])) {
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
+	}
 
 	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
@@ -333,15 +348,17 @@ 
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
-			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
-			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
+		if ( $pagenow == 'post-new.php' ) {
+					do_action( 'load-page-new.php' );
+		} elseif ( $pagenow == 'post.php' ) {
+					do_action( 'load-page.php' );
+		}
+	} elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' ) {
+					do_action( 'load-categories.php' );
+		} elseif ( $taxnow == 'link_category' ) {
+					do_action( 'load-edit-link-categories.php' );
+		}
 	} elseif( 'term.php' === $pagenow ) {
 		do_action( 'load-edit-tags.php' );
 	}

src/wp-admin/press-this.php

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>' . __( 'Sorry, you are not allowed to create posts as this user.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, 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();