ntwb / wordpress

tools/i18n/extract.php

Switch Indentation +29 added lines, -29 removed lines

@@ -75,35 +75,35 @@
 		for( $i = 0; $i < count( $rule ); ++$i ) {
 			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
 			switch( $rule[$i] ) {
-			case 'string':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$complete = true;
-				break;
-			case 'singular':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$entry->is_plural = true;
-				break;
-			case 'plural':
-				$entry->plural = $call['args'][$i];
-				$entry->is_plural = true;
-				$complete = true;
-				break;
-			case 'context':
-				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
-					$single_entry->context = $entry->context;
-				}
-				break;
+				case 'string':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$complete = true;
+					break;
+				case 'singular':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$entry->is_plural = true;
+					break;
+				case 'plural':
+					$entry->plural = $call['args'][$i];
+					$entry->is_plural = true;
+					$complete = true;
+					break;
+				case 'context':
+					$entry->context = $call['args'][$i];
+					foreach( $multiple as &$single_entry ) {
+						$single_entry->context = $entry->context;
+					}
+					break;
 			}
 		}
 		if ( isset( $call['line'] ) && $call['line'] ) {

src/wp-login.php

Switch Indentation +288 added lines, -288 removed lines

@@ -467,11 +467,11 @@ 
 
 switch ($action) {
 
-case 'postpass' :
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
+	case 'postpass' :
+		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
@@ -481,28 +481,28 @@ 
 	 *
 	 * @param int $expires The expiry time, as passed to setcookie().
 	 */
-	$expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
-	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
-	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 );
+		$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
+		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
@@ -511,52 +511,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>
@@ -564,68 +564,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
@@ -633,23 +633,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" />
 
 	<p class="user-pass1-wrap">
@@ -670,77 +670,77 @@ 
 	<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 = $_POST['user_login'];
-		$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 = $_POST['user_login'];
+			$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);
-?>
+		$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>
@@ -752,14 +752,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 'E-mail' field in the user registration form.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'register_form' );
-	?>
-	<p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed to you.' ); ?></p>
+		do_action( 'register_form' );
+		?>
+		<p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed 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>
@@ -771,53 +771,53 @@ 
 </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']);
-		if ( $user = get_user_by('login', $user_name) ) {
-			if ( get_user_option('use_ssl', $user->ID) ) {
-				$secure_cookie = true;
-				force_ssl_admin(true);
+	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']);
+			if ( $user = get_user_by('login', $user_name) ) {
+				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
@@ -826,62 +826,62 @@ 
 	 * @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;
-		}
+				</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 = admin_url('profile.php');
+			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 = admin_url('profile.php');
+			}
+			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', __('Session expired. Please log in again. You will not move away from this page.'), '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 e-mail for the confirmation link.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
-			$errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
-			$errors->add('registered', __('Registration complete. Please check your e-mail.'), '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', __('Session expired. Please log in again. You will not move away from this page.'), '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 e-mail for the confirmation link.'), 'message');
+			elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
+				$errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
+			elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
+				$errors->add('registered', __('Registration complete. Please check your e-mail.'), '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
@@ -889,24 +889,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>
@@ -918,42 +918,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() ); ?>" title="<?php esc_attr_e( 'Password Lost and Found' ); ?>"><?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() ); ?>" title="<?php esc_attr_e( 'Password Lost and Found' ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+	<?php endif; ?>
+	</p>
+	<?php } ?>
 
 <script type="text/javascript">
 function wp_attempt_focus(){
@@ -962,8 +962,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
@@ -976,10 +976,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');
@@ -990,9 +990,9 @@ 
 } catch(e){}
 }());
 <?php } ?>
-</script>
+	</script>
 
-<?php
-login_footer();
-break;
+	<?php
+	login_footer();
+	break;
 } // end action switch

src/wp-admin/users.php

Switch Indentation +242 added lines, -242 removed lines

