ntwb / wordpress

tools/i18n/t/data/not-gettexted-0-result.php

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+if ( ! isset($wp_did_header)):
+if ( ! file_exists(dirname(__FILE__).'/wp-config.php')) {
 	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 	else $path = 'wp-admin/';
 
-	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-	require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-	require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-	wp_die( sprintf(/*WP_I18N_CONFIG*/'Translation: There doesn\'t seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href=\'http://codex.wordpress.org/Editing_wp-config.php\'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn\'t work for all server setups. The safest way is to manually create the file.</p><p><a href=\'%s\' class=\'button\'>Create a Configuration File</a>' /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ 'Translation: WordPress &rsaquo; Error' /*/WP_I18N_ERROR*/);
+	require_once(dirname(__FILE__).'/wp-includes/classes.php');
+	require_once(dirname(__FILE__).'/wp-includes/functions.php');
+	require_once(dirname(__FILE__).'/wp-includes/plugin.php');
+	wp_die(sprintf(/*WP_I18N_CONFIG*/'Translation: There doesn\'t seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href=\'http://codex.wordpress.org/Editing_wp-config.php\'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn\'t work for all server setups. The safest way is to manually create the file.</p><p><a href=\'%s\' class=\'button\'>Create a Configuration File</a>' /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ 'Translation: WordPress &rsaquo; Error' /*/WP_I18N_ERROR*/);
 }
 
 $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+require_once(dirname(__FILE__).'/wp-config.php');
 
 wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+require_once(ABSPATH.WPINC.'/template-loader.php');
 
 endif;
 

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-	else $path = 'wp-admin/';
+	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) {
+		$path = '';
+	} else {
+		$path = 'wp-admin/';
+	}
 
 	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
 	require_once( dirname(__FILE__) . '/wp-includes/functions.php');

tools/i18n/t/data/not-gettexted-0.php

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+if ( ! isset($wp_did_header)):
+if ( ! file_exists(dirname(__FILE__).'/wp-config.php')) {
 	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 	else $path = 'wp-admin/';
 
-	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-	require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-	require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-	wp_die( sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
+	require_once(dirname(__FILE__).'/wp-includes/classes.php');
+	require_once(dirname(__FILE__).'/wp-includes/functions.php');
+	require_once(dirname(__FILE__).'/wp-includes/plugin.php');
+	wp_die(sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
 }
 
 $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+require_once(dirname(__FILE__).'/wp-config.php');
 
 wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+require_once(ABSPATH.WPINC.'/template-loader.php');
 
 endif;
 

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-	else $path = 'wp-admin/';
+	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) {
+		$path = '';
+	} else {
+		$path = 'wp-admin/';
+	}
 
 	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
 	require_once( dirname(__FILE__) . '/wp-includes/functions.php');

tools/i18n/t/NotGettextedTest.php

Spacing +14 added lines, -14 removed lines

@@ -5,8 +5,8 @@ 
  * @package wordpress-i18n
  * @subpackage tools
  */
-error_reporting( E_ALL );
-require_once dirname( dirname( __FILE__ ) ) . '/not-gettexted.php';
+error_reporting(E_ALL);
+require_once dirname(dirname(__FILE__)).'/not-gettexted.php';
 
 class NotGettextedTest extends PHPUnit_Framework_TestCase {
 
@@ -16,10 +16,10 @@ 
 
 	function test_make_string_aggregator() {
 		global $baba;
-		$f = $this->ng->make_string_aggregator( 'baba', 'baba.php' );
-		call_user_func( $f, 'x', 'y', 'z' );
-		call_user_func( $f, 'a', 'b', 'c' );
-		$this->assertEquals( array( array( 'x', 'y', 'baba.php', 'z'), array( 'a', 'b', 'baba.php', 'c' ) ), $baba );
+		$f = $this->ng->make_string_aggregator('baba', 'baba.php');
+		call_user_func($f, 'x', 'y', 'z');
+		call_user_func($f, 'a', 'b', 'c');
+		$this->assertEquals(array(array('x', 'y', 'baba.php', 'z'), array('a', 'b', 'baba.php', 'c')), $baba);
 	}
 
 	function test_walk() {
@@ -30,17 +30,17 @@ 
 	if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); }
 ?>';
 		$tokens = token_get_all($code);
-		$this->assertEquals( '', $this->ng->walk_tokens( $tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
+		$this->assertEquals('', $this->ng->walk_tokens($tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals('"yes"\'We died %d times!\'', $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
 	}
 
 	function test_replace() {
 		# copy to a new file, so that we don't corrupt the old one
-		copy( 'data/not-gettexted-0.php', 'data/not-gettexted-0-work.php' );
-		$this->ng->command_replace( 'data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php' );
-		$this->assertEquals( file_get_contents( 'data/not-gettexted-0-result.php' ), file_get_contents( 'data/not-gettexted-0-work.php' ) );
-		unlink( 'data/not-gettexted-0-work.php' );
+		copy('data/not-gettexted-0.php', 'data/not-gettexted-0-work.php');
+		$this->ng->command_replace('data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php');
+		$this->assertEquals(file_get_contents('data/not-gettexted-0-result.php'), file_get_contents('data/not-gettexted-0-work.php'));
+		unlink('data/not-gettexted-0-work.php');
 	}
 }

src/wp-login.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * WordPress User Page
- *
- * Handles authentication, registering, resetting passwords, forgot password,
- * and other user handling.
- *
- * @package WordPress
- */
+	 * WordPress User Page
+	 *
+	 * Handles authentication, registering, resetting passwords, forgot password,
+	 * and other user handling.
+	 *
+	 * @package WordPress
+	 */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require( dirname(__FILE__) . '/wp-load.php' );

Switch Indentation +305 added lines, -305 removed lines

@@ -426,16 +426,16 @@ 
 
 switch ($action) {
 
-case 'postpass' :
-	if ( ! array_key_exists( 'post_password', $_POST ) ) {
-		wp_safe_redirect( wp_get_referer() );
-		exit();
-	}
+	case 'postpass' :
+		if ( ! array_key_exists( 'post_password', $_POST ) ) {
+			wp_safe_redirect( wp_get_referer() );
+			exit();
+		}
 
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
+		require_once ABSPATH . WPINC . '/class-phpass.php';
+		$hasher = new PasswordHash( 8, true );
 
-	/**
+		/**
 	 * Filter the life span of the post password cookie.
 	 *
 	 * By default, the cookie expires 10 days from creation. To turn this
@@ -445,33 +445,33 @@ 
 	 *
 	 * @param int $expires The expiry time, as passed to setcookie().
 	 */
-	$expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
-	$referer = wp_get_referer();
-	if ( $referer ) {
-		$secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) );
-	} else {
-		$secure = false;
-	}
-	setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
+		$expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
+		$referer = wp_get_referer();
+		if ( $referer ) {
+			$secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) );
+		} else {
+			$secure = false;
+		}
+		setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
 
-	wp_safe_redirect( wp_get_referer() );
-	exit();
+		wp_safe_redirect( wp_get_referer() );
+		exit();
 
-case 'logout' :
-	check_admin_referer('log-out');
+	case 'logout' :
+		check_admin_referer('log-out');
 
-	$user = wp_get_current_user();
+		$user = wp_get_current_user();
 
-	wp_logout();
+		wp_logout();
 
-	if ( ! empty( $_REQUEST['redirect_to'] ) ) {
-		$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
-	} else {
-		$redirect_to = 'wp-login.php?loggedout=true';
-		$requested_redirect_to = '';
-	}
+		if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+			$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
+		} else {
+			$redirect_to = 'wp-login.php?loggedout=true';
+			$requested_redirect_to = '';
+		}
 
-	/**
+		/**
 	 * Filter the log out redirect URL.
 	 *
 	 * @since 4.2.0
@@ -480,52 +480,52 @@ 
 	 * @param string  $requested_redirect_to The requested redirect destination URL passed as a parameter.
 	 * @param WP_User $user                  The WP_User object for the user that's logging out.
 	 */
-	$redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
-	wp_safe_redirect( $redirect_to );
-	exit();
-
-case 'lostpassword' :
-case 'retrievepassword' :
-
-	if ( $http_post ) {
-		$errors = retrieve_password();
-		if ( !is_wp_error($errors) ) {
-			$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
-			wp_safe_redirect( $redirect_to );
-			exit();
+		$redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
+		wp_safe_redirect( $redirect_to );
+		exit();
+
+	case 'lostpassword' :
+	case 'retrievepassword' :
+
+		if ( $http_post ) {
+			$errors = retrieve_password();
+			if ( !is_wp_error($errors) ) {
+				$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
+				wp_safe_redirect( $redirect_to );
+				exit();
+			}
 		}
-	}
 
-	if ( isset( $_GET['error'] ) ) {
-		if ( 'invalidkey' == $_GET['error'] ) {
-			$errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) );
-		} elseif ( 'expiredkey' == $_GET['error'] ) {
-			$errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) );
+		if ( isset( $_GET['error'] ) ) {
+			if ( 'invalidkey' == $_GET['error'] ) {
+				$errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) );
+			} elseif ( 'expiredkey' == $_GET['error'] ) {
+				$errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) );
+			}
 		}
-	}
 
-	$lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-	/**
+		$lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+		/**
 	 * Filter the URL redirected to after submitting the lostpassword/retrievepassword form.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @param string $lostpassword_redirect The redirect destination URL.
 	 */
-	$redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
+		$redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
 
-	/**
+		/**
 	 * Fires before the lost password form.
 	 *
 	 * @since 1.5.1
 	 */
-	do_action( 'lost_password' );
+		do_action( 'lost_password' );
 
-	login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);
+		login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);
 
-	$user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
+		$user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
 
-?>
+	?>
 
 <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
 	<p>
@@ -533,68 +533,68 @@ 
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
 	</p>
 	<?php
-	/**
+		/**
 	 * Fires inside the lostpassword form tags, before the hidden fields.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'lostpassword_form' ); ?>
-	<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+		do_action( 'lostpassword_form' ); ?>
+		<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Get New Password'); ?>" /></p>
 </form>
 
 <p id="nav">
 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e('Log in') ?></a>
-<?php
-if ( get_option( 'users_can_register' ) ) :
-	$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+	<?php
+	if ( get_option( 'users_can_register' ) ) :
+		$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
 
-	/** This filter is documented in wp-includes/general-template.php */
-	echo ' | ' . apply_filters( 'register', $registration_url );
-endif;
-?>
-</p>
+		/** This filter is documented in wp-includes/general-template.php */
+		echo ' | ' . apply_filters( 'register', $registration_url );
+	endif;
+	?>
+	</p>
 
-<?php
-login_footer('user_login');
-break;
-
-case 'resetpass' :
-case 'rp' :
-	list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-	$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
-	if ( isset( $_GET['key'] ) ) {
-		$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
-		setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
-		exit;
-	}
+	<?php
+	login_footer('user_login');
+	break;
+
+	case 'resetpass' :
+	case 'rp' :
+		list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
+		if ( isset( $_GET['key'] ) ) {
+			$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
+			setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+			wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
+			exit;
+		}
 
-	if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
-		list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
-		$user = check_password_reset_key( $rp_key, $rp_login );
-		if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) {
+		if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
+			list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
+			$user = check_password_reset_key( $rp_key, $rp_login );
+			if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) {
+				$user = false;
+			}
+		} else {
 			$user = false;
 		}
-	} else {
-		$user = false;
-	}
 
-	if ( ! $user || is_wp_error( $user ) ) {
-		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		if ( $user && $user->get_error_code() === 'expired_key' )
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
-		else
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
-		exit;
-	}
+		if ( ! $user || is_wp_error( $user ) ) {
+			setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+			if ( $user && $user->get_error_code() === 'expired_key' )
+				wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+			else
+				wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+			exit;
+		}
 
-	$errors = new WP_Error();
+		$errors = new WP_Error();
 
-	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
-		$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+		if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
+			$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
 
-	/**
+		/**
 	 * Fires before the password reset procedure is validated.
 	 *
 	 * @since 3.5.0
@@ -602,23 +602,23 @@ 
 	 * @param object           $errors WP Error object.
 	 * @param WP_User|WP_Error $user   WP_User object if the login and reset key match. WP_Error object otherwise.
 	 */
-	do_action( 'validate_password_reset', $errors, $user );
-
-	if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
-		reset_password($user, $_POST['pass1']);
-		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
-		login_footer();
-		exit;
-	}
+		do_action( 'validate_password_reset', $errors, $user );
+
+		if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
+			reset_password($user, $_POST['pass1']);
+			setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+			login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+			login_footer();
+			exit;
+		}
 
-	wp_enqueue_script('utils');
-	wp_enqueue_script('user-profile');
+		wp_enqueue_script('utils');
+		wp_enqueue_script('user-profile');
 
-	login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );
+		login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );
 
-?>
-<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
+	?>
+	<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
 	<input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
 
 	<div class="user-pass1-wrap">
@@ -643,78 +643,78 @@ 
 	<br class="clear" />
 
 	<?php
-	/**
+		/**
 	 * Fires following the 'Strength indicator' meter in the user password reset form.
 	 *
 	 * @since 3.9.0
 	 *
 	 * @param WP_User $user User object of the user whose password is being reset.
 	 */
-	do_action( 'resetpass_form', $user );
-	?>
-	<input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
+		do_action( 'resetpass_form', $user );
+		?>
+		<input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Reset Password'); ?>" /></p>
 </form>
 
 <p id="nav">
 <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-<?php
-if ( get_option( 'users_can_register' ) ) :
-	$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+	<?php
+	if ( get_option( 'users_can_register' ) ) :
+		$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
 
-	/** This filter is documented in wp-includes/general-template.php */
-	echo ' | ' . apply_filters( 'register', $registration_url );
-endif;
-?>
-</p>
+		/** This filter is documented in wp-includes/general-template.php */
+		echo ' | ' . apply_filters( 'register', $registration_url );
+	endif;
+	?>
+	</p>
 
-<?php
-login_footer('user_pass');
-break;
+	<?php
+	login_footer('user_pass');
+	break;
 
-case 'register' :
-	if ( is_multisite() ) {
-		/**
+	case 'register' :
+		if ( is_multisite() ) {
+			/**
 		 * Filter the Multisite sign up URL.
 		 *
 		 * @since 3.0.0
 		 *
 		 * @param string $sign_up_url The sign up URL.
 		 */
-		wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
-		exit;
-	}
-
-	if ( !get_option('users_can_register') ) {
-		wp_redirect( site_url('wp-login.php?registration=disabled') );
-		exit();
-	}
+			wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
+			exit;
+		}
 
