ntwb / wordpress

src/wp-admin/admin-post.php

Spacing +15 added lines, -15 removed lines

@@ -9,35 +9,35 @@ 
  */
 
 /** We are located in WordPress Administration Screens */
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
+if (defined('ABSPATH'))
+	require_once(ABSPATH.'wp-load.php');
 else
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+	require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
 /** Allow for cross-domain requests (from the frontend). */
 send_origin_headers();
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 nocache_headers();
 
 /** This action is documented in wp-admin/admin.php */
-do_action( 'admin_init' );
+do_action('admin_init');
 
-$action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['action'];
+$action = empty($_REQUEST['action']) ? '' : $_REQUEST['action'];
 
-if ( ! wp_validate_auth_cookie() ) {
-	if ( empty( $action ) ) {
+if ( ! wp_validate_auth_cookie()) {
+	if (empty($action)) {
 		/**
 		 * Fires on a non-authenticated admin post request where no action was supplied.
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( 'admin_post_nopriv' );
+		do_action('admin_post_nopriv');
 	} else {
 		/**
 		 * Fires on a non-authenticated admin post request for the given action.
@@ -47,16 +47,16 @@ 
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( "admin_post_nopriv_{$action}" );
+		do_action("admin_post_nopriv_{$action}");
 	}
 } else {
-	if ( empty( $action ) ) {
+	if (empty($action)) {
 		/**
 		 * Fires on an authenticated admin post request where no action was supplied.
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( 'admin_post' );
+		do_action('admin_post');
 	} else {
 		/**
 		 * Fires on an authenticated admin post request for the given action.
@@ -66,6 +66,6 @@ 
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( "admin_post_{$action}" );
+		do_action("admin_post_{$action}");
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -13,10 +13,11 @@
 	define( 'WP_ADMIN', true );
 }
 
-if ( defined('ABSPATH') )
+if ( defined('ABSPATH') ) {
 	require_once(ABSPATH . 'wp-load.php');
-else
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}
 
 /** Allow for cross-domain requests (from the frontend). */
 send_origin_headers();

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * WordPress Generic Request (POST/GET) Handler
- *
- * Intended for form submission handling in themes and plugins.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Generic Request (POST/GET) Handler
+	 *
+	 * Intended for form submission handling in themes and plugins.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** We are located in WordPress Administration Screens */
 if ( ! defined( 'WP_ADMIN' ) ) {

src/wp-admin/options-reading.php

Indentation +5 added lines, -5 removed lines

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

Braces +12 added lines, -5 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __( 'Reading Settings' );
 $parent_file = 'options-general.php';
@@ -80,8 +81,9 @@ 
 <?php
 settings_fields( 'reading' );
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
+}
 ?>
 
 <?php if ( ! get_pages() ) : ?>
@@ -92,9 +94,11 @@ 
 		update_option( 'show_on_front', 'posts' );
 	endif;
 
-else :
+else {
+	:
 	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
 		update_option( 'show_on_front', 'posts' );
+}
 ?>
 <table class="form-table">
 <tr>
@@ -163,8 +167,11 @@ 
 	 */
 	do_action( 'blog_privacy_selector' );
 	?>
-<?php else : ?>
-	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) ); ?> />
+<?php else {
+	: ?>
+	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) );
+}
+?> />
 	<?php _e( 'Discourage search engines from indexing this site' ); ?></label>
 	<p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
 <?php endif; ?>

Spacing +59 added lines, -59 removed lines

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

src/wp-admin/link.php

Spacing +17 added lines, -17 removed lines

@@ -10,18 +10,18 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
+wp_reset_vars(array('action', 'cat_id', 'link_id'));
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links'))
 	wp_link_manager_disabled_message();
 
-if ( !empty($_POST['deletebookmarks']) )
+if ( ! empty($_POST['deletebookmarks']))
 	$action = 'deletebookmarks';
-if ( !empty($_POST['move']) )
+if ( ! empty($_POST['move']))
 	$action = 'move';