@@ -97,88 +97,88 @@ 
 switch ( $wp_list_table->current_action() ) {
 
 /* Bulk Dropdown menu Role changes */
-case 'promote':
-	check_admin_referer('bulk-users');
+	case 'promote':
+		check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can’t edit that user.' ) );
+		if ( ! current_user_can( 'promote_users' ) )
+			wp_die( __( 'You can’t edit that user.' ) );
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
-
-	$editable_roles = get_editable_roles();
-	if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
-		wp_die(__('You can’t give users that role.'));
-
-	$userids = $_REQUEST['users'];
-	$update = 'promote';
-	foreach ( $userids as $id ) {
-		$id = (int) $id;
-
-		if ( ! current_user_can('promote_user', $id) )
-			wp_die(__('You can’t edit that user.'));
-		// The new role of the current user must also have the promote_users cap or be a multisite super admin
-		if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
-			&& ! ( is_multisite() && is_super_admin() ) ) {
-				$update = 'err_admin_role';
-				continue;
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit();
 		}
 
-		// If the user doesn't already belong to the blog, bail.
-		if ( is_multisite() && !is_user_member_of_blog( $id ) )
-			wp_die( __( 'Cheatin’ uh?' ), 403 );
-
-		$user = get_userdata( $id );
-		$user->set_role($_REQUEST['new_role']);
-	}
+		$editable_roles = get_editable_roles();
+		if ( empty( $editable_roles[$_REQUEST['new_role']] ) )
+			wp_die(__('You can’t give users that role.'));
 
-	wp_redirect(add_query_arg('update', $update, $redirect));
-	exit();
+		$userids = $_REQUEST['users'];
+		$update = 'promote';
+		foreach ( $userids as $id ) {
+			$id = (int) $id;
+
+			if ( ! current_user_can('promote_user', $id) )
+				wp_die(__('You can’t edit that user.'));
+			// The new role of the current user must also have the promote_users cap or be a multisite super admin
+			if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $_REQUEST['new_role'] ]->has_cap('promote_users')
+				&& ! ( is_multisite() && is_super_admin() ) ) {
+					$update = 'err_admin_role';
+					continue;
+			}
 
-case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+			// If the user doesn't already belong to the blog, bail.
+			if ( is_multisite() && !is_user_member_of_blog( $id ) )
+				wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	check_admin_referer('delete-users');
+			$user = get_userdata( $id );
+			$user->set_role($_REQUEST['new_role']);
+		}
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
+		wp_redirect(add_query_arg('update', $update, $redirect));
 		exit();
-	}
-
-	$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-	if ( empty( $_REQUEST['delete_option'] ) ) {
-		$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
-		$url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) );
-		wp_redirect( $url );
-		exit;
-	}
+	case 'dodelete':
+		if ( is_multisite() )
+			wp_die( __('User deletion is not allowed from this screen.') );
 
-	if ( ! current_user_can( 'delete_users' ) )
-		wp_die(__('You can’t delete users.'));
+		check_admin_referer('delete-users');
 