-	$user_login = '';
-	$user_email = '';
-	if ( $http_post ) {
-		$user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : '';
-		$user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : '';
-		$errors = register_new_user($user_login, $user_email);
-		if ( !is_wp_error($errors) ) {
-			$redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
-			wp_safe_redirect( $redirect_to );
+		if ( !get_option('users_can_register') ) {
+			wp_redirect( site_url('wp-login.php?registration=disabled') );
 			exit();
 		}
-	}
 
-	$registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-	/**
+		$user_login = '';
+		$user_email = '';
+		if ( $http_post ) {
+			$user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : '';
+			$user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : '';
+			$errors = register_new_user($user_login, $user_email);
+			if ( !is_wp_error($errors) ) {
+				$redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
+				wp_safe_redirect( $redirect_to );
+				exit();
+			}
+		}
+
+		$registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+		/**
 	 * Filter the registration redirect URL.
 	 *
 	 * @since 3.0.0
 	 *
 	 * @param string $registration_redirect The redirect destination URL.
 	 */
-	$redirect_to = apply_filters( 'registration_redirect', $registration_redirect );
-	login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
-?>
-<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
+		$redirect_to = apply_filters( 'registration_redirect', $registration_redirect );
+		login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
+	?>
+	<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
 	<p>
 		<label for="user_login"><?php _e('Username') ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
@@ -724,14 +724,14 @@ 
 		<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
 	</p>
 	<?php
-	/**
+		/**
 	 * Fires following the 'Email' field in the user registration form.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'register_form' );
-	?>
-	<p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
+		do_action( 'register_form' );
+		?>
+		<p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
 	<br class="clear" />
 	<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
@@ -743,59 +743,59 @@ 
 </p>
 
 <?php
-login_footer('user_login');
-break;
-
-case 'login' :
-default:
-	$secure_cookie = '';
-	$customize_login = isset( $_REQUEST['customize-login'] );
-	if ( $customize_login )
-		wp_enqueue_script( 'customize-base' );
-
-	// If the user wants ssl but the session is not ssl, force a secure cookie.
-	if ( !empty($_POST['log']) && !force_ssl_admin() ) {
-		$user_name = sanitize_user($_POST['log']);
-		$user = get_user_by( 'login', $user_name );
-
-		if ( ! $user && strpos( $user_name, '@' ) ) {
-			$user = get_user_by( 'email', $user_name );
-		}
+	login_footer('user_login');
+	break;
+
+	case 'login' :
+	default:
+		$secure_cookie = '';
+		$customize_login = isset( $_REQUEST['customize-login'] );
+		if ( $customize_login )
+			wp_enqueue_script( 'customize-base' );
+
+		// If the user wants ssl but the session is not ssl, force a secure cookie.
+		if ( !empty($_POST['log']) && !force_ssl_admin() ) {
+			$user_name = sanitize_user($_POST['log']);
+			$user = get_user_by( 'login', $user_name );
+
+			if ( ! $user && strpos( $user_name, '@' ) ) {
+				$user = get_user_by( 'email', $user_name );
+			}
 
-		if ( $user ) {
-			if ( get_user_option('use_ssl', $user->ID) ) {
-				$secure_cookie = true;
-				force_ssl_admin(true);
+			if ( $user ) {
+				if ( get_user_option('use_ssl', $user->ID) ) {
+					$secure_cookie = true;
+					force_ssl_admin(true);
+				}
 			}
 		}
-	}
 
-	if ( isset( $_REQUEST['redirect_to'] ) ) {
-		$redirect_to = $_REQUEST['redirect_to'];
-		// Redirect to https if user wants ssl
-		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
-			$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
-	} else {
-		$redirect_to = admin_url();
-	}
+		if ( isset( $_REQUEST['redirect_to'] ) ) {
+			$redirect_to = $_REQUEST['redirect_to'];
+			// Redirect to https if user wants ssl
+			if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
+				$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+		} else {
+			$redirect_to = admin_url();
+		}
 
-	$reauth = empty($_REQUEST['reauth']) ? false : true;
+		$reauth = empty($_REQUEST['reauth']) ? false : true;
 
-	$user = wp_signon( '', $secure_cookie );
+		$user = wp_signon( '', $secure_cookie );
 
-	if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
-		if ( headers_sent() ) {
-			$user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
-				__( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
-		} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
-			// If cookies are disabled we can't log in even with a valid user+pass
-			$user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
-				__( 'https://codex.wordpress.org/Cookies' ) ) );
+		if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
+			if ( headers_sent() ) {
+				$user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
+					__( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
+			} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
+				// If cookies are disabled we can't log in even with a valid user+pass
+				$user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
+					__( 'https://codex.wordpress.org/Cookies' ) ) );
+			}
 		}
-	}
 
-	$requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-	/**
+		$requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+		/**
 	 * Filter the login redirect URL.
 	 *
 	 * @since 3.0.0
@@ -804,65 +804,65 @@ 
 	 * @param string           $requested_redirect_to The requested redirect destination URL passed as a parameter.
 	 * @param WP_User|WP_Error $user                  WP_User object if login was successful, WP_Error object otherwise.
 	 */
-	$redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user );
-
-	if ( !is_wp_error($user) && !$reauth ) {
-		if ( $interim_login ) {
-			$message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
-			$interim_login = 'success';
-			login_header( '', $message ); ?>
-			</div>
+		$redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user );
+
+		if ( !is_wp_error($user) && !$reauth ) {
+			if ( $interim_login ) {
+				$message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
+				$interim_login = 'success';
+				login_header( '', $message ); ?>
+				</div>
 			<?php
-			/** This action is documented in wp-login.php */
-			do_action( 'login_footer' ); ?>
-			<?php if ( $customize_login ) : ?>
-				<script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
+				/** This action is documented in wp-login.php */
+				do_action( 'login_footer' ); ?>
+				<?php if ( $customize_login ) : ?>
+					<script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
 			<?php endif; ?>
-			</body></html>
-<?php		exit;
-		}
-
-		if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
-			// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
-				$redirect_to = user_admin_url();
-			elseif ( is_multisite() && !$user->has_cap('read') )
-				$redirect_to = get_dashboard_url( $user->ID );
-			elseif ( !$user->has_cap('edit_posts') )
-				$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+				</body></html>
+	<?php		exit;
+			}
 
-			wp_redirect( $redirect_to );
+			if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
+				// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
+				if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
+					$redirect_to = user_admin_url();
+				elseif ( is_multisite() && !$user->has_cap('read') )
+					$redirect_to = get_dashboard_url( $user->ID );
+				elseif ( !$user->has_cap('edit_posts') )
+					$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+
+				wp_redirect( $redirect_to );
+				exit();
+			}
+			wp_safe_redirect($redirect_to);
 			exit();
 		}
-		wp_safe_redirect($redirect_to);
-		exit();
-	}
 
-	$errors = $user;
-	// Clear errors if loggedout is set.
-	if ( !empty($_GET['loggedout']) || $reauth )
-		$errors = new WP_Error();
+		$errors = $user;
+		// Clear errors if loggedout is set.
+		if ( !empty($_GET['loggedout']) || $reauth )
+			$errors = new WP_Error();
 
-	if ( $interim_login ) {
-		if ( ! $errors->get_error_code() )
-			$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
-	} else {
-		// Some parts of this script use the main login form to display a message
-		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
-			$errors->add('loggedout', __('You are now logged out.'), 'message');
-		elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
-			$errors->add('registerdisabled', __('User registration is currently not allowed.'));
-		elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
-			$errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
-			$errors->add('newpass', __('Check your email for your new password.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
-			$errors->add('registered', __('Registration complete. Please check your email.'), 'message');
-		elseif ( strpos( $redirect_to, 'about.php?updated' ) )
-			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
-	}
+		if ( $interim_login ) {
+			if ( ! $errors->get_error_code() )
+				$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
+		} else {
+			// Some parts of this script use the main login form to display a message
+			if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
+				$errors->add('loggedout', __('You are now logged out.'), 'message');
+			elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
+				$errors->add('registerdisabled', __('User registration is currently not allowed.'));
+			elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
+				$errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
+			elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
+				$errors->add('newpass', __('Check your email for your new password.'), 'message');
+			elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
+				$errors->add('registered', __('Registration complete. Please check your email.'), 'message');
+			elseif ( strpos( $redirect_to, 'about.php?updated' ) )
+				$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+		}
 
-	/**
+		/**
 	 * Filter the login page errors.
 	 *
 	 * @since 3.6.0
@@ -870,24 +870,24 @@ 
 	 * @param object $errors      WP Error object.
 	 * @param string $redirect_to Redirect destination URL.
 	 */
-	$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+		$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
 
-	// Clear any stale cookies.
-	if ( $reauth )
-		wp_clear_auth_cookie();
+		// Clear any stale cookies.
+		if ( $reauth )
+			wp_clear_auth_cookie();
 
-	login_header(__('Log In'), '', $errors);
+		login_header(__('Log In'), '', $errors);
 
-	if ( isset($_POST['log']) )
-		$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
-	$rememberme = ! empty( $_POST['rememberme'] );
+		if ( isset($_POST['log']) )
+			$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
+		$rememberme = ! empty( $_POST['rememberme'] );
 
-	if ( ! empty( $errors->errors ) ) {
-		$aria_describedby_error = ' aria-describedby="login_error"';
-	} else {
-		$aria_describedby_error = '';
-	}
-?>
+		if ( ! empty( $errors->errors ) ) {
+			$aria_describedby_error = ' aria-describedby="login_error"';
+		} else {
+			$aria_describedby_error = '';
+		}
+	?>
 
 <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
 	<p>
@@ -899,42 +899,42 @@ 
 		<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
 	</p>
 	<?php
-	/**
+		/**
 	 * Fires following the 'Password' field in the login form.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'login_form' );
-	?>
-	<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
+		do_action( 'login_form' );
+		?>
+		<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
 	<p class="submit">
 		<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Log In'); ?>" />
-<?php	if ( $interim_login ) { ?>
-		<input type="hidden" name="interim-login" value="1" />
-<?php	} else { ?>
-		<input type="hidden" name="redirect_to" value="<?php echo esc_attr($redirect_to); ?>" />
-<?php 	} ?>
-<?php   if ( $customize_login ) : ?>
-		<input type="hidden" name="customize-login" value="1" />
-<?php   endif; ?>
+	<?php	if ( $interim_login ) { ?>
+			<input type="hidden" name="interim-login" value="1" />
+	<?php	} else { ?>
+			<input type="hidden" name="redirect_to" value="<?php echo esc_attr($redirect_to); ?>" />
+	<?php 	} ?>
+	<?php   if ( $customize_login ) : ?>
+			<input type="hidden" name="customize-login" value="1" />
+	<?php   endif; ?>
 		<input type="hidden" name="testcookie" value="1" />
 	</p>
 </form>
 
 <?php if ( ! $interim_login ) { ?>
-<p id="nav">
-<?php if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
-	if ( get_option( 'users_can_register' ) ) :
-		$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
-
-		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'register', $registration_url ) . ' | ';
-	endif;
-	?>
-	<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-<?php endif; ?>
-</p>
-<?php } ?>
+	<p id="nav">
+	<?php if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
+		if ( get_option( 'users_can_register' ) ) :
+			$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+
+			/** This filter is documented in wp-includes/general-template.php */
+			echo apply_filters( 'register', $registration_url ) . ' | ';
+		endif;
+		?>
+		<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+	<?php endif; ?>
+	</p>
+	<?php } ?>
 
 <script type="text/javascript">
 function wp_attempt_focus(){
@@ -943,8 +943,8 @@ 
 d = document.getElementById('user_pass');
 d.value = '';
 <?php } else { ?>
-d = document.getElementById('user_login');
-<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
+	d = document.getElementById('user_login');
+	<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
 if( d.value != '' )
 d.value = '';
 <?php
@@ -957,10 +957,10 @@ 
 }
 
 <?php if ( !$error ) { ?>
-wp_attempt_focus();
-<?php } ?>
-if(typeof wpOnload=='function')wpOnload();
-<?php if ( $interim_login ) { ?>
+	wp_attempt_focus();
+	<?php } ?>
+	if(typeof wpOnload=='function')wpOnload();
+	<?php if ( $interim_login ) { ?>
 (function(){
 try {
 	var i, links = document.getElementsByTagName('a');
@@ -971,9 +971,9 @@ 
 } catch(e){}
 }());
 <?php } ?>
-</script>
+	</script>
 
-<?php
-login_footer();
-break;
+	<?php
+	login_footer();
+	break;
 } // end action switch

Spacing +242 added lines, -242 removed lines

@@ -9,15 +9,15 @@ 
  */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require(dirname(__FILE__).'/wp-load.php');
 
 // Redirect to https login if forced to use SSL
-if ( force_ssl_admin() && ! is_ssl() ) {
-	if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
-		wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
+if (force_ssl_admin() && ! is_ssl()) {
+	if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
+		wp_redirect(set_url_scheme($_SERVER['REQUEST_URI'], 'https'));
 		exit();
 	} else {
-		wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+		wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 		exit();
 	}
 }
@@ -30,20 +30,20 @@ 
  * @param string   $message  Optional. Message to display in header. Default empty.
  * @param WP_Error $wp_error Optional. The error to pass. Default empty.
  */