-if ( !empty($_POST['linkcheck']) )
+if ( ! empty($_POST['linkcheck']))
 	$linkcheck = $_POST['linkcheck'];
 
 $this_file = admin_url('link-manager.php');
@@ -40,7 +40,7 @@ 
 		foreach ($linkcheck as $link_id) {
 			$link_id = (int) $link_id;
 
-			if ( wp_delete_link($link_id) )
+			if (wp_delete_link($link_id))
 				$deleted++;
 		}
 
@@ -68,15 +68,15 @@ 
 		check_admin_referer('add-bookmark');
 
 		$redir = wp_get_referer();
-		if ( add_link() )
-			$redir = add_query_arg( 'added', 'true', $redir );
+		if (add_link())
+			$redir = add_query_arg('added', 'true', $redir);
 
-		wp_redirect( $redir );
+		wp_redirect($redir);
 		exit;
 
 	case 'save' :
 		$link_id = (int) $_POST['link_id'];
-		check_admin_referer('update-bookmark_' . $link_id);
+		check_admin_referer('update-bookmark_'.$link_id);
 
 		edit_link($link_id);
 
@@ -85,7 +85,7 @@ 
 
 	case 'delete' :
 		$link_id = (int) $_GET['link_id'];
-		check_admin_referer('delete-bookmark_' . $link_id);
+		check_admin_referer('delete-bookmark_'.$link_id);
 
 		wp_delete_link($link_id);
 
@@ -96,8 +96,8 @@ 
 		wp_enqueue_script('link');
 		wp_enqueue_script('xfn');
 
-		if ( wp_is_mobile() )
-			wp_enqueue_script( 'jquery-touch-punch' );
+		if (wp_is_mobile())
+			wp_enqueue_script('jquery-touch-punch');
 
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
@@ -105,11 +105,11 @@ 
 
 		$link_id = (int) $_GET['link_id'];
 
-		if (!$link = get_link_to_edit($link_id))
+		if ( ! $link = get_link_to_edit($link_id))
 			wp_die(__('Link not found.'));
 
-		include( ABSPATH . 'wp-admin/edit-link-form.php' );
-		include( ABSPATH . 'wp-admin/admin-footer.php' );
+		include(ABSPATH.'wp-admin/edit-link-form.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 		break;
 
 	default :

Braces +20 added lines, -12 removed lines

@@ -14,15 +14,19 @@ 
 
 wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links') ) {
 	wp_link_manager_disabled_message();
+}
 
-if ( !empty($_POST['deletebookmarks']) )
+if ( !empty($_POST['deletebookmarks']) ) {
 	$action = 'deletebookmarks';
-if ( !empty($_POST['move']) )
+}
+if ( !empty($_POST['move']) ) {
 	$action = 'move';
-if ( !empty($_POST['linkcheck']) )
+}
+if ( !empty($_POST['linkcheck']) ) {
 	$linkcheck = $_POST['linkcheck'];
+}
 
 $this_file = admin_url('link-manager.php');
 
@@ -40,8 +44,9 @@ 
 		foreach ($linkcheck as $link_id) {
 			$link_id = (int) $link_id;
 
-			if ( wp_delete_link($link_id) )
-				$deleted++;
+			if ( wp_delete_link($link_id) ) {
+							$deleted++;
+			}
 		}
 
 		wp_redirect("$this_file?deleted=$deleted");
@@ -68,8 +73,9 @@ 
 		check_admin_referer('add-bookmark');
 
 		$redir = wp_get_referer();
-		if ( add_link() )
-			$redir = add_query_arg( 'added', 'true', $redir );
+		if ( add_link() ) {
+					$redir = add_query_arg( 'added', 'true', $redir );
+		}
 
 		wp_redirect( $redir );
 		exit;
@@ -96,8 +102,9 @@ 
 		wp_enqueue_script('link');
 		wp_enqueue_script('xfn');
 