-	$update = 'del';
-	$delete_count = 0;
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can’t delete that user.' ) );
+		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-		if ( $id == $current_user->ID ) {
-			$update = 'err_admin_del';
-			continue;
-		}
-		switch ( $_REQUEST['delete_option'] ) {
-		case 'delete':
-			wp_delete_user( $id );
-			break;
-		case 'reassign':
-			wp_delete_user( $id, $_REQUEST['reassign_user'] );
-			break;
+		if ( empty( $_REQUEST['delete_option'] ) ) {
+			$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
+			$url = str_replace( '&', '&', wp_nonce_url( $url, 'bulk-users' ) );
+			wp_redirect( $url );
+			exit;
 		}
+
+		if ( ! current_user_can( 'delete_users' ) )
+			wp_die(__('You can’t delete users.'));
+
+		$update = 'del';
+		$delete_count = 0;
+
+		foreach ( $userids as $id ) {
+			if ( ! current_user_can( 'delete_user', $id ) )
+				wp_die(__( 'You can’t delete that user.' ) );
+
+			if ( $id == $current_user->ID ) {
+				$update = 'err_admin_del';
+				continue;
+			}
+			switch ( $_REQUEST['delete_option'] ) {
+				case 'delete':
+					wp_delete_user( $id );
+					break;
+				case 'reassign':
+					wp_delete_user( $id, $_REQUEST['reassign_user'] );
+					break;
+			}
 		++$delete_count;
 	}
 
@@ -186,250 +186,250 @@ 
 	wp_redirect($redirect);
 	exit();
 
-case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	case 'delete':
+		if ( is_multisite() )
+			wp_die( __('User deletion is not allowed from this screen.') );
 
-	check_admin_referer('bulk-users');
+		check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
+		if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) );
+		if ( ! current_user_can( 'delete_users' ) )
+			$errors = new WP_Error( 'edit_users', __( 'You can’t delete users.' ) );
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
-	else
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		if ( empty($_REQUEST['users']) )
+			$userids = array( intval( $_REQUEST['user'] ) );
+		else
+			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-	add_action( 'admin_head', 'delete_users_add_js' );
+		add_action( 'admin_head', 'delete_users_add_js' );
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-?>
-<form method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('delete-users') ?>
-<?php echo $referer; ?>
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
+	<form method="post" name="updateusers" id="updateusers">
+	<?php wp_nonce_field('delete-users') ?>
+	<?php echo $referer; ?>
 
 <div class="wrap">
 <h1><?php _e( 'Delete Users' ); ?></h1>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+	<?php if ( isset( $_REQUEST['error'] ) ) : ?>
 	<div class="error">
 		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
 	</div>
 <?php endif; ?>
-
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
-<?php endif; ?>
+	
+	<?php if ( 1 == count( $userids ) ) : ?>
+		<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+	<?php else : ?>
+		<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+	<?php endif; ?>
 
 <ul>
 <?php
-	$go_delete = 0;
-	foreach ( $userids as $id ) {
-		$user = get_userdata( $id );
-		if ( $id == $current_user->ID ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
-		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
-			$go_delete++;
+		$go_delete = 0;
+		foreach ( $userids as $id ) {
+			$user = get_userdata( $id );
+			if ( $id == $current_user->ID ) {
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
+			} else {
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+				$go_delete++;
+			}
 		}
-	}
-	?>
-	</ul>
-<?php if ( $go_delete ) : ?>
-	<?php if ( 1 == $go_delete ) : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+		?>
+		</ul>
+	<?php if ( $go_delete ) : ?>
+		<?php if ( 1 == $go_delete ) : ?>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
 	<?php else : ?>
-		<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
 	<?php endif; ?>
 	<ul style="list-style:none;">
 		<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
 		<?php _e('Delete all content.'); ?></label></li>
 		<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
 		<?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
-		wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
+			wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
 	</ul></fieldset>
 	<?php
-	/**
+		/**
 	 * Fires at the end of the delete users form prior to the confirm button.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param WP_User $current_user WP_User object for the user being deleted.
 	 */
-	do_action( 'delete_user_form', $current_user );
-	?>
-	<input type="hidden" name="action" value="dodelete" />
+		do_action( 'delete_user_form', $current_user );
+		?>
+		<input type="hidden" name="action" value="dodelete" />
 	<?php submit_button( __('Confirm Deletion'), 'secondary' ); ?>
-<?php else : ?>
-	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
-<?php endif; ?>
+	<?php else : ?>
+		<p><?php _e('There are no valid users selected for deletion.'); ?></p>
+	<?php endif; ?>
 </div>
 </form>
 <?php
 
-break;
+	break;
 
-case 'doremove':
-	check_admin_referer('remove-users');
+	case 'doremove':
+		check_admin_referer('remove-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! is_multisite() )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit;
-	}
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit;
+		}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! current_user_can( 'remove_users' ) )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	$userids = $_REQUEST['users'];
+		$userids = $_REQUEST['users'];
 