-function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
+function login_header($title = 'Log In', $message = '', $wp_error = '') {
 	global $error, $interim_login, $action;
 
 	// Don't index any of these forms
-	add_action( 'login_head', 'wp_no_robots' );
+	add_action('login_head', 'wp_no_robots');
 
-	if ( wp_is_mobile() )
-		add_action( 'login_head', 'wp_login_viewport_meta' );
+	if (wp_is_mobile())
+		add_action('login_head', 'wp_login_viewport_meta');
 
-	if ( empty($wp_error) )
+	if (empty($wp_error))
 		$wp_error = new WP_Error();
 
 	// Shake it!
-	$shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' );
+	$shake_error_codes = array('empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password');
 	/**
 	 * Filter the error codes array for shaking the login form.
 	 *
@@ -51,10 +51,10 @@ 
 	 *
 	 * @param array $shake_error_codes Error codes that shake the login form.
 	 */
-	$shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
+	$shake_error_codes = apply_filters('shake_error_codes', $shake_error_codes);
 
-	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
-		add_action( 'login_head', 'wp_shake_js', 12 );
+	if ($shake_error_codes && $wp_error->get_error_code() && in_array($wp_error->get_error_code(), $shake_error_codes))
+		add_action('login_head', 'wp_shake_js', 12);
 
 	$separator = is_rtl() ? ' › ' : ' ‹ ';
 
@@ -67,17 +67,17 @@ 
 	<!--<![endif]-->
 	<head>
 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-	<title><?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?></title>
+	<title><?php echo get_bloginfo('name', 'display').$separator.$title; ?></title>
 	<?php
 
-	wp_enqueue_style( 'login' );
+	wp_enqueue_style('login');
 
 	/*
 	 * Remove all stored post data on logging out.
 	 * This could be added by add_action('login_head'...) like wp_shake_js(),
 	 * but maybe better if it's not removable by plugins
 	 */
-	if ( 'loggedout' == $wp_error->get_error_code() ) {
+	if ('loggedout' == $wp_error->get_error_code()) {
 		?>
 		<script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script>
 		<?php
@@ -88,21 +88,21 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'login_enqueue_scripts' );
+	do_action('login_enqueue_scripts');
 
 	/**
 	 * Fires in the login page header after scripts are enqueued.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'login_head' );
+	do_action('login_head');
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$login_header_url   = network_home_url();
 		$login_header_title = get_current_site()->site_name;
 	} else {
-		$login_header_url   = __( 'https://wordpress.org/' );
-		$login_header_title = __( 'Powered by WordPress' );
+		$login_header_url   = __('https://wordpress.org/');
+		$login_header_title = __('Powered by WordPress');
 	}
 
 	/**
@@ -112,7 +112,7 @@ 
 	 *
 	 * @param string $login_header_url Login header logo URL.
 	 */
-	$login_header_url = apply_filters( 'login_headerurl', $login_header_url );
+	$login_header_url = apply_filters('login_headerurl', $login_header_url);
 	/**
 	 * Filter the title attribute of the header logo above login form.
 	 *
@@ -120,23 +120,23 @@ 
 	 *
 	 * @param string $login_header_title Login header logo title attribute.
 	 */
-	$login_header_title = apply_filters( 'login_headertitle', $login_header_title );
+	$login_header_title = apply_filters('login_headertitle', $login_header_title);
 
-	$classes = array( 'login-action-' . $action, 'wp-core-ui' );
-	if ( wp_is_mobile() )
+	$classes = array('login-action-'.$action, 'wp-core-ui');
+	if (wp_is_mobile())
 		$classes[] = 'mobile';
-	if ( is_rtl() )
+	if (is_rtl())
 		$classes[] = 'rtl';
-	if ( $interim_login ) {
+	if ($interim_login) {
 		$classes[] = 'interim-login';
 		?>
 		<style type="text/css">html{background-color: transparent;}</style>
 		<?php
 
-		if ( 'success' ===  $interim_login )
+		if ('success' === $interim_login)
 			$classes[] = 'interim-login-success';
 	}
-	$classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+	$classes[] = ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
 	/**
 	 * Filter the login page body classes.
@@ -146,16 +146,16 @@ 
 	 * @param array  $classes An array of body classes.
 	 * @param string $action  The action that brought the visitor to the login page.
 	 */
-	$classes = apply_filters( 'login_body_class', $classes, $action );
+	$classes = apply_filters('login_body_class', $classes, $action);
 
 	?>
 	</head>
-	<body class="login <?php echo esc_attr( implode( ' ', $classes ) ); ?>">
+	<body class="login <?php echo esc_attr(implode(' ', $classes)); ?>">
 	<div id="login">
-		<h1><a href="<?php echo esc_url( $login_header_url ); ?>" title="<?php echo esc_attr( $login_header_title ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+		<h1><a href="<?php echo esc_url($login_header_url); ?>" title="<?php echo esc_attr($login_header_title); ?>" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
 	<?php
 
-	unset( $login_header_url, $login_header_title );
+	unset($login_header_url, $login_header_title);
 
 	/**
 	 * Filter the message to display above the login form.
@@ -164,29 +164,29 @@ 
 	 *
 	 * @param string $message Login message text.
 	 */
-	$message = apply_filters( 'login_message', $message );
-	if ( !empty( $message ) )
-		echo $message . "\n";
+	$message = apply_filters('login_message', $message);
+	if ( ! empty($message))
+		echo $message."\n";
 
 	// In case a plugin uses $error rather than the $wp_errors object
-	if ( !empty( $error ) ) {
+	if ( ! empty($error)) {
 		$wp_error->add('error', $error);
 		unset($error);
 	}
 
-	if ( $wp_error->get_error_code() ) {
+	if ($wp_error->get_error_code()) {
 		$errors = '';
 		$messages = '';
-		foreach ( $wp_error->get_error_codes() as $code ) {
-			$severity = $wp_error->get_error_data( $code );
-			foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
-				if ( 'message' == $severity )
-					$messages .= '	' . $error_message . "<br />\n";
+		foreach ($wp_error->get_error_codes() as $code) {
+			$severity = $wp_error->get_error_data($code);
+			foreach ($wp_error->get_error_messages($code) as $error_message) {
+				if ('message' == $severity)
+					$messages .= '	'.$error_message."<br />\n";
 				else
-					$errors .= '	' . $error_message . "<br />\n";
+					$errors .= '	'.$error_message."<br />\n";
 			}
 		}
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 			/**
 			 * Filter the error messages displayed above the login form.
 			 *
@@ -194,9 +194,9 @@ 
 			 *
 			 * @param string $errors Login error message.
 			 */
-			echo '<div id="login_error">' . apply_filters( 'login_errors', $errors ) . "</div>\n";
+			echo '<div id="login_error">'.apply_filters('login_errors', $errors)."</div>\n";
 		}
-		if ( ! empty( $messages ) ) {
+		if ( ! empty($messages)) {
 			/**
 			 * Filter instructional messages displayed above the login form.
 			 *
@@ -204,7 +204,7 @@ 
 			 *
 			 * @param string $messages Login messages.
 			 */
-			echo '<p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";
+			echo '<p class="message">'.apply_filters('login_messages', $messages)."</p>\n";
 		}
 	}
 } // End of login_header()
@@ -218,13 +218,13 @@ 
 	global $interim_login;
 
 	// Don't allow interim logins to navigate away from the page.
-	if ( ! $interim_login ): ?>
-	<p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php printf( __( '&larr; Back to %s' ), get_bloginfo( 'title', 'display' ) ); ?></a></p>
+	if ( ! $interim_login): ?>
+	<p id="backtoblog"><a href="<?php echo esc_url(home_url('/')); ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display')); ?></a></p>
 	<?php endif; ?>
 
 	</div>
 
-	<?php if ( !empty($input_id) ) : ?>
+	<?php if ( ! empty($input_id)) : ?>
 	<script type="text/javascript">
 	try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
 	if(typeof wpOnload=='function')wpOnload();
@@ -237,7 +237,7 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'login_footer' ); ?>
+	do_action('login_footer'); ?>
 	<div class="clear"></div>
 	</body>
 	</html>
@@ -248,7 +248,7 @@ 
  * @since 3.0.0
  */
 function wp_shake_js() {
-	if ( wp_is_mobile() )
+	if (wp_is_mobile())
 		return;
 ?>
 <script type="text/javascript">
@@ -283,11 +283,11 @@ 
 
 	$errors = new WP_Error();
 
-	if ( empty( $_POST['user_login'] ) ) {
+	if (empty($_POST['user_login'])) {
 		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
-	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
-		$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
-		if ( empty( $user_data ) )
+	} elseif (strpos($_POST['user_login'], '@')) {
+		$user_data = get_user_by('email', trim($_POST['user_login']));
+		if (empty($user_data))
 			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
 	} else {
 		$login = trim($_POST['user_login']);
@@ -303,12 +303,12 @@ 
 	 * @param WP_Error $errors A WP_Error object containing any errors generated
 	 *                         by using invalid credentials.
 	 */
-	do_action( 'lostpassword_post', $errors );
+	do_action('lostpassword_post', $errors);
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
-	if ( !$user_data ) {
+	if ( ! $user_data) {
 		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
 		return $errors;
 	}
@@ -316,20 +316,20 @@ 
 	// Redefining user_login ensures we return the right case in the email.
 	$user_login = $user_data->user_login;
 	$user_email = $user_data->user_email;
-	$key = get_password_reset_key( $user_data );
+	$key = get_password_reset_key($user_data);
 
-	if ( is_wp_error( $key ) ) {
+	if (is_wp_error($key)) {
 		return $key;
 	}
 
-	$message = __('Someone has requested a password reset for the following account:') . "\r\n\r\n";
-	$message .= network_home_url( '/' ) . "\r\n\r\n";
-	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-	$message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n";
-	$message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
-	$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
+	$message = __('Someone has requested a password reset for the following account:')."\r\n\r\n";
+	$message .= network_home_url('/')."\r\n\r\n";
+	$message .= sprintf(__('Username: %s'), $user_login)."\r\n\r\n";
+	$message .= __('If this was a mistake, just ignore this email and nothing will happen.')."\r\n\r\n";
+	$message .= __('To reset your password, visit the following address:')."\r\n\r\n";
+	$message .= '<'.network_site_url("wp-login.php?action=rp&key=$key&login=".rawurlencode($user_login), 'login').">\r\n";
 
-	if ( is_multisite() )
+	if (is_multisite())
 		$blogname = $GLOBALS['current_site']->site_name;
 	else
 		/*
@@ -338,7 +338,7 @@ 
 		 */
 		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-	$title = sprintf( __('[%s] Password Reset'), $blogname );
+	$title = sprintf(__('[%s] Password Reset'), $blogname);
 
 	/**
 	 * Filter the subject of the password reset email.
@@ -350,7 +350,7 @@ 
 	 * @param string  $user_login The username for the user.
 	 * @param WP_User $user_data  WP_User object.
 	 */
-	$title = apply_filters( 'retrieve_password_title', $title, $user_login, $user_data );
+	$title = apply_filters('retrieve_password_title', $title, $user_login, $user_data);
 
 	/**
 	 * Filter the message body of the password reset mail.
@@ -363,10 +363,10 @@ 
 	 * @param string  $user_login The username for the user.
 	 * @param WP_User $user_data  WP_User object.
 	 */
-	$message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
+	$message = apply_filters('retrieve_password_message', $message, $key, $user_login, $user_data);
 
-	if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
-		wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+	if ($message && ! wp_mail($user_email, wp_specialchars_decode($title), $message))
+		wp_die(__('The email could not be sent.')."<br />\n".__('Possible reason: your host may have disabled the mail() function.'));
 
 	return true;
 }
@@ -378,38 +378,38 @@ 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';
 $errors = new WP_Error();
 
-if ( isset($_GET['key']) )
+if (isset($_GET['key']))
 	$action = 'resetpass';
 
 // validate action so as to default to the login screen
-if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) )
+if ( ! in_array($action, array('postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login'), true) && false === has_filter('login_form_'.$action))
 	$action = 'login';
 
 nocache_headers();
 
 header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
 
-if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
-	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
-		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+if (defined('RELOCATE') && RELOCATE) { // Move flag is set
+	if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))
+		$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);
 
-	$url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
-	if ( $url != get_option( 'siteurl' ) )
-		update_option( 'siteurl', $url );
+	$url = dirname(set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']));
+	if ($url != get_option('siteurl'))
+		update_option('siteurl', $url);
 }
 
 //Set a cookie now to see if they are supported by the browser.
-$secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) );
-setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
-if ( SITECOOKIEPATH != COOKIEPATH )
-	setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
+$secure = ('https' === parse_url(wp_login_url(), PHP_URL_SCHEME));
+setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure);
+if (SITECOOKIEPATH != COOKIEPATH)
+	setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure);
 
 /**
  * Fires when the login form is initialized.
  *
  * @since 3.2.0
  */
-do_action( 'login_init' );
+do_action('login_init');
 /**
  * Fires before a specified login form action.
  *
@@ -419,7 +419,7 @@ 
  *
  * @since 2.8.0
  */
-do_action( 'login_form_' . $action );
+do_action('login_form_'.$action);
 
 $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
 $interim_login = isset($_REQUEST['interim-login']);