-		if ( wp_is_mobile() )
-			wp_enqueue_script( 'jquery-touch-punch' );
+		if ( wp_is_mobile() ) {
+					wp_enqueue_script( 'jquery-touch-punch' );
+		}
 
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
@@ -105,8 +112,9 @@ 
 
 		$link_id = (int) $_GET['link_id'];
 
-		if (!$link = get_link_to_edit($link_id))
-			wp_die(__('Link not found.'));
+		if (!$link = get_link_to_edit($link_id)) {
+					wp_die(__('Link not found.'));
+		}
 
 		include( ABSPATH . 'wp-admin/edit-link-form.php' );
 		include( ABSPATH . 'wp-admin/admin-footer.php' );

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Manage link administration actions.
- *
- * This page is accessed by the link management pages and handles the forms and
- * AJAX processes for link actions.
- *
- * @package WordPress
- * @subpackage Administration
- */
+		 * Manage link administration actions.
+		 *
+		 * This page is accessed by the link management pages and handles the forms and
+		 * AJAX processes for link actions.
+		 *
+		 * @package WordPress
+		 * @subpackage Administration
+		 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

src/wp-admin/options-discussion.php

Braces +29 added lines, -9 removed lines

@@ -8,8 +8,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
@@ -83,7 +84,10 @@ 
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) {
+	echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' );
+}
+?>
 </label>
 <br />
 
@@ -107,7 +111,9 @@ 
 $thread_comments_depth = '</label><label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
 for ( $i = 2; $i <= $maxdeep; $i++ ) {
 	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+	if ( get_option('thread_comments_depth') == $i ) {
+		$thread_comments_depth .= " selected='selected'";
+	}
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
@@ -121,9 +127,13 @@ 
 <?php
 
 $default_comments_page = '</label><label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
+if ( 'newest' == get_option('default_comments_page') ) {
+	$default_comments_page .= ' selected="selected"';
+}
 $default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
+if ( 'oldest' == get_option('default_comments_page') ) {
+	$default_comments_page .= ' selected="selected"';
+}
 $default_comments_page .= '>' . __('first') . '</option></select>';
 
 printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
@@ -133,9 +143,13 @@ 
 <label for="comment_order"><?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
+if ( 'asc' == get_option('comment_order') ) {
+	$comment_order .= ' selected="selected"';
+}
 $comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
+if ( 'desc' == get_option('comment_order') ) {
+	$comment_order .= ' selected="selected"';
+}
 $comment_order .= '>' . __('newer') . '</option></select>';
 
 printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
@@ -208,7 +222,10 @@ 
 	</label>
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars ) {
+	echo ' hide-if-js';
+}
+?>">
 <th scope="row"><?php _e('Maximum Rating'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
 
@@ -231,7 +248,10 @@ 
 
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars ) {
+	echo ' hide-if-js';
+}
+?>">
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 

Indentation +14 added lines, -14 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Discussion settings administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Discussion settings administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
@@ -229,15 +229,15 @@ 
 	'retro' => __('Retro (Generated)')
 );
 /**
- * Filter the default avatars.
- *
- * Avatars are stored in key/value pairs, where the key is option value,
- * and the name is the displayed avatar name.
- *
- * @since 2.6.0
- *
- * @param array $avatar_defaults Array of default avatars.
- */
+	 * Filter the default avatars.
+	 *
+	 * Avatars are stored in key/value pairs, where the key is option value,
+	 * and the name is the displayed avatar name.
+	 *
+	 * @since 2.6.0
+	 *
+	 * @param array $avatar_defaults Array of default avatars.
+	 */
 $avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
 $default = get_option( 'avatar_default', 'mystery' );
 $size = 32;

Spacing +53 added lines, -53 removed lines

@@ -6,34 +6,34 @@ 
  * @subpackage Administration
  */
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
 $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
 
-add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
+add_action('admin_print_footer_scripts', 'options_discussion_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.').'</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_Discussion_Screen" target="_blank">Documentation on Discussion Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Discussion_Screen" target="_blank">Documentation on Discussion Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
@@ -54,7 +54,7 @@ 
 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
 <?php _e('Allow people to post comments on new articles'); ?></label>
 <br />