-	$update = 'remove';
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			$update = 'err_admin_remove';
-			continue;
-		}
-		if ( !current_user_can('remove_user', $id) ) {
-			$update = 'err_admin_remove';
-			continue;
+		$update = 'remove';
+ 		foreach ( $userids as $id ) {
+			$id = (int) $id;
+			if ( $id == $current_user->ID && !is_super_admin() ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			if ( !current_user_can('remove_user', $id) ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			remove_user_from_blog($id, $blog_id);
 		}
-		remove_user_from_blog($id, $blog_id);
-	}
 
-	$redirect = add_query_arg( array('update' => $update), $redirect);
-	wp_redirect($redirect);
-	exit;
+		$redirect = add_query_arg( array('update' => $update), $redirect);
+		wp_redirect($redirect);
+		exit;
 
-case 'remove':
+	case 'remove':
 
-	check_admin_referer('bulk-users');
+		check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! is_multisite() )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
+		if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	if ( !current_user_can('remove_users') )
-		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+		if ( !current_user_can('remove_users') )
+			$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array(intval($_REQUEST['user']));
-	else
-		$userids = $_REQUEST['users'];
+		if ( empty($_REQUEST['users']) )
+			$userids = array(intval($_REQUEST['user']));
+		else
+			$userids = $_REQUEST['users'];
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-?>
-<form method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('remove-users') ?>
-<?php echo $referer; ?>
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
+	<form method="post" name="updateusers" id="updateusers">
+	<?php wp_nonce_field('remove-users') ?>
+	<?php echo $referer; ?>
 
 <div class="wrap">
 <h1><?php _e( 'Remove Users from Site' ); ?></h1>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
-<?php endif; ?>
+	<?php if ( 1 == count( $userids ) ) : ?>
+		<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+	<?php else : ?>
+		<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+	<?php endif; ?>
 
 <ul>
 <?php
-	$go_remove = false;
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
- 		$user = get_userdata( $id );
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-		} elseif ( !current_user_can('remove_user', $id) ) {
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
-		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
-			$go_remove = true;
-		}
- 	}
- 	?>
-</ul>
-<?php if ( $go_remove ) : ?>
-		<input type="hidden" name="action" value="doremove" />
+		$go_remove = false;
+ 		foreach ( $userids as $id ) {
+			$id = (int) $id;
+ 			$user = get_userdata( $id );
+			if ( $id == $current_user->ID && !is_super_admin() ) {
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
+			} elseif ( !current_user_can('remove_user', $id) ) {
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don\'t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
+			} else {
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+				$go_remove = true;
+			}
+ 		}
+ 		?>
+	</ul>
+	<?php if ( $go_remove ) : ?>
+			<input type="hidden" name="action" value="doremove" />
 		<?php submit_button( __('Confirm Removal'), 'secondary' ); ?>
-<?php else : ?>
-	<p><?php _e('There are no valid users selected for removal.'); ?></p>
-<?php endif; ?>
+	<?php else : ?>
+		<p><?php _e('There are no valid users selected for removal.'); ?></p>
+	<?php endif; ?>
 </div>
 </form>
 <?php
 
-break;
-
-default:
+	break;
 
-	if ( !empty($_GET['_wp_http_referer']) ) {
-		wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
-		exit;
-	}
+	default:
 
-	$wp_list_table->prepare_items();
-	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-	if ( $pagenum > $total_pages && $total_pages > 0 ) {
-		wp_redirect( add_query_arg( 'paged', $total_pages ) );
-		exit;
-	}
+		if ( !empty($_GET['_wp_http_referer']) ) {
+			wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+			exit;
+		}
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+		$wp_list_table->prepare_items();
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
+			wp_redirect( add_query_arg( 'paged', $total_pages ) );
+			exit;
+		}
 
-	$messages = array();
-	if ( isset($_GET['update']) ) :
-		switch($_GET['update']) {
-		case 'del':
-		case 'del_many':
-			$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
-			if ( 1 == $delete_count ) {
-				$message = __( 'User deleted.' );
-			} else {
-				$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$messages = array();
+		if ( isset($_GET['update']) ) :
+			switch($_GET['update']) {
+				case 'del':
+				case 'del_many':
+					$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
+					if ( 1 == $delete_count ) {
+						$message = __( 'User deleted.' );
+					} else {
+						$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+					}
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
+					break;
+				case 'add':
+					if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+						$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
+							esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+								self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
+					} else {
+						$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
+					}
+					break;
+				case 'promote':
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
+					break;
+				case 'err_admin_role':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
+					break;
+				case 'err_admin_del':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
+					break;
+				case 'remove':
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
+					break;
+				case 'err_admin_remove':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __("You can't remove the current user.") . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
+					break;
 			}
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
-			break;
-		case 'add':
-			if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
-					esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-						self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
-			} else {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
-			}
-			break;
-		case 'promote':
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
-			break;
-		case 'err_admin_role':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
-			break;
-		case 'err_admin_del':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
-			break;
-		case 'remove':
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
-			break;
-		case 'err_admin_remove':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __("You can't remove the current user.") . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
-			break;
-		}
 	endif; ?>
 
 <?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>

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