@@ -427,13 +427,13 @@ 
 switch ($action) {
 
 case 'postpass' :
-	if ( ! array_key_exists( 'post_password', $_POST ) ) {
-		wp_safe_redirect( wp_get_referer() );
+	if ( ! array_key_exists('post_password', $_POST)) {
+		wp_safe_redirect(wp_get_referer());
 		exit();
 	}
 
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
+	require_once ABSPATH.WPINC.'/class-phpass.php';
+	$hasher = new PasswordHash(8, true);
 
 	/**
 	 * Filter the life span of the post password cookie.
@@ -445,16 +445,16 @@ 
 	 *
 	 * @param int $expires The expiry time, as passed to setcookie().
 	 */
-	$expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
+	$expire = apply_filters('post_password_expires', time() + 10 * DAY_IN_SECONDS);
 	$referer = wp_get_referer();
-	if ( $referer ) {
-		$secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) );
+	if ($referer) {
+		$secure = ('https' === parse_url($referer, PHP_URL_SCHEME));
 	} else {
 		$secure = false;
 	}
-	setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
+	setcookie('wp-postpass_'.COOKIEHASH, $hasher->HashPassword(wp_unslash($_POST['post_password'])), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure);
 
-	wp_safe_redirect( wp_get_referer() );
+	wp_safe_redirect(wp_get_referer());
 	exit();
 
 case 'logout' :
@@ -464,7 +464,7 @@ 
 
 	wp_logout();
 
-	if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+	if ( ! empty($_REQUEST['redirect_to'])) {
 		$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
 	} else {
 		$redirect_to = 'wp-login.php?loggedout=true';
@@ -480,31 +480,31 @@ 
 	 * @param string  $requested_redirect_to The requested redirect destination URL passed as a parameter.
 	 * @param WP_User $user                  The WP_User object for the user that's logging out.
 	 */
-	$redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
-	wp_safe_redirect( $redirect_to );
+	$redirect_to = apply_filters('logout_redirect', $redirect_to, $requested_redirect_to, $user);
+	wp_safe_redirect($redirect_to);
 	exit();
 
 case 'lostpassword' :
 case 'retrievepassword' :
 
-	if ( $http_post ) {
+	if ($http_post) {
 		$errors = retrieve_password();
-		if ( !is_wp_error($errors) ) {
-			$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
-			wp_safe_redirect( $redirect_to );
+		if ( ! is_wp_error($errors)) {
+			$redirect_to = ! empty($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
+			wp_safe_redirect($redirect_to);
 			exit();
 		}
 	}
 
-	if ( isset( $_GET['error'] ) ) {
-		if ( 'invalidkey' == $_GET['error'] ) {
-			$errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) );
-		} elseif ( 'expiredkey' == $_GET['error'] ) {
-			$errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) );
+	if (isset($_GET['error'])) {
+		if ('invalidkey' == $_GET['error']) {
+			$errors->add('invalidkey', __('Your password reset link appears to be invalid. Please request a new link below.'));
+		} elseif ('expiredkey' == $_GET['error']) {
+			$errors->add('expiredkey', __('Your password reset link has expired. Please request a new link below.'));
 		}
 	}
 
-	$lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+	$lostpassword_redirect = ! empty($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
 	/**
 	 * Filter the URL redirected to after submitting the lostpassword/retrievepassword form.
 	 *
@@ -512,22 +512,22 @@ 
 	 *
 	 * @param string $lostpassword_redirect The redirect destination URL.
 	 */
-	$redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
+	$redirect_to = apply_filters('lostpassword_redirect', $lostpassword_redirect);
 
 	/**
 	 * Fires before the lost password form.
 	 *
 	 * @since 1.5.1
 	 */
-	do_action( 'lost_password' );
+	do_action('lost_password');
 
-	login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);
+	login_header(__('Lost Password'), '<p class="message">'.__('Please enter your username or email address. You will receive a link to create a new password via email.').'</p>', $errors);
 
 	$user_login = isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
 
 ?>
 
-<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
+<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url(network_site_url('wp-login.php?action=lostpassword', 'login_post')); ?>" method="post">
 	<p>
 		<label for="user_login" ><?php _e('Username or Email') ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
@@ -538,19 +538,19 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'lostpassword_form' ); ?>
-	<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+	do_action('lostpassword_form'); ?>
+	<input type="hidden" name="redirect_to" value="<?php echo esc_attr($redirect_to); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Get New Password'); ?>" /></p>
 </form>
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e('Log in') ?></a>
+<a href="<?php echo esc_url(wp_login_url()); ?>"><?php _e('Log in') ?></a>
 <?php
-if ( get_option( 'users_can_register' ) ) :
-	$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+if (get_option('users_can_register')) :
+	$registration_url = sprintf('<a href="%s">%s</a>', esc_url(wp_registration_url()), __('Register'));
 
 	/** This filter is documented in wp-includes/general-template.php */
-	echo ' | ' . apply_filters( 'register', $registration_url );
+	echo ' | '.apply_filters('register', $registration_url);
 endif;
 ?>
 </p>
@@ -561,38 +561,38 @@ 
 
 case 'resetpass' :
 case 'rp' :
-	list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-	$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
-	if ( isset( $_GET['key'] ) ) {
-		$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
-		setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
+	list($rp_path) = explode('?', wp_unslash($_SERVER['REQUEST_URI']));
+	$rp_cookie = 'wp-resetpass-'.COOKIEHASH;
+	if (isset($_GET['key'])) {
+		$value = sprintf('%s:%s', wp_unslash($_GET['login']), wp_unslash($_GET['key']));
+		setcookie($rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true);
+		wp_safe_redirect(remove_query_arg(array('key', 'login')));
 		exit;
 	}
 
-	if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
-		list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
-		$user = check_password_reset_key( $rp_key, $rp_login );
-		if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) {
+	if (isset($_COOKIE[$rp_cookie]) && 0 < strpos($_COOKIE[$rp_cookie], ':')) {
+		list($rp_login, $rp_key) = explode(':', wp_unslash($_COOKIE[$rp_cookie]), 2);
+		$user = check_password_reset_key($rp_key, $rp_login);
+		if (isset($_POST['pass1']) && ! hash_equals($rp_key, $_POST['rp_key'])) {
 			$user = false;
 		}
 	} else {
 		$user = false;
 	}
 
-	if ( ! $user || is_wp_error( $user ) ) {
-		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		if ( $user && $user->get_error_code() === 'expired_key' )
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+	if ( ! $user || is_wp_error($user)) {
+		setcookie($rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true);
+		if ($user && $user->get_error_code() === 'expired_key')
+			wp_redirect(site_url('wp-login.php?action=lostpassword&error=expiredkey'));
 		else
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+			wp_redirect(site_url('wp-login.php?action=lostpassword&error=invalidkey'));
 		exit;
 	}
 
 	$errors = new WP_Error();
 
-	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
-		$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+	if (isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'])
+		$errors->add('password_reset_mismatch', __('The passwords do not match.'));
 
 	/**
 	 * Fires before the password reset procedure is validated.
@@ -602,12 +602,12 @@ 
 	 * @param object           $errors WP Error object.
 	 * @param WP_User|WP_Error $user   WP_User object if the login and reset key match. WP_Error object otherwise.
 	 */
-	do_action( 'validate_password_reset', $errors, $user );
+	do_action('validate_password_reset', $errors, $user);
 
-	if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
+	if (( ! $errors->get_error_code()) && isset($_POST['pass1']) && ! empty($_POST['pass1'])) {
 		reset_password($user, $_POST['pass1']);
-		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+		setcookie($rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true);
+		login_header(__('Password Reset'), '<p class="message reset-pass">'.__('Your password has been reset.').' <a href="'.esc_url(wp_login_url()).'">'.__('Log in').'</a></p>');
 		login_footer();
 		exit;
 	}
@@ -615,27 +615,27 @@ 
 	wp_enqueue_script('utils');
 	wp_enqueue_script('user-profile');
 
-	login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );
+	login_header(__('Reset Password'), '<p class="message reset-pass">'.__('Enter your new password below.').'</p>', $errors);
 
 ?>
-<form name="resetpassform" id="resetpassform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=resetpass', 'login_post' ) ); ?>" method="post" autocomplete="off">
-	<input type="hidden" id="user_login" value="<?php echo esc_attr( $rp_login ); ?>" autocomplete="off" />
+<form name="resetpassform" id="resetpassform" action="<?php echo esc_url(network_site_url('wp-login.php?action=resetpass', 'login_post')); ?>" method="post" autocomplete="off">
+	<input type="hidden" id="user_login" value="<?php echo esc_attr($rp_login); ?>" autocomplete="off" />
 
 	<div class="user-pass1-wrap">
 		<p>
-			<label for="pass1"><?php _e( 'New password' ) ?></label>
+			<label for="pass1"><?php _e('New password') ?></label>
 		</p>
 
 		<div class="wp-pwd">
 			<span class="password-input-wrapper">
-				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr(wp_generate_password(16)); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
 			</span>
-			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
+			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e('Strength indicator'); ?></div>
 		</div>
 	</div>
 
 	<p class="user-pass2-wrap">
-		<label for="pass2"><?php _e( 'Confirm new password' ) ?></label><br />
+		<label for="pass2"><?php _e('Confirm new password') ?></label><br />
 		<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
 	</p>
 
@@ -650,20 +650,20 @@ 
 	 *
 	 * @param WP_User $user User object of the user whose password is being reset.
 	 */
-	do_action( 'resetpass_form', $user );
+	do_action('resetpass_form', $user);
 	?>
-	<input type="hidden" name="rp_key" value="<?php echo esc_attr( $rp_key ); ?>" />
+	<input type="hidden" name="rp_key" value="<?php echo esc_attr($rp_key); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Reset Password'); ?>" /></p>
 </form>
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
+<a href="<?php echo esc_url(wp_login_url()); ?>"><?php _e('Log in'); ?></a>
 <?php
-if ( get_option( 'users_can_register' ) ) :
-	$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+if (get_option('users_can_register')) :
+	$registration_url = sprintf('<a href="%s">%s</a>', esc_url(wp_registration_url()), __('Register'));
 
 	/** This filter is documented in wp-includes/general-template.php */
-	echo ' | ' . apply_filters( 'register', $registration_url );
+	echo ' | '.apply_filters('register', $registration_url);
 endif;
 ?>
 </p>
@@ -673,7 +673,7 @@ 
 break;
 
 case 'register' :
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		/**
 		 * Filter the Multisite sign up URL.
 		 *
@@ -681,29 +681,29 @@ 
 		 *
 		 * @param string $sign_up_url The sign up URL.
 		 */
-		wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
+		wp_redirect(apply_filters('wp_signup_location', network_site_url('wp-signup.php')));
 		exit;
 	}
 
-	if ( !get_option('users_can_register') ) {
-		wp_redirect( site_url('wp-login.php?registration=disabled') );
+	if ( ! get_option('users_can_register')) {
+		wp_redirect(site_url('wp-login.php?registration=disabled'));
 		exit();
 	}
 
 	$user_login = '';
 	$user_email = '';
-	if ( $http_post ) {
-		$user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : '';
-		$user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : '';
+	if ($http_post) {
+		$user_login = isset($_POST['user_login']) ? $_POST['user_login'] : '';
+		$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';
 		$errors = register_new_user($user_login, $user_email);
-		if ( !is_wp_error($errors) ) {
-			$redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
-			wp_safe_redirect( $redirect_to );
+		if ( ! is_wp_error($errors)) {
+			$redirect_to = ! empty($_POST['redirect_to']) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
+			wp_safe_redirect($redirect_to);
 			exit();
 		}
 	}
 
-	$registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+	$registration_redirect = ! empty($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
 	/**
 	 * Filter the registration redirect URL.
 	 *
@@ -711,17 +711,17 @@ 
 	 *
 	 * @param string $registration_redirect The redirect destination URL.
 	 */
-	$redirect_to = apply_filters( 'registration_redirect', $registration_redirect );
-	login_header(__('Registration Form'), '<p class="message register">' . __('Register For This Site') . '</p>', $errors);
+	$redirect_to = apply_filters('registration_redirect', $registration_redirect);
+	login_header(__('Registration Form'), '<p class="message register">'.__('Register For This Site').'</p>', $errors);
 ?>
-<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
+<form name="registerform" id="registerform" action="<?php echo esc_url(site_url('wp-login.php?action=register', 'login_post')); ?>" method="post" novalidate="novalidate">
 	<p>
 		<label for="user_login"><?php _e('Username') ?><br />
 		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
 	</p>
 	<p>
 		<label for="user_email"><?php _e('Email') ?><br />
-		<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
+		<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr(wp_unslash($user_email)); ?>" size="25" /></label>
 	</p>
 	<?php
 	/**
@@ -729,17 +729,17 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'register_form' );
+	do_action('register_form');
 	?>
-	<p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
+	<p id="reg_passmail"><?php _e('Registration confirmation will be emailed to you.'); ?></p>
 	<br class="clear" />
-	<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+	<input type="hidden" name="redirect_to" value="<?php echo esc_attr($redirect_to); ?>" />
 	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
 </form>
 
 <p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a> |
-<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+<a href="<?php echo esc_url(wp_login_url()); ?>"><?php _e('Log in'); ?></a> |
+<a href="<?php echo esc_url(wp_lostpassword_url()); ?>"><?php _e('Lost your password?'); ?></a>
 </p>
 
 <?php
@@ -749,31 +749,31 @@ 
 case 'login' :
 default:
 	$secure_cookie = '';
-	$customize_login = isset( $_REQUEST['customize-login'] );
-	if ( $customize_login )
-		wp_enqueue_script( 'customize-base' );
+	$customize_login = isset($_REQUEST['customize-login']);
+	if ($customize_login)
+		wp_enqueue_script('customize-base');
 
 	// If the user wants ssl but the session is not ssl, force a secure cookie.
-	if ( !empty($_POST['log']) && !force_ssl_admin() ) {
+	if ( ! empty($_POST['log']) && ! force_ssl_admin()) {
 		$user_name = sanitize_user($_POST['log']);
-		$user = get_user_by( 'login', $user_name );
+		$user = get_user_by('login', $user_name);
 
-		if ( ! $user && strpos( $user_name, '@' ) ) {
-			$user = get_user_by( 'email', $user_name );
+		if ( ! $user && strpos($user_name, '@')) {
+			$user = get_user_by('email', $user_name);
 		}
 
-		if ( $user ) {
-			if ( get_user_option('use_ssl', $user->ID) ) {
+		if ($user) {
+			if (get_user_option('use_ssl', $user->ID)) {
 				$secure_cookie = true;
 				force_ssl_admin(true);
 			}
 		}
 	}
 
-	if ( isset( $_REQUEST['redirect_to'] ) ) {
+	if (isset($_REQUEST['redirect_to'])) {
 		$redirect_to = $_REQUEST['redirect_to'];
 		// Redirect to https if user wants ssl
-		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
+		if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))
 			$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
 	} else {
 		$redirect_to = admin_url();
@@ -781,20 +781,20 @@ 
 
 	$reauth = empty($_REQUEST['reauth']) ? false : true;
 
-	$user = wp_signon( '', $secure_cookie );
+	$user = wp_signon('', $secure_cookie);
 
-	if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
-		if ( headers_sent() ) {
-			$user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
-				__( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) );
-		} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
+	if (empty($_COOKIE[LOGGED_IN_COOKIE])) {
+		if (headers_sent()) {
+			$user = new WP_Error('test_cookie', sprintf(__('<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.'),
+				__('https://codex.wordpress.org/Cookies'), __('https://wordpress.org/support/')));
+		} elseif (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) {
 			// If cookies are disabled we can't log in even with a valid user+pass
-			$user = new WP_Error( 'test_cookie', sprintf( __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
-				__( 'https://codex.wordpress.org/Cookies' ) ) );
+			$user = new WP_Error('test_cookie', sprintf(__('<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.'),
+				__('https://codex.wordpress.org/Cookies')));
 		}
 	}
 
-	$requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+	$requested_redirect_to = isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
 	/**
 	 * Filter the login redirect URL.
 	 *
@@ -804,34 +804,34 @@ 
 	 * @param string           $requested_redirect_to The requested redirect destination URL passed as a parameter.
 	 * @param WP_User|WP_Error $user                  WP_User object if login was successful, WP_Error object otherwise.
 	 */
-	$redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user );
+	$redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);
 
-	if ( !is_wp_error($user) && !$reauth ) {
-		if ( $interim_login ) {
-			$message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
+	if ( ! is_wp_error($user) && ! $reauth) {
+		if ($interim_login) {
+			$message = '<p class="message">'.__('You have logged in successfully.').'</p>';
 			$interim_login = 'success';
-			login_header( '', $message ); ?>
+			login_header('', $message); ?>
 			</div>
 			<?php
 			/** This action is documented in wp-login.php */
-			do_action( 'login_footer' ); ?>
-			<?php if ( $customize_login ) : ?>
+			do_action('login_footer'); ?>
+			<?php if ($customize_login) : ?>
 				<script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
 			<?php endif; ?>
 			</body></html>
 <?php		exit;
 		}
 
-		if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
+		if ((empty($redirect_to) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url())) {
 			// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
+			if (is_multisite() && ! get_active_blog_for_user($user->ID) && ! is_super_admin($user->ID))
 				$redirect_to = user_admin_url();
-			elseif ( is_multisite() && !$user->has_cap('read') )
-				$redirect_to = get_dashboard_url( $user->ID );
-			elseif ( !$user->has_cap('edit_posts') )
-				$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+			elseif (is_multisite() && ! $user->has_cap('read'))
+				$redirect_to = get_dashboard_url($user->ID);
+			elseif ( ! $user->has_cap('edit_posts'))
+				$redirect_to = $user->has_cap('read') ? admin_url('profile.php') : home_url();
 
-			wp_redirect( $redirect_to );
+			wp_redirect($redirect_to);
 			exit();
 		}
 		wp_safe_redirect($redirect_to);
@@ -840,26 +840,26 @@ 
 
 	$errors = $user;
 	// Clear errors if loggedout is set.
-	if ( !empty($_GET['loggedout']) || $reauth )
+	if ( ! empty($_GET['loggedout']) || $reauth)
 		$errors = new WP_Error();
 
-	if ( $interim_login ) {
-		if ( ! $errors->get_error_code() )
-			$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
+	if ($interim_login) {
+		if ( ! $errors->get_error_code())
+			$errors->add('expired', __('Your session has expired. Please log in to continue where you left off.'), 'message');
 	} else {
 		// Some parts of this script use the main login form to display a message
-		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
+		if (isset($_GET['loggedout']) && true == $_GET['loggedout'])
 			$errors->add('loggedout', __('You are now logged out.'), 'message');
-		elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
+		elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration'])
 			$errors->add('registerdisabled', __('User registration is currently not allowed.'));
-		elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
+		elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'])
 			$errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
+		elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'])
 			$errors->add('newpass', __('Check your email for your new password.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
+		elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'])
 			$errors->add('registered', __('Registration complete. Please check your email.'), 'message');
-		elseif ( strpos( $redirect_to, 'about.php?updated' ) )
-			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+		elseif (strpos($redirect_to, 'about.php?updated'))
+			$errors->add('updated', __('<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.'), 'message');
 	}
 
 	/**
@@ -870,29 +870,29 @@ 
 	 * @param object $errors      WP Error object.
 	 * @param string $redirect_to Redirect destination URL.
 	 */
-	$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+	$errors = apply_filters('wp_login_errors', $errors, $redirect_to);
 
 	// Clear any stale cookies.
-	if ( $reauth )
+	if ($reauth)
 		wp_clear_auth_cookie();
 
 	login_header(__('Log In'), '', $errors);
 
-	if ( isset($_POST['log']) )
-		$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
-	$rememberme = ! empty( $_POST['rememberme'] );
+	if (isset($_POST['log']))
+		$user_login = ('incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code()) ? esc_attr(wp_unslash($_POST['log'])) : '';
+	$rememberme = ! empty($_POST['rememberme']);
 
-	if ( ! empty( $errors->errors ) ) {
+	if ( ! empty($errors->errors)) {
 		$aria_describedby_error = ' aria-describedby="login_error"';
 	} else {
 		$aria_describedby_error = '';
 	}
 ?>
 
-<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
+<form name="loginform" id="loginform" action="<?php echo esc_url(site_url('wp-login.php', 'login_post')); ?>" method="post">
 	<p>
 		<label for="user_login"><?php _e('Username or Email') ?><br />
-		<input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
+		<input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
 	</p>
 	<p>
 		<label for="user_pass"><?php _e('Password') ?><br />
@@ -904,34 +904,34 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'login_form' );
+	do_action('login_form');
 	?>
-	<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
+	<p class="forgetmenot"><label for="rememberme"><input name="rememberme" type="checkbox" id="rememberme" value="forever" <?php checked($rememberme); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
 	<p class="submit">
 		<input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Log In'); ?>" />
-<?php	if ( $interim_login ) { ?>
+<?php	if ($interim_login) { ?>
 		<input type="hidden" name="interim-login" value="1" />
 <?php	} else { ?>
 		<input type="hidden" name="redirect_to" value="<?php echo esc_attr($redirect_to); ?>" />
 <?php 	} ?>
-<?php   if ( $customize_login ) : ?>
+<?php   if ($customize_login) : ?>
 		<input type="hidden" name="customize-login" value="1" />
 <?php   endif; ?>
 		<input type="hidden" name="testcookie" value="1" />
 	</p>
 </form>
 
-<?php if ( ! $interim_login ) { ?>
+<?php if ( ! $interim_login) { ?>
 <p id="nav">
-<?php if ( ! isset( $_GET['checkemail'] ) || ! in_array( $_GET['checkemail'], array( 'confirm', 'newpass' ) ) ) :
-	if ( get_option( 'users_can_register' ) ) :
-		$registration_url = sprintf( '<a href="%s">%s</a>', esc_url( wp_registration_url() ), __( 'Register' ) );
+<?php if ( ! isset($_GET['checkemail']) || ! in_array($_GET['checkemail'], array('confirm', 'newpass'))) :
+	if (get_option('users_can_register')) :
+		$registration_url = sprintf('<a href="%s">%s</a>', esc_url(wp_registration_url()), __('Register'));
 
 		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'register', $registration_url ) . ' | ';
+		echo apply_filters('register', $registration_url).' | ';
 	endif;
 	?>
-	<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+	<a href="<?php echo esc_url(wp_lostpassword_url()); ?>"><?php _e('Lost your password?'); ?></a>
 <?php endif; ?>
 </p>
 <?php } ?>
@@ -939,12 +939,12 @@ 
 <script type="text/javascript">
 function wp_attempt_focus(){
 setTimeout( function(){ try{
-<?php if ( $user_login ) { ?>
+<?php if ($user_login) { ?>
 d = document.getElementById('user_pass');
 d.value = '';
 <?php } else { ?>
 d = document.getElementById('user_login');
-<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
+<?php if ('invalid_username' == $errors->get_error_code()) { ?>
 if( d.value != '' )
 d.value = '';
 <?php
@@ -956,11 +956,11 @@ 
 }, 200);
 }
 
-<?php if ( !$error ) { ?>
+<?php if ( ! $error) { ?>
 wp_attempt_focus();
 <?php } ?>
 if(typeof wpOnload=='function')wpOnload();
-<?php if ( $interim_login ) { ?>
+<?php if ($interim_login) { ?>
 (function(){
 try {
 	var i, links = document.getElementsByTagName('a');

Braces +103 added lines, -75 removed lines

@@ -36,11 +36,13 @@ 
 	// Don't index any of these forms
 	add_action( 'login_head', 'wp_no_robots' );
 
-	if ( wp_is_mobile() )
-		add_action( 'login_head', 'wp_login_viewport_meta' );
+	if ( wp_is_mobile() ) {
+			add_action( 'login_head', 'wp_login_viewport_meta' );
+	}
 
-	if ( empty($wp_error) )
-		$wp_error = new WP_Error();
+	if ( empty($wp_error) ) {
+			$wp_error = new WP_Error();
+	}
 
 	// Shake it!
 	$shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' );
@@ -53,8 +55,9 @@ 
 	 */
 	$shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
-	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
-		add_action( 'login_head', 'wp_shake_js', 12 );
+	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
+			add_action( 'login_head', 'wp_shake_js', 12 );
+	}
 
 	$separator = is_rtl() ? ' › ' : ' ‹ ';
 
@@ -123,18 +126,21 @@ 
 	$login_header_title = apply_filters( 'login_headertitle', $login_header_title );
 
 	$classes = array( 'login-action-' . $action, 'wp-core-ui' );
-	if ( wp_is_mobile() )
-		$classes[] = 'mobile';
-	if ( is_rtl() )
-		$classes[] = 'rtl';
+	if ( wp_is_mobile() ) {
+			$classes[] = 'mobile';
+	}
+	if ( is_rtl() ) {
+			$classes[] = 'rtl';
+	}
 	if ( $interim_login ) {
 		$classes[] = 'interim-login';
 		?>
 		<style type="text/css">html{background-color: transparent;}</style>
 		<?php
 
-		if ( 'success' ===  $interim_login )
-			$classes[] = 'interim-login-success';
+		if ( 'success' ===  $interim_login ) {
+					$classes[] = 'interim-login-success';
+		}
 	}
 	$classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
@@ -165,8 +171,9 @@ 
 	 * @param string $message Login message text.
 	 */
 	$message = apply_filters( 'login_message', $message );
-	if ( !empty( $message ) )
-		echo $message . "\n";
+	if ( !empty( $message ) ) {
+			echo $message . "\n";
+	}
 
 	// In case a plugin uses $error rather than the $wp_errors object
 	if ( !empty( $error ) ) {
@@ -180,10 +187,11 @@ 
 		foreach ( $wp_error->get_error_codes() as $code ) {
 			$severity = $wp_error->get_error_data( $code );
 			foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
-				if ( 'message' == $severity )
-					$messages .= '	' . $error_message . "<br />\n";
-				else
-					$errors .= '	' . $error_message . "<br />\n";
+				if ( 'message' == $severity ) {
+									$messages .= '	' . $error_message . "<br />\n";
+				} else {
+									$errors .= '	' . $error_message . "<br />\n";
+				}
 			}
 		}
 		if ( ! empty( $errors ) ) {
@@ -248,9 +256,10 @@ 
  * @since 3.0.0
  */
 function wp_shake_js() {
-	if ( wp_is_mobile() )
-		return;
-?>
+	if ( wp_is_mobile() ) {
+			return;
+	}
+	?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function s(id,pos){g(id).left=pos+'px';}
@@ -287,8 +296,9 @@ 
 		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
 	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
 		$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
-		if ( empty( $user_data ) )
-			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+		if ( empty( $user_data ) ) {
+					$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+		}
 	} else {
 		$login = trim($_POST['user_login']);
 		$user_data = get_user_by('login', $login);
@@ -305,8 +315,9 @@ 
 	 */
 	do_action( 'lostpassword_post', $errors );
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	if ( !$user_data ) {
 		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
@@ -329,14 +340,15 @@ 
 	$message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
 	$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
 
-	if ( is_multisite() )
-		$blogname = $GLOBALS['current_site']->site_name;
-	else
-		/*
+	if ( is_multisite() ) {
+			$blogname = $GLOBALS['current_site']->site_name;
+	} else {
+			/*
 		 * The blogname option is escaped with esc_html on the way into the database
 		 * in sanitize_option we want to reverse this for the plain text arena of emails.
 		 */
 		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+	}
 
 	$title = sprintf( __('[%s] Password Reset'), $blogname );
 
@@ -365,8 +377,9 @@ 
 	 */
 	$message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
 
-	if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
-		wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+	if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) {
+			wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+	}
 
 	return true;
 }
@@ -378,31 +391,36 @@ 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';
 $errors = new WP_Error();
 
-if ( isset($_GET['key']) )
+if ( isset($_GET['key']) ) {
 	$action = 'resetpass';
+}
 
 // validate action so as to default to the login screen
-if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) )
+if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) ) {
 	$action = 'login';
+}
 
 nocache_headers();
 
 header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
 
 if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
-	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
-		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) {
+			$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+	}
 
 	$url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
-	if ( $url != get_option( 'siteurl' ) )
-		update_option( 'siteurl', $url );
-}
+	if ( $url != get_option( 'siteurl' ) ) {
+			update_option( 'siteurl', $url );
+	}
+	}
 
 //Set a cookie now to see if they are supported by the browser.
 $secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) );
 setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
-if ( SITECOOKIEPATH != COOKIEPATH )
+if ( SITECOOKIEPATH != COOKIEPATH ) {
 	setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
+}
 
 /**
  * Fires when the login form is initialized.
@@ -582,17 +600,19 @@ 
 
 	if ( ! $user || is_wp_error( $user ) ) {
 		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		if ( $user && $user->get_error_code() === 'expired_key' )
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
-		else
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+		if ( $user && $user->get_error_code() === 'expired_key' ) {
+					wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+		} else {
+					wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+		}
 		exit;
 	}
 
 	$errors = new WP_Error();
 
-	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
-		$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] ) {
+			$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+	}
 
 	/**
 	 * Fires before the password reset procedure is validated.
@@ -750,8 +770,9 @@ 
 default:
 	$secure_cookie = '';
 	$customize_login = isset( $_REQUEST['customize-login'] );
-	if ( $customize_login )
-		wp_enqueue_script( 'customize-base' );
+	if ( $customize_login ) {
+			wp_enqueue_script( 'customize-base' );
+	}
 
 	// If the user wants ssl but the session is not ssl, force a secure cookie.
 	if ( !empty($_POST['log']) && !force_ssl_admin() ) {
@@ -773,8 +794,9 @@ 
 	if ( isset( $_REQUEST['redirect_to'] ) ) {
 		$redirect_to = $_REQUEST['redirect_to'];
 		// Redirect to https if user wants ssl
-		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
-			$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') ) {
+					$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+		}
 	} else {
 		$redirect_to = admin_url();
 	}
@@ -824,12 +846,13 @@ 
 
 		if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
 			// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
-				$redirect_to = user_admin_url();
-			elseif ( is_multisite() && !$user->has_cap('read') )
-				$redirect_to = get_dashboard_url( $user->ID );
-			elseif ( !$user->has_cap('edit_posts') )
-				$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) ) {
+							$redirect_to = user_admin_url();
+			} elseif ( is_multisite() && !$user->has_cap('read') ) {
+							$redirect_to = get_dashboard_url( $user->ID );
+			} elseif ( !$user->has_cap('edit_posts') ) {
+							$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+			}
 
 			wp_redirect( $redirect_to );
 			exit();
@@ -840,26 +863,29 @@ 
 
 	$errors = $user;
 	// Clear errors if loggedout is set.
-	if ( !empty($_GET['loggedout']) || $reauth )
-		$errors = new WP_Error();
+	if ( !empty($_GET['loggedout']) || $reauth ) {
+			$errors = new WP_Error();
+	}
 
 	if ( $interim_login ) {
-		if ( ! $errors->get_error_code() )
-			$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
+		if ( ! $errors->get_error_code() ) {
+					$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
+		}
 	} else {
 		// Some parts of this script use the main login form to display a message
-		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
-			$errors->add('loggedout', __('You are now logged out.'), 'message');
-		elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
-			$errors->add('registerdisabled', __('User registration is currently not allowed.'));
-		elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
-			$errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
-			$errors->add('newpass', __('Check your email for your new password.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
-			$errors->add('registered', __('Registration complete. Please check your email.'), 'message');
-		elseif ( strpos( $redirect_to, 'about.php?updated' ) )
-			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] ) {
+					$errors->add('loggedout', __('You are now logged out.'), 'message');
+		} elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) {
+					$errors->add('registerdisabled', __('User registration is currently not allowed.'));
+		} elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) {
+					$errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
+		} elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) {
+					$errors->add('newpass', __('Check your email for your new password.'), 'message');
+		} elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) {
+					$errors->add('registered', __('Registration complete. Please check your email.'), 'message');
+		} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
+					$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+		}
 	}
 
 	/**
@@ -873,13 +899,15 @@ 
 	$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
 
 	// Clear any stale cookies.
-	if ( $reauth )
-		wp_clear_auth_cookie();
+	if ( $reauth ) {
+			wp_clear_auth_cookie();
+	}
 
 	login_header(__('Log In'), '', $errors);
 
-	if ( isset($_POST['log']) )
-		$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
+	if ( isset($_POST['log']) ) {
+			$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
+	}
 	$rememberme = ! empty( $_POST['rememberme'] );
 
 	if ( ! empty( $errors->errors ) ) {

src/wp-blog-header.php

Spacing +3 added lines, -3 removed lines

@@ -5,14 +5,14 @@
  * @package WordPress
  */
 
-if ( !isset($wp_did_header) ) {
+if ( ! isset($wp_did_header)) {
 
 	$wp_did_header = true;
 
-	require_once( dirname(__FILE__) . '/wp-load.php' );
+	require_once(dirname(__FILE__).'/wp-load.php');
 
 	wp();
 
-	require_once( ABSPATH . WPINC . '/template-loader.php' );
+	require_once(ABSPATH.WPINC.'/template-loader.php');
 
 }

src/xmlrpc.php

Indentation +8 added lines, -8 removed lines

@@ -43,15 +43,15 @@
       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
       <?php
-      /**
-       * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
-       *
-       * @link http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+	  /**
+	   * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
 	   *
-       * @since 3.5.0
-       */
-      do_action( 'xmlrpc_rsd_apis' );
-      ?>
+	   * @link http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+	   *
+	   * @since 3.5.0
+	   */
+	  do_action( 'xmlrpc_rsd_apis' );
+	  ?>
     </apis>
   </service>
 </rsd>

Spacing +15 added lines, -15 removed lines

@@ -17,19 +17,19 @@ 
 
 // A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
 // but we can do it ourself.
-if ( !isset( $HTTP_RAW_POST_DATA ) ) {
-	$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+if ( ! isset($HTTP_RAW_POST_DATA)) {
+	$HTTP_RAW_POST_DATA = file_get_contents('php://input');
 }
 
 // fix for mozBlog and other cases where '<?xml' isn't on the very first line
-if ( isset($HTTP_RAW_POST_DATA) )
+if (isset($HTTP_RAW_POST_DATA))
 	$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
 
 /** Include the bootstrap for setting up WordPress environment */
-include( dirname( __FILE__ ) . '/wp-load.php' );
+include(dirname(__FILE__).'/wp-load.php');
 
-if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+if (isset($_GET['rsd'])) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+header('Content-Type: text/xml; charset='.get_option('blog_charset'), true);
 ?>
 <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
@@ -50,7 +50,7 @@ 
 	   *
        * @since 3.5.0
        */
-      do_action( 'xmlrpc_rsd_apis' );
+      do_action('xmlrpc_rsd_apis');
       ?>
     </apis>
   </service>
@@ -59,9 +59,9 @@ 
 exit;
 }
 
-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
+include_once(ABSPATH.'wp-admin/includes/admin.php');
+include_once(ABSPATH.WPINC.'/class-IXR.php');
+include_once(ABSPATH.WPINC.'/class-wp-xmlrpc-server.php');
 
 /**
  * Posts submitted via the XML-RPC interface get that title
@@ -77,7 +77,7 @@ 
  *
  * @param string $class The name of the XML-RPC server class.
  */
-$wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );
+$wp_xmlrpc_server_class = apply_filters('wp_xmlrpc_server_class', 'wp_xmlrpc_server');
 $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
 
 // Fire off the request
@@ -94,8 +94,8 @@ 
  * @param string $io Whether input or output
  * @param string $msg Information describing logging reason.
  */
-function logIO( $io, $msg ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'error_log()' );
-	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) )
-		error_log( $io . ' - ' . $msg );
+function logIO($io, $msg) {
+	_deprecated_function(__FUNCTION__, '3.4', 'error_log()');
+	if ( ! empty($GLOBALS['xmlrpc_logging']))
+		error_log($io.' - '.$msg);
 }
\ No newline at end of file

Braces +6 added lines, -4 removed lines

@@ -22,8 +22,9 @@ 
 }
 
 // fix for mozBlog and other cases where '<?xml' isn't on the very first line
-if ( isset($HTTP_RAW_POST_DATA) )
+if ( isset($HTTP_RAW_POST_DATA) ) {
 	$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
+}
 
 /** Include the bootstrap for setting up WordPress environment */
 include( dirname( __FILE__ ) . '/wp-load.php' );
@@ -96,6 +97,7 @@ 
  */
 function logIO( $io, $msg ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'error_log()' );
-	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) )
-		error_log( $io . ' - ' . $msg );
-}
\ No newline at end of file
+	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) ) {
+			error_log( $io . ' - ' . $msg );
+	}
+	}
\ No newline at end of file

src/wp-signup.php

Indentation +4 added lines, -4 removed lines

@@ -723,10 +723,10 @@
 </div>
 <?php
 /**
- * Fires after the sign-up forms, before wp_footer.
- *
- * @since 3.0.0
- */
+	 * Fires after the sign-up forms, before wp_footer.
+	 *
+	 * @since 3.0.0
+	 */
 do_action( 'after_signup_form' ); ?>
 
 <?php get_footer(); ?>

Spacing +170 added lines, -170 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require(dirname(__FILE__).'/wp-load.php');
 
-add_action( 'wp_head', 'wp_no_robots' );
+add_action('wp_head', 'wp_no_robots');
 
-require( dirname( __FILE__ ) . '/wp-blog-header.php' );
+require(dirname(__FILE__).'/wp-blog-header.php');
 
-if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
-	wp_redirect( network_home_url() );
+if (is_array(get_site_option('illegal_names')) && isset($_GET['new']) && in_array($_GET['new'], get_site_option('illegal_names'))) {
+	wp_redirect(network_home_url());
 	die();
 }
 
@@ -23,17 +23,17 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'signup_header' );
+	do_action('signup_header');
 }
-add_action( 'wp_head', 'do_signup_header' );
+add_action('wp_head', 'do_signup_header');
 
-if ( !is_multisite() ) {
-	wp_redirect( wp_registration_url() );
+if ( ! is_multisite()) {
+	wp_redirect(wp_registration_url());
 	die();
 }
 
-if ( !is_main_site() ) {
-	wp_redirect( network_site_url( 'wp-signup.php' ) );
+if ( ! is_main_site()) {
+	wp_redirect(network_site_url('wp-signup.php'));
 	die();
 }
 
@@ -45,7 +45,7 @@ 
  *
  * @since 4.4.0
  */
-do_action( 'before_signup_header' );
+do_action('before_signup_header');
 
 /**
  * Prints styles for front-end Multisite signup pages
@@ -73,15 +73,15 @@ 
 	<?php
 }
 
-add_action( 'wp_head', 'wpmu_signup_stylesheet' );
-get_header( 'wp-signup' );
+add_action('wp_head', 'wpmu_signup_stylesheet');
+get_header('wp-signup');
 
 /**
  * Fires before the site sign-up form.
  *
  * @since 3.0.0
  */
-do_action( 'before_signup_form' );
+do_action('before_signup_form');
 ?>
 <div id="signup-content" class="widecolumn">
 <div class="mu_register wp-signup-container">
@@ -95,35 +95,35 @@ 
  * @param string $blog_title The new site title
  * @param array $errors
  */
-function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
+function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
 	$current_site = get_current_site();
 	// Blog name
-	if ( !is_subdomain_install() )
-		echo '<label for="blogname">' . __('Site Name:') . '</label>';
+	if ( ! is_subdomain_install())
+		echo '<label for="blogname">'.__('Site Name:').'</label>';
 	else
-		echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+		echo '<label for="blogname">'.__('Site Domain:').'</label>';
 
-	if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+	if ($errmsg = $errors->get_error_message('blogname')) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php }
 
-	if ( !is_subdomain_install() )
-		echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
+	if ( ! is_subdomain_install())
+		echo '<span class="prefix_address">'.$current_site->domain.$current_site->path.'</span><input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><br />';
 	else
-		echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
+		echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.'.($site_domain = preg_replace('|^www\.|', '', $current_site->domain)).'</span><br />';
 
-	if ( !is_user_logged_in() ) {
-		if ( !is_subdomain_install() )
-			$site = $current_site->domain . $current_site->path . __( 'sitename' );
+	if ( ! is_user_logged_in()) {
+		if ( ! is_subdomain_install())
+			$site = $current_site->domain.$current_site->path.__('sitename');
 		else
-			$site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
-		echo '<p>(<strong>' . sprintf( __('Your address will be %s.'), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
+			$site = __('domain').'.'.$site_domain.$current_site->path;
+		echo '<p>(<strong>'.sprintf(__('Your address will be %s.'), $site).'</strong>) '.__('Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!').'</p>';
 	}
 
 	// Blog Title
 	?>
 	<label for="blog_title"><?php _e('Site Title:') ?></label>
-	<?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
+	<?php if ($errmsg = $errors->get_error_message('blog_title')) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php }
 	echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />';
@@ -133,30 +133,30 @@ 
 	// Site Language.
 	$languages = signup_get_available_languages();
 
-	if ( ! empty( $languages ) ) :
+	if ( ! empty($languages)) :
 		?>
 		<p>
-			<label for="site-language"><?php _e( 'Site Language:' ); ?></label>
+			<label for="site-language"><?php _e('Site Language:'); ?></label>
 			<?php
 			// Network default.
-			$lang = get_site_option( 'WPLANG' );
+			$lang = get_site_option('WPLANG');
 
-			if ( isset( $_POST['WPLANG'] ) ) {
+			if (isset($_POST['WPLANG'])) {
 				$lang = $_POST['WPLANG'];
 			}
 
 			// Use US English if the default isn't available.
-			if ( ! in_array( $lang, $languages ) ) {
+			if ( ! in_array($lang, $languages)) {
 				$lang = '';
 			}
 
-			wp_dropdown_languages( array(
+			wp_dropdown_languages(array(
 				'name'                        => 'WPLANG',
 				'id'                          => 'site-language',
 				'selected'                    => $lang,
 				'languages'                   => $languages,
 				'show_available_translations' => false,
-			) );
+			));
 			?>
 		</p>
 	<?php endif; // Languages. ?>
@@ -164,15 +164,15 @@ 
 	<div id="privacy">
         <p class="privacy-intro">
             <label for="blog_public_on"><?php _e('Privacy:') ?></label>
-            <?php _e( 'Allow search engines to index this site.' ); ?>
+            <?php _e('Allow search engines to index this site.'); ?>
             <br style="clear:both" />
             <label class="checkbox" for="blog_public_on">
-                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
-                <strong><?php _e( 'Yes' ); ?></strong>
+                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if ( ! isset($_POST['blog_public']) || $_POST['blog_public'] == '1') { ?>checked="checked"<?php } ?> />
+                <strong><?php _e('Yes'); ?></strong>
             </label>
             <label class="checkbox" for="blog_public_off">
-                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if ( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
-                <strong><?php _e( 'No' ); ?></strong>
+                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if (isset($_POST['blog_public']) && $_POST['blog_public'] == '0') { ?>checked="checked"<?php } ?> />
+                <strong><?php _e('No'); ?></strong>
             </label>
         </p>
 	</div>
@@ -185,7 +185,7 @@ 
 	 *
 	 * @param array $errors An array possibly containing 'blogname' or 'blog_title' errors.
 	 */
-	do_action( 'signup_blogform', $errors );
+	do_action('signup_blogform', $errors);
 }
 
 /**
@@ -197,7 +197,7 @@ 
  */
 function validate_blog_form() {
 	$user = '';
-	if ( is_user_logged_in() )
+	if (is_user_logged_in())
 		$user = wp_get_current_user();
 
 	return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
@@ -214,22 +214,22 @@ 
  */
 function show_user_form($user_name = '', $user_email = '', $errors = '') {
 	// User name
-	echo '<label for="user_name">' . __('Username:') . '</label>';
-	if ( $errmsg = $errors->get_error_message('user_name') ) {
+	echo '<label for="user_name">'.__('Username:').'</label>';
+	if ($errmsg = $errors->get_error_message('user_name')) {
 		echo '<p class="error">'.$errmsg.'</p>';
 	}
-	echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr($user_name) .'" maxlength="60" /><br />';
-	_e( '(Must be at least 4 characters, letters and numbers only.)' );
+	echo '<input name="user_name" type="text" id="user_name" value="'.esc_attr($user_name).'" maxlength="60" /><br />';
+	_e('(Must be at least 4 characters, letters and numbers only.)');
 	?>
 
-	<label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
-	<?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
+	<label for="user_email"><?php _e('Email&nbsp;Address:') ?></label>
+	<?php if ($errmsg = $errors->get_error_message('user_email')) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php } ?>
 	<input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
 	<?php
-	if ( $errmsg = $errors->get_error_message('generic') ) {
-		echo '<p class="error">' . $errmsg . '</p>';
+	if ($errmsg = $errors->get_error_message('generic')) {
+		echo '<p class="error">'.$errmsg.'</p>';
 	}
 	/**
 	 * Fires at the end of the user registration form on the site sign-up form.
@@ -238,7 +238,7 @@ 
 	 *
 	 * @param array $errors An array possibly containing 'user_name' or 'user_email' errors.
 	 */
-	do_action( 'signup_extra_fields', $errors );
+	do_action('signup_extra_fields', $errors);
 }
 
 /**
@@ -261,10 +261,10 @@ 
  * @param string $blog_title The new site title.
  * @param array $errors
  */
-function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
+function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
 	$current_user = wp_get_current_user();
 
-	if ( ! is_wp_error($errors) ) {
+	if ( ! is_wp_error($errors)) {
 		$errors = new WP_Error();
 	}
 
@@ -287,34 +287,34 @@ 
 	 *     @type array  $errors     An array possibly containing 'blogname' or 'blog_title' errors.
 	 * }
 	 */
-	$filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults );
+	$filtered_results = apply_filters('signup_another_blog_init', $signup_defaults);
 
 	$blogname = $filtered_results['blogname'];
 	$blog_title = $filtered_results['blog_title'];
 	$errors = $filtered_results['errors'];
 
-	echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_current_site()->site_name ) . '</h2>';
+	echo '<h2>'.sprintf(__('Get <em>another</em> %s site in seconds'), get_current_site()->site_name).'</h2>';
 
-	if ( $errors->get_error_code() ) {
-		echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
+	if ($errors->get_error_code()) {
+		echo '<p>'.__('There was a problem, please correct the form below and try again.').'</p>';
 	}
 	?>
-	<p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p>
+	<p><?php printf(__('Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!'), $current_user->display_name) ?></p>
 
 	<?php
 	$blogs = get_blogs_of_user($current_user->ID);
-	if ( !empty($blogs) ) { ?>
+	if ( ! empty($blogs)) { ?>
 
-			<p><?php _e( 'Sites you are already a member of:' ) ?></p>
+			<p><?php _e('Sites you are already a member of:') ?></p>
 			<ul>
-				<?php foreach ( $blogs as $blog ) {
-					$home_url = get_home_url( $blog->userblog_id );
-					echo '<li><a href="' . esc_url( $home_url ) . '">' . $home_url . '</a></li>';
+				<?php foreach ($blogs as $blog) {
+					$home_url = get_home_url($blog->userblog_id);
+					echo '<li><a href="'.esc_url($home_url).'">'.$home_url.'</a></li>';
 				} ?>
 			</ul>
 	<?php } ?>
 
-	<p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
+	<p><?php _e('If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!') ?></p>
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="gimmeanotherblog" />
 		<?php
@@ -326,10 +326,10 @@ 
 		 * @param string $context A string describing the steps of the sign-up process. The value can be
 		 *                        'create-another-site', 'validate-user', or 'validate-site'.
 		 */
-		do_action( 'signup_hidden_fields', 'create-another-site' );
+		do_action('signup_hidden_fields', 'create-another-site');
 		?>
 		<?php show_blog_form($blogname, $blog_title, $errors); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Create Site') ?>" /></p>
 	</form>
 	<?php
 }
@@ -345,7 +345,7 @@ 
 function validate_another_blog_signup() {
 	global $wpdb, $blogname, $blog_title, $errors, $domain, $path;
 	$current_user = wp_get_current_user();
-	if ( ! is_user_logged_in() ) {
+	if ( ! is_user_logged_in()) {
 		die();
 	}
 
@@ -358,7 +358,7 @@ 
 	$blog_title = $result['blog_title'];
 	$errors = $result['errors'];
 
-	if ( $errors->get_error_code() ) {
+	if ($errors->get_error_code()) {
 		signup_another_blog($blogname, $blog_title, $errors);
 		return false;
 	}
@@ -371,14 +371,14 @@ 
 	);
 
 	// Handle the language setting for the new site.
-	if ( ! empty( $_POST['WPLANG'] ) ) {
+	if ( ! empty($_POST['WPLANG'])) {
 
 		$languages = signup_get_available_languages();
 
-		if ( in_array( $_POST['WPLANG'], $languages ) ) {
-			$language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) );
+		if (in_array($_POST['WPLANG'], $languages)) {
+			$language = wp_unslash(sanitize_text_field($_POST['WPLANG']));
 
-			if ( $language ) {
+			if ($language) {
 				$blog_meta_defaults['WPLANG'] = $language;
 			}
 		}
@@ -393,7 +393,7 @@ 
 	 *
 	 * @param array $blog_meta_defaults An array of default blog meta variables.
 	 */
-	$meta_defaults = apply_filters( 'signup_create_blog_meta', $blog_meta_defaults );
+	$meta_defaults = apply_filters('signup_create_blog_meta', $blog_meta_defaults);
 
 	/**
 	 * Filter the new default site meta variables.
@@ -407,15 +407,15 @@ 
 	 *     @type int $blog_public Whether search engines should be discouraged from indexing the site. 1 for true, 0 for false.
 	 * }
 	 */
-	$meta = apply_filters( 'add_signup_meta', $meta_defaults );
+	$meta = apply_filters('add_signup_meta', $meta_defaults);
 
-	$blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
+	$blog_id = wpmu_create_blog($domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid);
 
-	if ( is_wp_error( $blog_id ) ) {
+	if (is_wp_error($blog_id)) {
 		return false;
 	}
 
-	confirm_another_blog_signup( $domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id );
+	confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta, $blog_id);
 	return true;
 }
 
@@ -433,31 +433,31 @@ 
  * @param array  $meta       Any additional meta from the 'add_signup_meta' filter in validate_blog_signup().
  * @param int    $blog_id    The site ID.
  */
-function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0 ) {
+function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = array(), $blog_id = 0) {
 
-	if ( $blog_id ) {
-		switch_to_blog( $blog_id );
-		$home_url  = home_url( '/' );
+	if ($blog_id) {
+		switch_to_blog($blog_id);
+		$home_url  = home_url('/');
 		$login_url = wp_login_url();
 		restore_current_blog();
 	} else {
-		$home_url  = 'http://' . $domain . $path;
-		$login_url = 'http://' . $domain . $path . 'wp-login.php';
+		$home_url  = 'http://'.$domain.$path;
+		$login_url = 'http://'.$domain.$path.'wp-login.php';
 	}
 
-	$site = sprintf( '<a href="%1$s">%2$s</a>',
-		esc_url( $home_url ),
+	$site = sprintf('<a href="%1$s">%2$s</a>',
+		esc_url($home_url),
 		$blog_title
 	);
 
 	?>
-	<h2><?php printf( __( 'The site %s is yours.' ), $site ); ?></h2>
+	<h2><?php printf(__('The site %s is yours.'), $site); ?></h2>
 	<p>
 		<?php printf(
-			__( '<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ),
-			esc_url( $home_url ),
-			untrailingslashit( $domain . $path ),
-			esc_url( $login_url ),
+			__('<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.'),
+			esc_url($home_url),
+			untrailingslashit($domain.$path),
+			esc_url($login_url),
 			$user_name
 		); ?>
 	</p>
@@ -467,7 +467,7 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'signup_finished' );
+	do_action('signup_finished');
 }
 
 /**
@@ -479,13 +479,13 @@ 
  * @param string $user_email The user's email
  * @param array $errors
  */
-function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
+function signup_user($user_name = '', $user_email = '', $errors = '') {
 	global $active_signup;
 
-	if ( !is_wp_error($errors) )
+	if ( ! is_wp_error($errors))
 		$errors = new WP_Error();
 
-	$signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
+	$signup_for = isset($_POST['signup_for']) ? esc_html($_POST['signup_for']) : 'blog';
 
 	$signup_user_defaults = array(
 		'user_name'  => $user_name,
@@ -506,32 +506,32 @@ 
 	 *     @type array  $errors     An array of possible errors relevant to the sign-up user.
 	 * }
 	 */
-	$filtered_results = apply_filters( 'signup_user_init', $signup_user_defaults );
+	$filtered_results = apply_filters('signup_user_init', $signup_user_defaults);
 	$user_name = $filtered_results['user_name'];
 	$user_email = $filtered_results['user_email'];
 	$errors = $filtered_results['errors'];
 
 	?>
 
-	<h2><?php printf( __( 'Get your own %s account in seconds' ), get_current_site()->site_name ) ?></h2>
+	<h2><?php printf(__('Get your own %s account in seconds'), get_current_site()->site_name) ?></h2>
 	<form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
 		<input type="hidden" name="stage" value="validate-user-signup" />
 		<?php
 		/** This action is documented in wp-signup.php */
-		do_action( 'signup_hidden_fields', 'validate-user' );
+		do_action('signup_hidden_fields', 'validate-user');
 		?>
 		<?php show_user_form($user_name, $user_email, $errors); ?>
 
 		<p>
-		<?php if ( $active_signup == 'blog' ) { ?>
+		<?php if ($active_signup == 'blog') { ?>
 			<input id="signupblog" type="hidden" name="signup_for" value="blog" />
-		<?php } elseif ( $active_signup == 'user' ) { ?>
+		<?php } elseif ($active_signup == 'user') { ?>
 			<input id="signupblog" type="hidden" name="signup_for" value="user" />
 		<?php } else { ?>
-			<input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
+			<input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked($signup_for, 'blog'); ?> />
 			<label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
 			<br />
-			<input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
+			<input id="signupuser" type="radio" name="signup_for" value="user" <?php checked($signup_for, 'user'); ?> />
 			<label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
 		<?php } ?>
 		</p>
@@ -554,18 +554,18 @@ 
 	$user_email = $result['user_email'];
 	$errors = $result['errors'];
 
-	if ( $errors->get_error_code() ) {
+	if ($errors->get_error_code()) {
 		signup_user($user_name, $user_email, $errors);
 		return false;
 	}
 
-	if ( 'blog' == $_POST['signup_for'] ) {
+	if ('blog' == $_POST['signup_for']) {
 		signup_blog($user_name, $user_email);
 		return false;
 	}
 
 	/** This filter is documented in wp-signup.php */
-	wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
+	wpmu_signup_user($user_name, $user_email, apply_filters('add_signup_meta', array()));
 
 	confirm_user_signup($user_name, $user_email);
 	return true;
@@ -582,14 +582,14 @@ 
 function confirm_user_signup($user_name, $user_email) {
 	?>
 	<h2><?php /* translators: %s: username */
-	printf( __( '%s is your new username' ), $user_name) ?></h2>
-	<p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
+	printf(__('%s is your new username'), $user_name) ?></h2>
+	<p><?php _e('But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p>
 	<p><?php /* translators: %s: email address */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
-	<p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
+	printf(__('Check your inbox at %s and click the link given.'), '<strong>'.$user_email.'</strong>'); ?></p>
+	<p><?php _e('If you do not activate your username within two days, you will have to sign up again.'); ?></p>
 	<?php
 	/** This action is documented in wp-signup.php */
-	do_action( 'signup_finished' );
+	do_action('signup_finished');
 }
 
 /**
@@ -604,7 +604,7 @@ 
  * @param array $errors
  */
 function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
-	if ( !is_wp_error($errors) )
+	if ( ! is_wp_error($errors))
 		$errors = new WP_Error();
 
 	$signup_blog_defaults = array(
@@ -630,7 +630,7 @@ 
 	 *     @type array  $errors     An array of possible errors relevant to new site creation variables.
 	 * }
 	 */
-	$filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );
+	$filtered_results = apply_filters('signup_blog_init', $signup_blog_defaults);
 
 	$user_name = $filtered_results['user_name'];
 	$user_email = $filtered_results['user_email'];
@@ -638,7 +638,7 @@ 
 	$blog_title = $filtered_results['blog_title'];
 	$errors = $filtered_results['errors'];
 
-	if ( empty($blogname) )
+	if (empty($blogname))
 		$blogname = $user_name;
 	?>
 	<form id="setupform" method="post" action="wp-signup.php">
@@ -647,7 +647,7 @@ 
 		<input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
 		<?php
 		/** This action is documented in wp-signup.php */
-		do_action( 'signup_hidden_fields', 'validate-site' );
+		do_action('signup_hidden_fields', 'validate-site');
 		?>
 		<?php show_blog_form($blogname, $blog_title, $errors); ?>
 		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
@@ -664,40 +664,40 @@ 
  */
 function validate_blog_signup() {
 	// Re-validate user info.
-	$user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
+	$user_result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
 	$user_name = $user_result['user_name'];
 	$user_email = $user_result['user_email'];
 	$user_errors = $user_result['errors'];
 
-	if ( $user_errors->get_error_code() ) {
-		signup_user( $user_name, $user_email, $user_errors );
+	if ($user_errors->get_error_code()) {
+		signup_user($user_name, $user_email, $user_errors);
 		return false;
 	}
 
-	$result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
+	$result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']);
 	$domain = $result['domain'];
 	$path = $result['path'];
 	$blogname = $result['blogname'];
 	$blog_title = $result['blog_title'];
 	$errors = $result['errors'];
 
-	if ( $errors->get_error_code() ) {
+	if ($errors->get_error_code()) {
 		signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
 		return false;
 	}
 
 	$public = (int) $_POST['blog_public'];
-	$signup_meta = array ('lang_id' => 1, 'public' => $public);
+	$signup_meta = array('lang_id' => 1, 'public' => $public);
 
 	// Handle the language setting for the new site.
-	if ( ! empty( $_POST['WPLANG'] ) ) {
+	if ( ! empty($_POST['WPLANG'])) {
 
 		$languages = signup_get_available_languages();
 
-		if ( in_array( $_POST['WPLANG'], $languages ) ) {
-			$language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) );
+		if (in_array($_POST['WPLANG'], $languages)) {
+			$language = wp_unslash(sanitize_text_field($_POST['WPLANG']));
 
-			if ( $language ) {
+			if ($language) {
 				$signup_meta['WPLANG'] = $language;
 			}
 		}
@@ -705,7 +705,7 @@ 
 	}
 
 	/** This filter is documented in wp-signup.php */
-	$meta = apply_filters( 'add_signup_meta', $signup_meta );
+	$meta = apply_filters('add_signup_meta', $signup_meta);
 
 	wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
 	confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
@@ -724,27 +724,27 @@ 
  * @param string $user_email The user's email address
  * @param array $meta Any additional meta from the 'add_signup_meta' filter in validate_blog_signup()
  */
-function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
+function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array()) {
 	?>
 	<h2><?php /* translators: %s: site address */
-	printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+	printf(__('Congratulations! Your new site, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>") ?></h2>
 
-	<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
+	<p><?php _e('But, before you can start using your site, <strong>you must activate it</strong>.') ?></p>
 	<p><?php /* translators: %s: email address */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
-	<p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
-	<h2><?php _e( 'Still waiting for your email?' ); ?></h2>
+	printf(__('Check your inbox at %s and click the link given.'), '<strong>'.$user_email.'</strong>'); ?></p>
+	<p><?php _e('If you do not activate your site within two days, you will have to sign up again.'); ?></p>
+	<h2><?php _e('Still waiting for your email?'); ?></h2>
 	<p>
-		<?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
+		<?php _e('If you haven&#8217;t received your email yet, there are a number of things you can do:') ?>
 		<ul id="noemail-tips">
-			<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
-			<li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
-			<li><?php printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
+			<li><p><strong><?php _e('Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.') ?></strong></p></li>
+			<li><p><?php _e('Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.') ?></p></li>
+			<li><?php printf(__('Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.'), $user_email) ?></li>
 		</ul>
 	</p>
 	<?php
 	/** This action is documented in wp-signup.php */
-	do_action( 'signup_finished' );
+	do_action('signup_finished');
 }
 
 /**
@@ -769,7 +769,7 @@ 
 	 *
 	 * @param array $available_languages Available languages.
 	 */
-	$languages = (array) apply_filters( 'signup_get_available_languages', get_available_languages() );
+	$languages = (array) apply_filters('signup_get_available_languages', get_available_languages());
 
 	/*
 	 * Strip any non-installed languages and return.
@@ -777,11 +777,11 @@ 
 	 * Re-call get_available_languages() here in case a language pack was installed
 	 * in a callback hooked to the 'signup_get_available_languages' filter before this point.
 	 */
-	return array_intersect_assoc( $languages, get_available_languages() );
+	return array_intersect_assoc($languages, get_available_languages());
 }
 
 // Main
-$active_signup = get_site_option( 'registration', 'none' );
+$active_signup = get_site_option('registration', 'none');
 /**
  * Filter the type of site sign-up.
  *
@@ -790,7 +790,7 @@ 
  * @param string $active_signup String that returns registration type. The value can be
  *                              'all', 'none', 'blog', or 'user'.
  */
-$active_signup = apply_filters( 'wpmu_active_signup', $active_signup );
+$active_signup = apply_filters('wpmu_active_signup', $active_signup);
 
 // Make the signup type translatable.
 $i18n_signup['all'] = _x('all', 'Multisite active signup type');
@@ -798,65 +798,65 @@ 
 $i18n_signup['blog'] = _x('blog', 'Multisite active signup type');
 $i18n_signup['user'] = _x('user', 'Multisite active signup type');
 
-if ( is_super_admin() )
-	echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+if (is_super_admin())
+	echo '<div class="mu_alert">'.sprintf(__('Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.'), $i18n_signup[$active_signup], esc_url(network_admin_url('settings.php'))).'</div>';
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
 
 $current_user = wp_get_current_user();
-if ( $active_signup == 'none' ) {
-	_e( 'Registration has been disabled.' );
-} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
-	$login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
-	echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
+if ($active_signup == 'none') {
+	_e('Registration has been disabled.');
+} elseif ($active_signup == 'blog' && ! is_user_logged_in()) {
+	$login_url = wp_login_url(network_site_url('wp-signup.php'));
+	echo sprintf(__('You must first <a href="%s">log in</a>, and then you can create a new site.'), $login_url);
 } else {
-	$stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default';
-	switch ( $stage ) {
+	$stage = isset($_POST['stage']) ? $_POST['stage'] : 'default';
+	switch ($stage) {
 		case 'validate-user-signup' :
-			if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
+			if ($active_signup == 'all' || $_POST['signup_for'] == 'blog' && $active_signup == 'blog' || $_POST['signup_for'] == 'user' && $active_signup == 'user')
 				validate_user_signup();
 			else
-				_e( 'User registration has been disabled.' );
+				_e('User registration has been disabled.');
 		break;
 		case 'validate-blog-signup':
-			if ( $active_signup == 'all' || $active_signup == 'blog' )
+			if ($active_signup == 'all' || $active_signup == 'blog')
 				validate_blog_signup();
 			else
-				_e( 'Site registration has been disabled.' );
+				_e('Site registration has been disabled.');
 			break;
 		case 'gimmeanotherblog':
 			validate_another_blog_signup();
 			break;
 		case 'default':
 		default :
-			$user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : '';
+			$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';
 			/**
 			 * Fires when the site sign-up form is sent.
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'preprocess_signup_form' );
-			if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
+			do_action('preprocess_signup_form');
+			if (is_user_logged_in() && ($active_signup == 'all' || $active_signup == 'blog'))
 				signup_another_blog($newblogname);
-			elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) )
-				signup_user( $newblogname, $user_email );
-			elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) )
-				_e( 'Sorry, new registrations are not allowed at this time.' );
+			elseif ( ! is_user_logged_in() && ($active_signup == 'all' || $active_signup == 'user'))
+				signup_user($newblogname, $user_email);
+			elseif ( ! is_user_logged_in() && ($active_signup == 'blog'))
+				_e('Sorry, new registrations are not allowed at this time.');
 			else
-				_e( 'You are logged in already. No need to register again!' );
+				_e('You are logged in already. No need to register again!');
 
-			if ( $newblogname ) {
-				$newblog = get_blogaddress_by_name( $newblogname );
+			if ($newblogname) {
+				$newblog = get_blogaddress_by_name($newblogname);
 
-				if ( $active_signup == 'blog' || $active_signup == 'all' )
+				if ($active_signup == 'blog' || $active_signup == 'all')
 					/* translators: %s: site address */
-					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
-						'<strong>' . $newblog . '</strong>'
+					printf('<p><em>'.__('The site you were looking for, %s, does not exist, but you can create it now!').'</em></p>',
+						'<strong>'.$newblog.'</strong>'
 					);
 				else
 					/* translators: %s: site address */
-					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
-						'<strong>' . $newblog . '</strong>'
+					printf('<p><em>'.__('The site you were looking for, %s, does not exist.').'</em></p>',
+						'<strong>'.$newblog.'</strong>'
 					);
 			}
 			break;
@@ -871,6 +871,6 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'after_signup_form' ); ?>
+do_action('after_signup_form'); ?>
 
-<?php get_footer( 'wp-signup' );
+<?php get_footer('wp-signup');

Braces +53 added lines, -41 removed lines

@@ -98,25 +98,28 @@ 
 function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 	$current_site = get_current_site();
 	// Blog name
-	if ( !is_subdomain_install() )
-		echo '<label for="blogname">' . __('Site Name:') . '</label>';
-	else
-		echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+	if ( !is_subdomain_install() ) {
+			echo '<label for="blogname">' . __('Site Name:') . '</label>';
+	} else {
+			echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+	}
 
 	if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
 		<p class="error"><?php echo $errmsg ?></p>
 	<?php }
 
-	if ( !is_subdomain_install() )
-		echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
-	else
-		echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
+	if ( !is_subdomain_install() ) {
+			echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
+	} else {
+			echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
+	}
 
 	if ( !is_user_logged_in() ) {
-		if ( !is_subdomain_install() )
-			$site = $current_site->domain . $current_site->path . __( 'sitename' );
-		else
-			$site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
+		if ( !is_subdomain_install() ) {
+					$site = $current_site->domain . $current_site->path . __( 'sitename' );
+		} else {
+					$site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
+		}
 		echo '<p>(<strong>' . sprintf( __('Your address will be %s.'), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
 	}
 
@@ -197,8 +200,9 @@ 
  */
 function validate_blog_form() {
 	$user = '';
-	if ( is_user_logged_in() )
-		$user = wp_get_current_user();
+	if ( is_user_logged_in() ) {
+			$user = wp_get_current_user();
+	}
 
 	return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
 }
@@ -482,8 +486,9 @@ 
 function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 	global $active_signup;
 
-	if ( !is_wp_error($errors) )
-		$errors = new WP_Error();
+	if ( !is_wp_error($errors) ) {
+			$errors = new WP_Error();
+	}
 
 	$signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
 
@@ -604,8 +609,9 @@ 
  * @param array $errors
  */
 function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
-	if ( !is_wp_error($errors) )
-		$errors = new WP_Error();
+	if ( !is_wp_error($errors) ) {
+			$errors = new WP_Error();
+	}
 
 	$signup_blog_defaults = array(
 		'user_name'  => $user_name,
@@ -638,8 +644,9 @@ 
 	$blog_title = $filtered_results['blog_title'];
 	$errors = $filtered_results['errors'];
 
-	if ( empty($blogname) )
-		$blogname = $user_name;
+	if ( empty($blogname) ) {
+			$blogname = $user_name;
+	}
 	?>
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="validate-blog-signup" />
@@ -798,8 +805,9 @@ 
 $i18n_signup['blog'] = _x('blog', 'Multisite active signup type');
 $i18n_signup['user'] = _x('user', 'Multisite active signup type');
 
-if ( is_super_admin() )
+if ( is_super_admin() ) {
 	echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+}
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
 
@@ -813,16 +821,18 @@ 
 	$stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default';
 	switch ( $stage ) {
 		case 'validate-user-signup' :
-			if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
-				validate_user_signup();
-			else
-				_e( 'User registration has been disabled.' );
+			if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' ) {
+							validate_user_signup();
+			} else {
+							_e( 'User registration has been disabled.' );
+			}
 		break;
 		case 'validate-blog-signup':
-			if ( $active_signup == 'all' || $active_signup == 'blog' )
-				validate_blog_signup();
-			else
-				_e( 'Site registration has been disabled.' );
+			if ( $active_signup == 'all' || $active_signup == 'blog' ) {
+							validate_blog_signup();
+			} else {
+							_e( 'Site registration has been disabled.' );
+			}
 			break;
 		case 'gimmeanotherblog':
 			validate_another_blog_signup();
@@ -836,28 +846,30 @@ 
 			 * @since 3.0.0
 			 */
 			do_action( 'preprocess_signup_form' );
-			if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
-				signup_another_blog($newblogname);
-			elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) )
-				signup_user( $newblogname, $user_email );
-			elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) )
-				_e( 'Sorry, new registrations are not allowed at this time.' );
-			else
-				_e( 'You are logged in already. No need to register again!' );
+			if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) {
+							signup_another_blog($newblogname);
+			} elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
+							signup_user( $newblogname, $user_email );
+			} elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) {
+							_e( 'Sorry, new registrations are not allowed at this time.' );
+			} else {
+							_e( 'You are logged in already. No need to register again!' );
+			}
 
 			if ( $newblogname ) {
 				$newblog = get_blogaddress_by_name( $newblogname );
 
-				if ( $active_signup == 'blog' || $active_signup == 'all' )
-					/* translators: %s: site address */
+				if ( $active_signup == 'blog' || $active_signup == 'all' ) {
+									/* translators: %s: site address */
 					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
 						'<strong>' . $newblog . '</strong>'
 					);
-				else
-					/* translators: %s: site address */
+				} else {
+									/* translators: %s: site address */
 					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
 						'<strong>' . $newblog . '</strong>'
 					);
+				}
 			}
 			break;
 	}

src/wp-comments-post.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 /**
- * Handles Comment Post to WordPress and prevents duplicate comment posting.
- *
- * @package WordPress
- */
+	 * Handles Comment Post to WordPress and prevents duplicate comment posting.
+	 *
+	 * @package WordPress
+	 */
 
 if ( 'POST' != $_SERVER['REQUEST_METHOD'] ) {
 	header('Allow: POST');

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
  * @package WordPress
  */
 
-if ( 'POST' != $_SERVER['REQUEST_METHOD'] ) {
+if ('POST' != $_SERVER['REQUEST_METHOD']) {
 	header('Allow: POST');
 	header('HTTP/1.1 405 Method Not Allowed');
 	header('Content-Type: text/plain');
@@ -13,15 +13,15 @@ 
 }
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require(dirname(__FILE__).'/wp-load.php');
 
 nocache_headers();
 
-$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
-if ( is_wp_error( $comment ) ) {
-	$data = intval( $comment->get_error_data() );
-	if ( ! empty( $data ) ) {
-		wp_die( '<p>' . $comment->get_error_message() . '</p>', __( 'Comment Submission Failure' ), array( 'response' => $data, 'back_link' => true ) );
+$comment = wp_handle_comment_submission(wp_unslash($_POST));
+if (is_wp_error($comment)) {
+	$data = intval($comment->get_error_data());
+	if ( ! empty($data)) {
+		wp_die('<p>'.$comment->get_error_message().'</p>', __('Comment Submission Failure'), array('response' => $data, 'back_link' => true));
 	} else {
 		exit;
 	}
@@ -37,9 +37,9 @@ 
  * @param WP_Comment $comment Comment object.
  * @param WP_User    $user    User object. The user may not exist.
  */
-do_action( 'set_comment_cookies', $comment, $user );
+do_action('set_comment_cookies', $comment, $user);
 
-$location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;
+$location = empty($_POST['redirect_to']) ? get_comment_link($comment) : $_POST['redirect_to'].'#comment-'.$comment->comment_ID;
 
 /**
  * Filter the location URI to send the commenter after posting.
@@ -49,7 +49,7 @@ 
  * @param string     $location The 'redirect_to' URI sent via $_POST.
  * @param WP_Comment $comment  Comment object.
  */
-$location = apply_filters( 'comment_post_redirect', $location, $comment );
+$location = apply_filters('comment_post_redirect', $location, $comment);
 
-wp_safe_redirect( $location );
+wp_safe_redirect($location);
 exit;

src/wp-cron.php

Spacing +29 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
 
 ignore_user_abort(true);
 
-if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+if ( ! empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON'))
 	die();
 
 /**
@@ -21,9 +21,9 @@ 
  */
 define('DOING_CRON', true);
 
-if ( !defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
 	/** Set up WordPress environment */
-	require_once( dirname( __FILE__ ) . '/wp-load.php' );
+	require_once(dirname(__FILE__).'/wp-load.php');
 }
 
 /**
@@ -40,44 +40,44 @@ 
 	global $wpdb;
 
 	$value = 0;
-	if ( wp_using_ext_object_cache() ) {
+	if (wp_using_ext_object_cache()) {
 		/*
 		 * Skip local cache and force re-fetch of doing_cron transient
 		 * in case another process updated the cache.
 		 */
-		$value = wp_cache_get( 'doing_cron', 'transient', true );
+		$value = wp_cache_get('doing_cron', 'transient', true);
 	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
-		if ( is_object( $row ) )
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron'));
+		if (is_object($row))
 			$value = $row->option_value;
 	}
 
 	return $value;
 }
 
-if ( false === $crons = _get_cron_array() )
+if (false === $crons = _get_cron_array())
 	die();
 
-$keys = array_keys( $crons );
-$gmt_time = microtime( true );
+$keys = array_keys($crons);
+$gmt_time = microtime(true);
 
-if ( isset($keys[0]) && $keys[0] > $gmt_time )
+if (isset($keys[0]) && $keys[0] > $gmt_time)
 	die();
 
 
 // The cron lock: a unix timestamp from when the cron was spawned.
-$doing_cron_transient = get_transient( 'doing_cron' );
+$doing_cron_transient = get_transient('doing_cron');
 
 // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
-if ( empty( $doing_wp_cron ) ) {
-	if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
+if (empty($doing_wp_cron)) {
+	if (empty($_GET['doing_wp_cron'])) {
 		// Called from external script/job. Try setting a lock.
-		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
+		if ($doing_cron_transient && ($doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time))
 			return;
-		$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
-		set_transient( 'doing_cron', $doing_wp_cron );
+		$doing_cron_transient = $doing_wp_cron = sprintf('%.22F', microtime(true));
+		set_transient('doing_cron', $doing_wp_cron);
 	} else {
-		$doing_wp_cron = $_GET[ 'doing_wp_cron' ];
+		$doing_wp_cron = $_GET['doing_wp_cron'];
 	}
 }
 
@@ -85,25 +85,25 @@ 
  * The cron lock (a unix timestamp set when the cron was spawned),
  * must match $doing_wp_cron (the "key").
  */
-if ( $doing_cron_transient != $doing_wp_cron )
+if ($doing_cron_transient != $doing_wp_cron)
 	return;
 
-foreach ( $crons as $timestamp => $cronhooks ) {
-	if ( $timestamp > $gmt_time )
+foreach ($crons as $timestamp => $cronhooks) {
+	if ($timestamp > $gmt_time)
 		break;
 
-	foreach ( $cronhooks as $hook => $keys ) {
+	foreach ($cronhooks as $hook => $keys) {
 
-		foreach ( $keys as $k => $v ) {
+		foreach ($keys as $k => $v) {
 
 			$schedule = $v['schedule'];
 
-			if ( $schedule != false ) {
+			if ($schedule != false) {
 				$new_args = array($timestamp, $schedule, $hook, $v['args']);
 				call_user_func_array('wp_reschedule_event', $new_args);
 			}
 
-			wp_unschedule_event( $timestamp, $hook, $v['args'] );
+			wp_unschedule_event($timestamp, $hook, $v['args']);
 
 			/**
 			 * Fires scheduled events.
@@ -114,16 +114,16 @@ 
 			 * @param string $hook Name of the hook that was scheduled to be fired.
 			 * @param array  $args The arguments to be passed to the hook.
 			 */
- 			do_action_ref_array( $hook, $v['args'] );
+ 			do_action_ref_array($hook, $v['args']);
 
 			// If the hook ran too long and another cron process stole the lock, quit.
-			if ( _get_cron_lock() != $doing_wp_cron )
+			if (_get_cron_lock() != $doing_wp_cron)
 				return;
 		}
 	}
 }
 
-if ( _get_cron_lock() == $doing_wp_cron )
-	delete_transient( 'doing_cron' );
+if (_get_cron_lock() == $doing_wp_cron)
+	delete_transient('doing_cron');
 
 die();

Braces +22 added lines, -13 removed lines

@@ -11,8 +11,9 @@ 
 
 ignore_user_abort(true);
 
-if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') ) {
 	die();
+}
 
 /**
  * Tell WordPress we are doing the CRON task.
@@ -48,21 +49,24 @@ 
 		$value = wp_cache_get( 'doing_cron', 'transient', true );
 	} else {
 		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
-		if ( is_object( $row ) )
-			$value = $row->option_value;
+		if ( is_object( $row ) ) {
+					$value = $row->option_value;
+		}
 	}
 
 	return $value;
 }
 
-if ( false === $crons = _get_cron_array() )
+if ( false === $crons = _get_cron_array() ) {
 	die();
+}
 
 $keys = array_keys( $crons );
 $gmt_time = microtime( true );
 
-if ( isset($keys[0]) && $keys[0] > $gmt_time )
+if ( isset($keys[0]) && $keys[0] > $gmt_time ) {
 	die();
+}
 
 
 // The cron lock: a unix timestamp from when the cron was spawned.
@@ -72,8 +76,9 @@ 
 if ( empty( $doing_wp_cron ) ) {
 	if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
 		// Called from external script/job. Try setting a lock.
-		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
-			return;
+		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) ) {
+					return;
+		}
 		$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
 		set_transient( 'doing_cron', $doing_wp_cron );
 	} else {
@@ -85,12 +90,14 @@ 
  * The cron lock (a unix timestamp set when the cron was spawned),
  * must match $doing_wp_cron (the "key").
  */
-if ( $doing_cron_transient != $doing_wp_cron )
+if ( $doing_cron_transient != $doing_wp_cron ) {
 	return;
+}
 
 foreach ( $crons as $timestamp => $cronhooks ) {
-	if ( $timestamp > $gmt_time )
-		break;
+	if ( $timestamp > $gmt_time ) {
+			break;
+	}
 
 	foreach ( $cronhooks as $hook => $keys ) {
 
@@ -117,13 +124,15 @@ 
  			do_action_ref_array( $hook, $v['args'] );
 
 			// If the hook ran too long and another cron process stole the lock, quit.
-			if ( _get_cron_lock() != $doing_wp_cron )
-				return;
+			if ( _get_cron_lock() != $doing_wp_cron ) {
+							return;
+			}
 		}
 	}
 }
 
-if ( _get_cron_lock() == $doing_wp_cron )
+if ( _get_cron_lock() == $doing_wp_cron ) {
 	delete_transient( 'doing_cron' );
+}
 
 die();