-<p class="description"><?php echo '(' . __( 'These settings may be overridden for individual articles.' ) . ')'; ?></p>
+<p class="description"><?php echo '('.__('These settings may be overridden for individual articles.').')'; ?></p>
 </fieldset></td>
 </tr>
 <tr>
@@ -65,13 +65,13 @@ 
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<?php if ( ! get_option('users_can_register') && is_multisite()) echo ' '.__('(Signup has been disabled. Only members of this site can comment.)'); ?>
 </label>
 <br />
 
 <label for="close_comments_for_old_posts">
 <input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
-<?php printf( __('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr(get_option('close_comments_days_old')) . '" class="small-text" />'); ?>
+<?php printf(__('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="'.esc_attr(get_option('close_comments_days_old')).'" class="small-text" />'); ?>
 </label>
 <br />
 <label for="thread_comments">
@@ -84,42 +84,42 @@ 
  *
  * @param int $max_depth The maximum depth of threaded comments. Default 10.
  */
-$maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
+$maxdeep = (int) apply_filters('thread_comments_depth_max', 10);
 
 $thread_comments_depth = '</label><label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
-for ( $i = 2; $i <= $maxdeep; $i++ ) {
-	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+for ($i = 2; $i <= $maxdeep; $i++) {
+	$thread_comments_depth .= "<option value='".esc_attr($i)."'";
+	if (get_option('thread_comments_depth') == $i) $thread_comments_depth .= " selected='selected'";
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
 
-printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth );
+printf(__('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth);
 
 ?></label>
 <br />
 <label for="page_comments">
-<input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
+<input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked('1', get_option('page_comments')); ?> />
 <?php
 $default_comments_page = '</label><label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('first') . '</option></select>';
+if ('newest' == get_option('default_comments_page')) $default_comments_page .= ' selected="selected"';
+$default_comments_page .= '>'.__('last').'</option><option value="oldest"';
+if ('oldest' == get_option('default_comments_page')) $default_comments_page .= ' selected="selected"';
+$default_comments_page .= '>'.__('first').'</option></select>';
 
-printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
+printf(__('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="'.esc_attr(get_option('comments_per_page')).'" class="small-text" />', $default_comments_page);
 
 ?></label>
 <br />
 <label for="comment_order"><?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('newer') . '</option></select>';
+if ('asc' == get_option('comment_order')) $comment_order .= ' selected="selected"';
+$comment_order .= '>'.__('older').'</option><option value="desc"';
+if ('desc' == get_option('comment_order')) $comment_order .= ' selected="selected"';
+$comment_order .= '>'.__('newer').'</option></select>';
 
-printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
+printf(__('Comments should be displayed with the %s comments at the top of each page'), $comment_order);
 
 ?></label>
 </fieldset></td>
@@ -149,11 +149,11 @@ 
 <tr>
 <th scope="row"><?php _e('Comment Moderation'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
-<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
+<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="'.esc_attr(get_option('comment_max_links')).'" class="small-text" />'); ?></label></p>
 
 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
-<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
+<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea(get_option('moderation_keys')); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
@@ -162,7 +162,7 @@ 
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
 <p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be put in the trash. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
-<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
+<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea(get_option('blacklist_keys')); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
@@ -176,7 +176,7 @@ 
 <?php
 // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
 
-$show_avatars = get_option( 'show_avatars' );
+$show_avatars = get_option('show_avatars');
 ?>
 
 <table class="form-table">
@@ -184,12 +184,12 @@ 
 <th scope="row"><?php _e('Avatar Display'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
 	<label for="show_avatars">
-		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( $show_avatars, 1 ); ?> />
-		<?php _e( 'Show Avatars' ); ?>
+		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked($show_avatars, 1); ?> />
+		<?php _e('Show Avatars'); ?>
 	</label>
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Maximum Rating'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
 
@@ -206,13 +206,13 @@ 
 );
 foreach ($ratings as $key => $rating) :
 	$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
-	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr($key) . "' $selected/> $rating</label><br />";
+	echo "\n\t<label><input type='radio' name='avatar_rating' value='".esc_attr($key)."' $selected/> $rating</label><br />";
 endforeach;
 ?>
 
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 
@@ -238,28 +238,28 @@ 
  *
  * @param array $avatar_defaults Array of default avatars.
  */
-$avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
-$default = get_option( 'avatar_default', 'mystery' );
+$avatar_defaults = apply_filters('avatar_defaults', $avatar_defaults);
+$default = get_option('avatar_default', 'mystery');
 $size = 32;
 $avatar_list = '';
 
 // Force avatars on to display these choices
-add_filter( 'pre_option_show_avatars', '__return_true', 100 );
+add_filter('pre_option_show_avatars', '__return_true', 100);
 
-foreach ( $avatar_defaults as $default_key => $default_name ) {
+foreach ($avatar_defaults as $default_key => $default_name) {
 	$selected = ($default == $default_key) ? 'checked="checked" ' : '';
-	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
+	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='".esc_attr($default_key)."' {$selected}/> ";
 
-	$avatar = get_avatar( $user_email, $size, $default_key );
-	$avatar = preg_replace( "/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar );
-	$avatar = preg_replace( "/srcset='(.+?) 2x'/", "srcset='\$1&amp;forcedefault=1 2x'", $avatar );
+	$avatar = get_avatar($user_email, $size, $default_key);
+	$avatar = preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar);
+	$avatar = preg_replace("/srcset='(.+?) 2x'/", "srcset='\$1&amp;forcedefault=1 2x'", $avatar);
 	$avatar_list .= $avatar;
 
-	$avatar_list .= ' ' . $default_name . '</label>';
+	$avatar_list .= ' '.$default_name.'</label>';
 	$avatar_list .= '<br />';
 }
 
-remove_filter( 'pre_option_show_avatars', '__return_true', 100 );
+remove_filter('pre_option_show_avatars', '__return_true', 100);
 
 /**
  * Filter the HTML output of the default avatar list.
@@ -268,7 +268,7 @@ 
  *
  * @param string $avatar_list HTML markup of the avatar list.
  */
-echo apply_filters( 'default_avatar_select', $avatar_list );
+echo apply_filters('default_avatar_select', $avatar_list);
 ?>
 
 </fieldset></td>
@@ -282,4 +282,4 @@ 
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/options-head.php

Spacing +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
  * @subpackage Administration
  */
 
-wp_reset_vars( array( 'action' ) );
+wp_reset_vars(array('action'));
 
-if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
+if (isset($_GET['updated']) && isset($_GET['page'])) {
 	// For backwards compat with plugins that don't use the Settings API and just set updated=1 in the redirect
 	add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 }

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * WordPress Options Header.
- *
- * Displays updated message, if updated variable is part of the URL query.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Options Header.
+	 *
+	 * Displays updated message, if updated variable is part of the URL query.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 wp_reset_vars( array( 'action' ) );
 

src/wp-admin/moderation.php

Spacing +2 added lines, -2 removed lines

@@ -7,6 +7,6 @@
  * @package WordPress
  * @subpackage Administration
  */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
-wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
+wp_redirect(admin_url('edit-comments.php?comment_status=moderated'));
 exit;

src/wp-admin/options-general.php

Indentation +16 added lines, -16 removed lines

@@ -224,7 +224,7 @@ 
 		$right_now = time();
 		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
 			if ( $tr['ts'] > $right_now ) {
-			    $found = true;
+				$found = true;
 				break;
 			}
 		}
@@ -254,13 +254,13 @@ 
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
 <?php
 	/**
-	* Filter the default date formats.
-	*
-	* @since 2.7.0
-	* @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
-	*
-	* @param array $default_date_formats Array of default date formats.
-	*/
+	 * Filter the default date formats.
+	 *
+	 * @since 2.7.0
+	 * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
+	 *
+	 * @param array $default_date_formats Array of default date formats.
+	 */
 	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
 
 	$custom = true;
@@ -288,12 +288,12 @@ 
 	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
 <?php
 	/**
-	* Filter the default time formats.
-	*
-	* @since 2.7.0
-	*
-	* @param array $default_time_formats Array of default time formats.
-	*/
+	 * Filter the default time formats.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param array $default_time_formats Array of default time formats.
+	 */
 	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
 
 	$custom = true;
@@ -322,8 +322,8 @@ 
 <td><select name="start_of_week" id="start_of_week">
 <?php
 /**
- * @global WP_Locale $wp_locale
- */
+	 * @global WP_Locale $wp_locale
+	 */
 global $wp_locale;
 
 for ($day_index = 0; $day_index <= 6; $day_index++) :

Spacing +96 added lines, -97 removed lines

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

Braces +26 added lines, -16 removed lines

@@ -12,8 +12,9 @@ 
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __('General Settings');
 $parent_file = 'options-general.php';
@@ -68,13 +69,19 @@ 
 <?php if ( !is_multisite() ) { ?>
 <tr>
 <th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) {
+	echo ' disabled' ?>" /></td>
 </tr>
 <tr>
 <th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' );
+}
+?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) {
+	echo ' disabled' ?>" />
 <?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
+<p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' );
+}
+?></p></td>
 <?php endif; ?>
 </tr>
 <tr>
@@ -129,18 +136,20 @@ 
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
+if ( false !== strpos($tzstring,'Etc/GMT') ) {
 	$tzstring = '';
+}
 
 if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 	$check_zone_info = false;
-	if ( 0 == $current_offset )
-		$tzstring = 'UTC+0';
-	elseif ($current_offset < 0)
-		$tzstring = 'UTC' . $current_offset;
-	else
-		$tzstring = 'UTC+' . $current_offset;
-}
+	if ( 0 == $current_offset ) {
+			$tzstring = 'UTC+0';
+	} elseif ($current_offset < 0) {
+			$tzstring = 'UTC' . $current_offset;
+	} else {
+			$tzstring = 'UTC+' . $current_offset;
+	}
+	}
 
 ?>
 <th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
@@ -177,10 +186,11 @@ 
 	// Set TZ so localtime works.
 	date_default_timezone_set($tzstring);
 	$now = localtime(time(), true);
-	if ( $now['tm_isdst'] )
-		_e('This timezone is currently in daylight saving time.');
-	else
-		_e('This timezone is currently in standard time.');
+	if ( $now['tm_isdst'] ) {
+			_e('This timezone is currently in daylight saving time.');
+	} else {
+			_e('This timezone is currently in standard time.');
+	}
 	?>
 	<br />
 	<?php

src/wp-admin/maint/repair.php

Braces +9 added lines, -7 removed lines

@@ -130,18 +130,20 @@
 	if ( $problems ) {
 		printf( '<p>' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.') . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
 		$problem_output = '';
-		foreach ( $problems as $table => $problem )
-			$problem_output .= "$table: $problem\n";
+		foreach ( $problems as $table => $problem ) {
+					$problem_output .= "$table: $problem\n";
+		}
 		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
 	} else {
 		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 	}
 } else {
-	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
-		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
-	else
-		echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
-?>
+	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) {
+			echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
+	} else {
+			echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
+	}
+	?>
 	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
 	<p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
 	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>

Spacing +52 added lines, -52 removed lines

@@ -7,9 +7,9 @@ 
  */
 define('WP_REPAIRING', true);
 
-require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' );
+require_once(dirname(dirname(dirname(__FILE__))).'/wp-load.php');
 
-header( 'Content-Type: text/html; charset=utf-8' );
+header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
@@ -17,30 +17,30 @@ 
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
-	<title><?php _e( 'WordPress &rsaquo; Database Repair' ); ?></title>
+	<title><?php _e('WordPress &rsaquo; Database Repair'); ?></title>
 	<?php
-	wp_admin_css( 'install', true );
+	wp_admin_css('install', true);
 	?>
 </head>
 <body class="wp-core-ui">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><a href="<?php echo esc_url(__('https://wordpress.org/')); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></p>
 
 <?php
 
-if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
+if ( ! defined('WP_ALLOW_REPAIR')) {
 
-	echo '<h1 class="screen-reader-text">' . __( 'Allow automatic database repair' ) . '</h1>';
+	echo '<h1 class="screen-reader-text">'.__('Allow automatic database repair').'</h1>';
 
-	echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
+	echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.')."</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 
 	$default_key     = 'put your unique phrase here';
 	$missing_key     = false;
 	$duplicated_keys = array();
 
-	foreach ( array( 'AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT' ) as $key ) {
-		if ( defined( $key ) ) {
+	foreach (array('AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT') as $key) {
+		if (defined($key)) {
 			// Check for unique values of each key.
-			$duplicated_keys[ constant( $key ) ] = isset( $duplicated_keys[ constant( $key ) ] );
+			$duplicated_keys[constant($key)] = isset($duplicated_keys[constant($key)]);
 		} else {
 			// If a constant is not defined, it's missing.
 			$missing_key = true;
@@ -48,24 +48,24 @@ 
 	}
 
 	// If at least one key uses the default value, consider it duplicated.
-	if ( isset( $duplicated_keys[ $default_key ] ) ) {
-		$duplicated_keys[ $default_key ] = true;
+	if (isset($duplicated_keys[$default_key])) {
+		$duplicated_keys[$default_key] = true;
 	}
 
 	// Weed out all unique, non-default values.
-	$duplicated_keys = array_filter( $duplicated_keys );
+	$duplicated_keys = array_filter($duplicated_keys);
 
-	if ( $duplicated_keys || $missing_key ) {
+	if ($duplicated_keys || $missing_key) {
 
-		echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
+		echo '<h2 class="screen-reader-text">'.__('Check secret keys').'</h2>';
 
 		// Translators: 1: wp-config.php; 2: Secret key service URL.
-		echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
+		echo '<p>'.sprintf(__('While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.'), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/').'</p>';
 	}
 
-} elseif ( isset( $_GET['repair'] ) ) {
+} elseif (isset($_GET['repair'])) {
 
-	echo '<h1 class="screen-reader-text">' . __( 'Database repair results' ) . '</h1>';
+	echo '<h1 class="screen-reader-text">'.__('Database repair results').'</h1>';
 
 	$optimize = 2 == $_GET['repair'];
 	$okay = true;
@@ -74,9 +74,9 @@ 
 	$tables = $wpdb->tables();
 
 	// Sitecategories may not exist if global terms are disabled.
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->sitecategories ) );
-	if ( is_multisite() && ! $wpdb->get_var( $query ) ) {
-		unset( $tables['sitecategories'] );
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->sitecategories));
+	if (is_multisite() && ! $wpdb->get_var($query)) {
+		unset($tables['sitecategories']);
 	}
 
 	/**
@@ -86,78 +86,78 @@ 
 	 *
 	 * @param array $tables Array of prefixed table names to be repaired.
 	 */
-	$tables = array_merge( $tables, (array) apply_filters( 'tables_to_repair', array() ) );
+	$tables = array_merge($tables, (array) apply_filters('tables_to_repair', array()));
 
 	// Loop over the tables, checking and repairing as needed.
-	foreach ( $tables as $table ) {
-		$check = $wpdb->get_row( "CHECK TABLE $table" );
+	foreach ($tables as $table) {
+		$check = $wpdb->get_row("CHECK TABLE $table");
 
 		echo '<p>';
-		if ( 'OK' == $check->Msg_text ) {
+		if ('OK' == $check->Msg_text) {
 			/* translators: %s: table name */
-			printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
+			printf(__('The %s table is okay.'), "<code>$table</code>");
 		} else {
 			/* translators: 1: table name, 2: error message, */
-			printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , "<code>$table</code>", "<code>$check->Msg_text</code>" );
+			printf(__('The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;'), "<code>$table</code>", "<code>$check->Msg_text</code>");
 
-			$repair = $wpdb->get_row( "REPAIR TABLE $table" );
+			$repair = $wpdb->get_row("REPAIR TABLE $table");
 
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-			if ( 'OK' == $check->Msg_text ) {
+			if ('OK' == $check->Msg_text) {
 				/* translators: %s: table name */
-				printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
+				printf(__('Successfully repaired the %s table.'), "<code>$table</code>");
 			} else {
 				/* translators: 1: table name, 2: error message, */
-				echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
+				echo sprintf(__('Failed to repair the %1$s table. Error: %2$s'), "<code>$table</code>", "<code>$check->Msg_text</code>").'<br />';
 				$problems[$table] = $check->Msg_text;
 				$okay = false;
 			}
 		}
 
-		if ( $okay && $optimize ) {
-			$check = $wpdb->get_row( "ANALYZE TABLE $table" );
+		if ($okay && $optimize) {
+			$check = $wpdb->get_row("ANALYZE TABLE $table");
 
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-			if ( 'Table is already up to date' == $check->Msg_text )  {
+			if ('Table is already up to date' == $check->Msg_text) {
 				/* translators: %s: table name */
-				printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
+				printf(__('The %s table is already optimized.'), "<code>$table</code>");
 			} else {
-				$check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
+				$check = $wpdb->get_row("OPTIMIZE TABLE $table");
 
 				echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-				if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
+				if ('OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text) {
 					/* translators: %s: table name */
-					printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
+					printf(__('Successfully optimized the %s table.'), "<code>$table</code>");
 				} else {
 					/* translators: 1: table name, 2: error message, */
-					printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
+					printf(__('Failed to optimize the %1$s table. Error: %2$s'), "<code>$table</code>", "<code>$check->Msg_text</code>");
 				}
 			}
 		}
 		echo '</p>';
 	}
 
-	if ( $problems ) {
-		printf( '<p>' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.') . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
+	if ($problems) {
+		printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', __('https://wordpress.org/support/forum/how-to-and-troubleshooting'));
 		$problem_output = '';
-		foreach ( $problems as $table => $problem )
+		foreach ($problems as $table => $problem)
 			$problem_output .= "$table: $problem\n";
-		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
+		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">'.esc_textarea($problem_output).'</textarea></p>';
 	} else {
-		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
+		echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 	}
 } else {
 
-	echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
+	echo '<h1 class="screen-reader-text">'.__('WordPress database repair').'</h1>';
 
-	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
-		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
+	if (isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'])
+		echo '<p>'.__('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.').'</p>';
 	else
-		echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
+		echo '<p>'.__('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.').'</p>';
 ?>
-	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e( 'Repair Database' ); ?></a></p>
-	<p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
-	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
+	<p class="step"><a class="button button-large" href="repair.php?repair=1"><?php _e('Repair Database'); ?></a></p>
+	<p><?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?></p>
+	<p class="step"><a class="button button-large" href="repair.php?repair=2"><?php _e('Repair and Optimize Database'); ?></a></p>
 <?php
 }
 ?>

src/wp-admin/comment.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';
+	}
+	}
 
 /**
  * Display error message at bottom of comments.
@@ -68,14 +71,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( __('You are not allowed to edit this comment.') );
+	if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __('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( __('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( __('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 );
 

Spacing +106 added lines, -106 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( __('You are not allowed to edit this comment.') );
+	if ( ! current_user_can('edit_comment', $comment_id))
+		comment_footer_die(__('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 http://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;
 		}
@@ -213,7 +213,7 @@ 
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td>
 	<?php echo $comment->comment_content; ?>
-	<p><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
+	<p><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( __('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(__('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;
 
 	/**
 	 * Filter 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');