Switch Indentation +30 added lines, -30 removed lines

@@ -203,36 +203,36 @@
 
 if ( isset($_GET['update']) ) :
 	switch($_GET['update']) {
-	case 'adduser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
-		break;
-	case 'err_add_member':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
-		break;
-	case 'err_add_notfound':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
-		break;
-	case 'promote':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
-		break;
-	case 'err_promote':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
-		break;
-	case 'remove':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
-		break;
-	case 'err_remove':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
-		break;
-	case 'newuser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
-		break;
-	case 'err_new':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
-		break;
-	case 'err_new_dup':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
-		break;
+		case 'adduser':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
+			break;
+		case 'err_add_member':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+			break;
+		case 'err_add_notfound':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+			break;
+		case 'promote':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+			break;
+		case 'err_promote':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+			break;
+		case 'remove':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+			break;
+		case 'err_remove':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+			break;
+		case 'newuser':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
+			break;
+		case 'err_new':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
+			break;
+		case 'err_new_dup':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
+			break;
 	}
 endif; ?>
 

src/wp-admin/edit-tags.php

Switch Indentation +83 added lines, -83 removed lines

@@ -49,119 +49,119 @@
 
 switch ( $wp_list_table->current_action() ) {
 
-case 'add-tag':
+	case 'add-tag':
 
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+		check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->edit_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+		$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
 
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+		if ( $referer = wp_get_original_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $location );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
+		if ( $ret && !is_wp_error( $ret ) )
+			$location = add_query_arg( 'message', 1, $location );
+		else
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
 
-	break;
+		break;
 
-case 'delete':
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+	case 'delete':
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
+		if ( $referer = wp_get_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
-		break;
-	}
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+		$tag_ID = (int) $_REQUEST['tag_ID'];
+		check_admin_referer( 'delete-tag_' . $tag_ID );
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->delete_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	wp_delete_term( $tag_ID, $taxonomy );
+		wp_delete_term( $tag_ID, $taxonomy );
 
-	$location = add_query_arg( 'message', 2, $location );
+		$location = add_query_arg( 'message', 2, $location );
 
-	break;
+		break;
 
-case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+	case 'bulk-delete':
+		check_admin_referer( 'bulk-tags' );
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->delete_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
-	}
+		$tags = (array) $_REQUEST['delete_tags'];
+		foreach ( $tags as $tag_ID ) {
+			wp_delete_term( $tag_ID, $taxonomy );
+		}
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
+		if ( $referer = wp_get_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	$location = add_query_arg( 'message', 6, $location );
+		$location = add_query_arg( 'message', 6, $location );
 
-	break;
+		break;
 
-case 'edit':
-	$title = $tax->labels->edit_item;
+	case 'edit':
+		$title = $tax->labels->edit_item;
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
+		$tag_ID = (int) $_REQUEST['tag_ID'];
 
-	$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-	include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+		$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		include( ABSPATH . 'wp-admin/edit-tag-form.php' );
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
-	exit;
+		exit;
 
-case 'editedtag':
-	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+	case 'editedtag':
+		$tag_ID = (int) $_POST['tag_ID'];
+		check_admin_referer( 'update-tag_' . $tag_ID );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->edit_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+		$tag = get_term( $tag_ID, $taxonomy );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+		$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
 
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+		if ( $referer = wp_get_original_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 3, $location );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
-	break;
+		if ( $ret && !is_wp_error( $ret ) )
+			$location = add_query_arg( 'message', 3, $location );
+		else
+			$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
+		break;
 }
 
 if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {

src/wp-admin/plugin-editor.php

Switch Indentation +147 added lines, -147 removed lines

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

src/wp-admin/revision.php

Switch Indentation +42 added lines, -42 removed lines

@@ -30,56 +30,56 @@
 $redirect = 'edit.php';
 
 switch ( $action ) {
-case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
+	case 'restore' :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+			break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
 
-	// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
-	if ( ! wp_revisions_enabled( $post ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
+		// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
+		if ( ! wp_revisions_enabled( $post ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
 
-	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
+		// Don't allow revision restore when post is locked
+		if ( wp_check_post_lock( $post->ID ) )
+			break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+		check_admin_referer( "restore-post_{$revision->ID}" );
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-	break;
-case 'view' :
-case 'edit' :
-default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+		wp_restore_post_revision( $revision->ID );
+		$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	case 'view' :
+	case 'edit' :
+	default :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
+
+		if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
+			break;
+
+		// Revisions disabled and we're not looking at an autosave
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
+
+		$post_edit_link = get_edit_post_link();
+		$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+		$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+		$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to post editor' ) . '</a>';
+		$title          = __( 'Revisions' );
+
+		$redirect = false;
 		break;
-
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
-		break;
-
-	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
-
-	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to post editor' ) . '</a>';
-	$title          = __( 'Revisions' );
-
-	$redirect = false;
-	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.

src/wp-admin/setup-config.php

Switch Indentation +102 added lines, -102 removed lines

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

src/wp-admin/theme-editor.php

Switch Indentation +98 added lines, -98 removed lines

@@ -76,60 +76,60 @@ 
 $scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
 
 switch( $action ) {
-case 'update':
-	check_admin_referer( 'edit-theme_' . $file . $stylesheet );
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
-	if ( is_writeable( $file ) ) {
-		// is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
-		$f = fopen( $file, 'w+' );
-		if ( $f !== false ) {
-			fwrite( $f, $newcontent );
-			fclose( $f );
-			$location .= '&updated=true';
-			$theme->cache_delete();
+	case 'update':
+		check_admin_referer( 'edit-theme_' . $file . $stylesheet );
+		$newcontent = wp_unslash( $_POST['newcontent'] );
+		$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
+		if ( is_writeable( $file ) ) {
+			// is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
+			$f = fopen( $file, 'w+' );
+			if ( $f !== false ) {
+				fwrite( $f, $newcontent );
+				fclose( $f );
+				$location .= '&updated=true';
+				$theme->cache_delete();
+			}
 		}
-	}
-	wp_redirect( $location );
-	exit;
+		wp_redirect( $location );
+		exit;
 
-default:
+	default:
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-	update_recently_edited( $file );
+		update_recently_edited( $file );
 
-	if ( ! is_file( $file ) )
-		$error = true;
+		if ( ! is_file( $file ) )
+			$error = true;
 
-	$content = '';
-	if ( ! $error && filesize( $file ) > 0 ) {
-		$f = fopen($file, 'r');
-		$content = fread($f, filesize($file));
+		$content = '';
+		if ( ! $error && filesize( $file ) > 0 ) {
+			$f = fopen($file, 'r');
+			$content = fread($f, filesize($file));
 
-		if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
-			$functions = wp_doc_link_parse( $content );
+			if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
+				$functions = wp_doc_link_parse( $content );
 
-			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function ) {
-				$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+				$docs_select = '<select name="docs-list" id="docs-list">';
+				$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
+				foreach ( $functions as $function ) {
+					$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
+				}
+				$docs_select .= '</select>';
 			}
-			$docs_select .= '</select>';
-		}
 
-		$content = esc_textarea( $content );
-	}
+			$content = esc_textarea( $content );
+		}
 
-	if ( isset( $_GET['updated'] ) ) : ?>
- <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
-<?php endif;
+		if ( isset( $_GET['updated'] ) ) : ?>
+	 <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
+	<?php endif;
 
-$description = get_file_description( $file );
-$file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
-	$description .= ' <span>(' . $file_show . ')</span>';
-?>
+	$description = get_file_description( $file );
+	$file_show = array_search( $file, array_filter( $allowed_files ) );
+	if ( $description != $file_show )
+		$description .= ' <span>(' . $file_show . ')</span>';
+	?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
@@ -142,61 +142,61 @@ 
 		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
 		<select name="theme" id="theme">
 <?php
-foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
-	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
-		continue;
+	foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
+		if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+			continue;
 
-	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
-	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
+		$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
+		echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
 }
-?>
-		</select>
+	?>
+			</select>
 		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
-	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
-?>
-	<div id="templateside">
-<?php
-if ( $allowed_files ) :
-	if ( $has_templates || $theme->parent() ) :
-?>
-	<h3><?php _e('Templates'); ?></h3>
+	if ( $theme->errors() )
+		echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+	?>
+		<div id="templateside">
+	<?php
+	if ( $allowed_files ) :
+		if ( $has_templates || $theme->parent() ) :
+	?>
+		<h3><?php _e('Templates'); ?></h3>
 	<?php if ( $theme->parent() ) : ?>
-	<p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . urlencode( $theme->get_template() ) ) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
+		<p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . urlencode( $theme->get_template() ) ) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
 	<?php endif; ?>
-	<ul>
-<?php
-	endif;
-
-	foreach ( $allowed_files as $filename => $absolute_filename ) :
-		if ( 'style.css' == $filename )
-			echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
-
-		$file_description = get_file_description( $absolute_filename );
-		if ( $file_description != basename( $filename ) )
-			$file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
-
-		if ( $absolute_filename == $file )
-			$file_description = '<span class="highlight">' . $file_description . '</span>';
-?>
-		<li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
-<?php
-	endforeach;
-?>
-</ul>
-<?php endif; ?>
-</div>
-<?php if ( $error ) :
-	echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
-else : ?>
-	<form name="template" id="template" action="theme-editor.php" method="post">
+		<ul>
+	<?php
+		endif;
+
+		foreach ( $allowed_files as $filename => $absolute_filename ) :
+			if ( 'style.css' == $filename )
+				echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n";
+
+			$file_description = get_file_description( $absolute_filename );
+			if ( $file_description != basename( $filename ) )
+				$file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
+
+			if ( $absolute_filename == $file )
+				$file_description = '<span class="highlight">' . $file_description . '</span>';
+	?>
+			<li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
+	<?php
+		endforeach;
+	?>
+	</ul>
+	<?php endif; ?>
+	</div>
+	<?php if ( $error ) :
+		echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
+	else : ?>
+		<form name="template" id="template" action="theme-editor.php" method="post">
 	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
-		<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
+			<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
 		<input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
@@ -206,26 +206,26 @@ 
 		<div id="documentation" class="hide-if-no-js">
 		<label for="docs-list"><?php _e('Documentation:') ?></label>
 		<?php echo $docs_select; ?>
-		<input type="button" class="button" value=" <?php esc_attr_e( 'Look Up' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" />
+			<input type="button" class="button" value=" <?php esc_attr_e( 'Look Up' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" />
 		</div>
 	<?php endif; ?>
 
 		<div>
 		<?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
-			<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
-			<?php _e( 'This is a file in your current parent theme.' ); ?></p>
+				<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
+				<?php _e( 'This is a file in your current parent theme.' ); ?></p>
 		<?php endif; ?>
-<?php
-	if ( is_writeable( $file ) ) :
-		submit_button( __( 'Update File' ), 'primary', 'submit', true );
-	else : ?>
-<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
-<?php endif; ?>
+	<?php
+		if ( is_writeable( $file ) ) :
+			submit_button( __( 'Update File' ), 'primary', 'submit', true );
+		else : ?>
+	<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
+	<?php endif; ?>
 		</div>
 	</form>
 <?php
-endif; // $error
-?>
+	endif; // $error
+	?>
 <br class="clear" />
 </div>
 <script type="text/javascript">
@@ -235,7 +235,7 @@ 
 });
 </script>
 <?php
-break;
+	break;
 }
 
 include(ABSPATH . 'wp-admin/admin-footer.php' );