ntwb / wordpress

src/wp-admin/user-new.php

Braces +30 added lines, -21 removed lines

@@ -118,10 +118,11 @@ 
 		if ( is_wp_error( $user_id ) ) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
-			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			if ( current_user_can( 'list_users' ) ) {
+							$redirect = 'users.php?update=add&id=' . $user_id;
+			} else {
+							$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			}
 			wp_redirect( $redirect );
 			die();
 		}
@@ -166,8 +167,9 @@ 
 $parent_file = 'users.php';
 
 $do_both = false;
-if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') ) {
 	$do_both = true;
+}
 
 $help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
 
@@ -261,8 +263,9 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
-			$messages[] = __('User added.');
+		if ( 'add' == $_GET['update'] ) {
+					$messages[] = __('User added.');
+		}
 	}
 }
 ?>
@@ -279,23 +282,26 @@ 
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
-				echo "<li>$err</li>\n";
+			foreach ( $errors->get_error_messages() as $err ) {
+							echo "<li>$err</li>\n";
+			}
 		?>
 		</ul>
 	</div>
 <?php endif;
 
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	} ?>
 
 <?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+			foreach ( $add_user_errors->get_error_messages() as $message ) {
+							echo "<p>$message</p>";
+			}
 		?>
 	</div>
 <?php endif; ?>
@@ -303,8 +309,9 @@ 
 
 <?php
 if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
+	if ( $do_both ) {
+			echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
+	}
 	if ( !is_super_admin() ) {
 		echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
 		$label = __('Email');
@@ -365,9 +372,10 @@ 
 } // is_multisite()
 
 if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
-?>
+	if ( $do_both ) {
+			echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
+	}
+	?>
 <p><?php _e('Create a brand new user and add them to this site.'); ?></p>
 <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"<?php
 	/** This action is documented in wp-admin/user-new.php */
@@ -461,8 +469,9 @@ 
 		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
-			if ( !$new_user_role )
-				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			if ( !$new_user_role ) {
+							$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			}
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>

Indentation +3 added lines, -3 removed lines

@@ -209,9 +209,9 @@
 ) );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');

Spacing +171 added lines, -171 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() ) {
-	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
+if (is_multisite()) {
+	if ( ! current_user_can('create_users') && ! current_user_can('promote_users')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to add users to this network.').'</p>',
 			403
 		);
 	}
-} elseif ( ! current_user_can( 'create_users' ) ) {
+} elseif ( ! current_user_can('create_users')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to create users.').'</p>',
 		403
 	);
 }
 
-if ( is_multisite() ) {
-	add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
+if (is_multisite()) {
+	add_filter('wpmu_signup_user_notification_email', 'admin_created_user_email');
 }
 
-if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
 	$user_details = null;
-	$user_email = wp_unslash( $_REQUEST['email'] );
-	if ( false !== strpos( $user_email, '@' ) ) {
-		$user_details = get_user_by( 'email', $user_email );
+	$user_email = wp_unslash($_REQUEST['email']);
+	if (false !== strpos($user_email, '@')) {
+		$user_details = get_user_by('email', $user_email);
 	} else {
-		if ( is_super_admin() ) {
-			$user_details = get_user_by( 'login', $user_email );
+		if (is_super_admin()) {
+			$user_details = get_user_by('login', $user_email);
 		} else {
-			wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
+			wp_redirect(add_query_arg(array('update' => 'enter_email'), 'user-new.php'));
 			die();
 		}
 	}
 
-	if ( !$user_details ) {
-		wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) );
+	if ( ! $user_details) {
+		wp_redirect(add_query_arg(array('update' => 'does_not_exist'), 'user-new.php'));
 		die();
 	}
 
-	if ( ! current_user_can( 'promote_user', $user_details->ID ) ) {
+	if ( ! current_user_can('promote_user', $user_details->ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to add users to this network.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to add users to this network.').'</p>',
 			403
 		);
 	}
@@ -63,18 +63,18 @@ 
 	$redirect = 'user-new.php';
 	$username = $user_details->user_login;
 	$user_id = $user_details->ID;
-	if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
-		$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+	if (($username != null && ! is_super_admin($user_id)) && (array_key_exists($blog_id, get_blogs_of_user($user_id)))) {
+		$redirect = add_query_arg(array('update' => 'addexisting'), 'user-new.php');
 	} else {
-		if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-			add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-			$redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' );
+		if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+			add_existing_user_to_blog(array('user_id' => $user_id, 'role' => $_REQUEST['role']));
+			$redirect = add_query_arg(array('update' => 'addnoconfirmation', 'user_id' => $user_id), 'user-new.php');
 		} else {
-			$newuser_key = substr( md5( $user_id ), 0, 5 );
-			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+			$newuser_key = substr(md5($user_id), 0, 5);
+			add_option('new_user_'.$newuser_key, array('user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST['role']));
 
 			$roles = get_editable_roles();
-			$role = $roles[ $_REQUEST['role'] ];
+			$role = $roles[$_REQUEST['role']];
 
 			/**
 			 * Fires immediately after a user is invited to join a site, but before the notification is sent.
@@ -85,59 +85,59 @@ 
 			 * @param array  $role        The role of invited user.
 			 * @param string $newuser_key The key of the invitation.
 			 */
-			do_action( 'invite_user', $user_id, $role, $newuser_key );
+			do_action('invite_user', $user_id, $role, $newuser_key);
 
-			$switched_locale = switch_to_locale( get_user_locale( $user_details ) );
+			$switched_locale = switch_to_locale(get_user_locale($user_details));
 
 			/* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
-			$message = __( 'Hi,
+			$message = __('Hi,
 
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 
 Please click the following link to confirm the invite:
 %4$s' );
-			wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
+			wp_mail($new_user_email, sprintf(__('[%s] Joining confirmation'), wp_specialchars_decode(get_option('blogname'))), sprintf($message, get_option('blogname'), home_url(), wp_specialchars_decode(translate_user_role($role['name'])), home_url("/newbloguser/$newuser_key/")));
 
-			if ( $switched_locale ) {
+			if ($switched_locale) {
 				restore_previous_locale();
 			}
 
-			$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+			$redirect = add_query_arg(array('update' => 'add'), 'user-new.php');
 		}
 	}
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	die();
-} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'create-user', '_wpnonce_create-user' );
+} elseif (isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action']) {
+	check_admin_referer('create-user', '_wpnonce_create-user');
 
-	if ( ! current_user_can( 'create_users' ) ) {
+	if ( ! current_user_can('create_users')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create users.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to create users.').'</p>',
 			403
 		);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$user_id = edit_user();
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
+			if (current_user_can('list_users'))
+				$redirect = 'users.php?update=add&id='.$user_id;
 			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
-			wp_redirect( $redirect );
+				$redirect = add_query_arg('update', 'add', 'user-new.php');
+			wp_redirect($redirect);
 			die();
 		}
 	} else {
 		// Adding a new user to this site
-		$new_user_email = wp_unslash( $_REQUEST['email'] );
-		$user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
-		if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
-			$add_user_errors = $user_details[ 'errors' ];
+		$new_user_email = wp_unslash($_REQUEST['email']);
+		$user_details = wpmu_validate_user_signup($_REQUEST['user_login'], $new_user_email);
+		if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+			$add_user_errors = $user_details['errors'];
 		} else {
 			/**
 			 * Filters the user_login, also known as the username, before it is added to the site.
@@ -146,24 +146,24 @@ 
 			 *
 			 * @param string $user_login The sanitized username.
 			 */
-			$new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
-				add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
+			$new_user_login = apply_filters('pre_user_login', sanitize_user(wp_unslash($_REQUEST['user_login']), true));
+			if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+				add_filter('wpmu_signup_user_notification', '__return_false'); // Disable confirmation email
+				add_filter('wpmu_welcome_user_notification', '__return_false'); // Disable welcome email
 			}
-			wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role'] ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-				$key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
-				$new_user = wpmu_activate_signup( $key );
-				if ( is_wp_error( $new_user ) ) {
-					$redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' );
+			wpmu_signup_user($new_user_login, $new_user_email, array('add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST['role']));
+			if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+				$key = $wpdb->get_var($wpdb->prepare("SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email));
+				$new_user = wpmu_activate_signup($key);
+				if (is_wp_error($new_user)) {
+					$redirect = add_query_arg(array('update' => 'addnoconfirmation'), 'user-new.php');
 				} else {
-					$redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' );
+					$redirect = add_query_arg(array('update' => 'addnoconfirmation', 'user_id' => $new_user['user_id']), 'user-new.php');
 				}
 			} else {
-				$redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );
+				$redirect = add_query_arg(array('update' => 'newuserconfirmation'), 'user-new.php');
 			}
-			wp_redirect( $redirect );
+			wp_redirect($redirect);
 			die();
 		}
 	}
@@ -173,49 +173,49 @@ 
 $parent_file = 'users.php';
 
 $do_both = false;
-if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+if (is_multisite() && current_user_can('promote_users') && current_user_can('create_users'))
 	$do_both = true;
 
-$help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
+$help = '<p>'.__('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.').'</p>';
 
-if ( is_multisite() ) {
-	$help .= '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' .
-	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.') . '</p>';
+if (is_multisite()) {
+	$help .= '<p>'.__('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.').'</p>'.
+	'<p>'.__('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.').'</p>';
 } else {
-	$help .= '<p>' . __('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.') . '</p>' .
+	$help .= '<p>'.__('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.').'</p>'.
 
-	'<p>' . __('By default, new users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don&#8217;t want to send the new user a welcome email.') . '</p>';
+	'<p>'.__('By default, new users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don&#8217;t want to send the new user a welcome email.').'</p>';
 }
 
-$help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
+$help .= '<p>'.__('Remember to click the Add New User button at the bottom of this screen when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'      => 'user-roles',
 'title'   => __('User Roles'),
-'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
-				'<ul>' .
-				'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
-				'<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
-				'<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
-				'<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
-				'<li>' . __('Administrators have access to all the administration features.') . '</li>' .
+'content' => '<p>'.__('Here is a basic overview of the different user roles and the permissions associated with each one:').'</p>'.
+				'<ul>'.
+				'<li>'.__('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.').'</li>'.
+				'<li>'.__('Contributors can write and manage their posts but not publish posts or upload media files.').'</li>'.
+				'<li>'.__('Authors can publish and manage their own posts, and are able to upload files.').'</li>'.
+				'<li>'.__('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.').'</li>'.
+				'<li>'.__('Administrators have access to all the administration features.').'</li>'.
 				'</ul>'
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');
-wp_enqueue_script( 'user-profile' );
+wp_enqueue_script('user-profile');
 
 /**
  * Filters whether to enable user auto-complete for non-super admins in Multisite.
@@ -224,26 +224,26 @@ 
  *
  * @param bool $enable Whether to enable auto-complete for non-super admins. Default false.
  */
-if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
-	&& ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+if (is_multisite() && current_user_can('promote_users') && ! wp_is_large_network('users')
+	&& (is_super_admin() || apply_filters('autocomplete_users_for_site_admins', false))
 ) {
-	wp_enqueue_script( 'user-suggest' );
+	wp_enqueue_script('user-suggest');
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$edit_link = '';
-		if ( ( isset( $_GET['user_id'] ) ) ) {
-			$user_id_new = absint( $_GET['user_id'] );
-			if ( $user_id_new ) {
-				$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+		if ((isset($_GET['user_id']))) {
+			$user_id_new = absint($_GET['user_id']);
+			if ($user_id_new) {
+				$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_id_new)));
 			}
 		}
 
-		switch ( $_GET['update'] ) {
+		switch ($_GET['update']) {
 			case "newuserconfirmation":
 				$messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
 				break;
@@ -251,11 +251,11 @@ 
 				$messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.');
 				break;
 			case "addnoconfirmation":
-				if ( empty( $edit_link ) ) {
-					$messages[] = __( 'User has been added to your site.' );
+				if (empty($edit_link)) {
+					$messages[] = __('User has been added to your site.');
 				} else {
 					/* translators: %s: edit page url */
-					$messages[] = sprintf( __( 'User has been added to your site. <a href="%s">Edit user</a>' ), $edit_link );
+					$messages[] = sprintf(__('User has been added to your site. <a href="%s">Edit user</a>'), $edit_link);
 				}
 				break;
 			case "addexisting":
@@ -269,40 +269,40 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
+		if ('add' == $_GET['update'])
 			$messages[] = __('User added.');
 	}
 }
 ?>
 <div class="wrap">
 <h1 id="add-new-user"><?php
-if ( current_user_can( 'create_users' ) ) {
-	_e( 'Add New User' );
-} elseif ( current_user_can( 'promote_users' ) ) {
-	_e( 'Add Existing User' );
+if (current_user_can('create_users')) {
+	_e('Add New User');
+} elseif (current_user_can('promote_users')) {
+	_e('Add Existing User');
 } ?>
 </h1>
 
-<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
+			foreach ($errors->get_error_messages() as $err)
 				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
 <?php endif;
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 } ?>
 
-<?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
+<?php if (isset($add_user_errors) && is_wp_error($add_user_errors)) : ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -310,15 +310,15 @@ 
 <div id="ajax-response"></div>
 
 <?php
-if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
-	if ( !is_super_admin() ) {
-		echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
+if (is_multisite()) {
+	if ($do_both)
+		echo '<h2 id="add-existing-user">'.__('Add Existing User').'</h2>';
+	if ( ! is_super_admin()) {
+		echo '<p>'.__('Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.').'</p>';
 		$label = __('Email');
 		$type  = 'email';
 	} else {
-		echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
+		echo '<p>'.__('Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.').'</p>';
 		$label = __('Email or Username');
 		$type  = 'text';
 	}
@@ -329,10 +329,10 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="adduser" />
-<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
+<?php wp_nonce_field('add-user', '_wpnonce_add-user') ?>
 
 <table class="form-table">
 	<tr class="form-field form-required">
@@ -342,16 +342,16 @@ 
 	<tr class="form-field">
 		<th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="adduser-role">
-			<?php wp_dropdown_roles( get_option('default_role') ); ?>
+			<?php wp_dropdown_roles(get_option('default_role')); ?>
 			</select>
 		</td>
 	</tr>
-<?php if ( current_user_can( 'manage_network_users' ) ) { ?>
+<?php if (current_user_can('manage_network_users')) { ?>
 	<tr>
-		<th scope="row"><?php _e( 'Skip Confirmation Email' ); ?></th>
+		<th scope="row"><?php _e('Skip Confirmation Email'); ?></th>
 		<td>
 			<input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" />
-			<label for="adduser-noconfirmation"><?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label>
+			<label for="adduser-noconfirmation"><?php _e('Add the user without sending an email that requires their confirmation.'); ?></label>
 		</td>
 	</tr>
 <?php } ?>
@@ -368,48 +368,48 @@ 
  *
  * @param string $type A contextual string specifying which type of new user form the hook follows.
  */
-do_action( 'user_new_form', 'add-existing-user' );
+do_action('user_new_form', 'add-existing-user');
 ?>
-<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+<?php submit_button(__('Add Existing User'), 'primary', 'adduser', true, array('id' => 'addusersub')); ?>
 </form>
 <?php
 } // is_multisite()
 
-if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
+if (current_user_can('create_users')) {
+	if ($do_both)
+		echo '<h2 id="create-new-user">'.__('Add New User').'</h2>';
 ?>
 <p><?php _e('Create a brand new user and add them to this site.'); ?></p>
 <form method="post" name="createuser" id="createuser" class="validate" novalidate="novalidate"<?php
 	/** This action is documented in wp-admin/user-new.php */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="createuser" />
-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
+<?php wp_nonce_field('create-user', '_wpnonce_create-user'); ?>
 <?php
 // Load up the passed data, else set to a default.
-$creating = isset( $_POST['createuser'] );
+$creating = isset($_POST['createuser']);
 
-$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
-$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
-$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
-$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
-$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
-$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
-$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
+$new_user_login = $creating && isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
+$new_user_firstname = $creating && isset($_POST['first_name']) ? wp_unslash($_POST['first_name']) : '';
+$new_user_lastname = $creating && isset($_POST['last_name']) ? wp_unslash($_POST['last_name']) : '';
+$new_user_email = $creating && isset($_POST['email']) ? wp_unslash($_POST['email']) : '';
+$new_user_uri = $creating && isset($_POST['url']) ? wp_unslash($_POST['url']) : '';
+$new_user_role = $creating && isset($_POST['role']) ? wp_unslash($_POST['role']) : '';
+$new_user_send_notification = $creating && ! isset($_POST['send_user_notification']) ? false : true;
+$new_user_ignore_pass = $creating && isset($_POST['noconfirmation']) ? wp_unslash($_POST['noconfirmation']) : '';
 
 ?>
 <table class="form-table">
 	<tr class="form-field form-required">
 		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
+		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr($new_user_login); ?>" aria-required="true" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 	</tr>
 	<tr class="form-field form-required">
 		<th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
+		<td><input name="email" type="email" id="email" value="<?php echo esc_attr($new_user_email); ?>" /></td>
 	</tr>
-<?php if ( !is_multisite() ) { ?>
+<?php if ( ! is_multisite()) { ?>
 	<tr class="form-field">
 		<th scope="row"><label for="first_name"><?php _e('First Name') ?> </label></th>
 		<td><input name="first_name" type="text" id="first_name" value="<?php echo esc_attr($new_user_firstname); ?>" /></td>
@@ -420,54 +420,54 @@ 
 	</tr>
 	<tr class="form-field">
 		<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
-		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
+		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
 	</tr>
 	<tr class="form-field form-required user-pass1-wrap">
 		<th scope="row">
 			<label for="pass1">
-				<?php _e( 'Password' ); ?>
-				<span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
+				<?php _e('Password'); ?>
+				<span class="description hide-if-js"><?php _e('(required)'); ?></span>
 			</label>
 		</th>
 		<td>
 			<input class="hidden" value=" " /><!-- #24364 workaround -->
-			<button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+			<button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e('Show password'); ?></button>
 			<div class="wp-pwd hide-if-js">
-				<?php $initial_password = wp_generate_password( 24 ); ?>
+				<?php $initial_password = wp_generate_password(24); ?>
 				<span class="password-input-wrapper">
-					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr($initial_password); ?>" aria-describedby="pass-strength-result" />
 				</span>
-				<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+				<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 					<span class="dashicons dashicons-hidden"></span>
-					<span class="text"><?php _e( 'Hide' ); ?></span>
+					<span class="text"><?php _e('Hide'); ?></span>
 				</button>
-				<button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-					<span class="text"><?php _e( 'Cancel' ); ?></span>
+				<button type="button" class="button wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Cancel password change'); ?>">
+					<span class="text"><?php _e('Cancel'); ?></span>
 				</button>
 				<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 			</div>
 		</td>
 	</tr>
 	<tr class="form-field form-required user-pass2-wrap hide-if-js">
-		<th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+		<th scope="row"><label for="pass2"><?php _e('Repeat Password'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
 		<td>
 		<input name="pass2" type="password" id="pass2" autocomplete="off" />
 		</td>
 	</tr>
 	<tr class="pw-weak">
-		<th><?php _e( 'Confirm Password' ); ?></th>
+		<th><?php _e('Confirm Password'); ?></th>
 		<td>
 			<label>
 				<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-				<?php _e( 'Confirm use of weak password' ); ?>
+				<?php _e('Confirm use of weak password'); ?>
 			</label>
 		</td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e( 'Send User Notification' ) ?></th>
+		<th scope="row"><?php _e('Send User Notification') ?></th>
 		<td>
-			<input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked( $new_user_send_notification ); ?> />
-			<label for="send_user_notification"><?php _e( 'Send the new user an email about their account.' ); ?></label>
+			<input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked($new_user_send_notification); ?> />
+			<label for="send_user_notification"><?php _e('Send the new user an email about their account.'); ?></label>
 		</td>
 	</tr>
 <?php } // !is_multisite ?>
@@ -475,19 +475,19 @@ 
 		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
-			if ( !$new_user_role )
-				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			if ( ! $new_user_role)
+				$new_user_role = ! empty($current_role) ? $current_role : get_option('default_role');
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>
 		</td>
 	</tr>
-	<?php if ( is_multisite() && current_user_can( 'manage_network_users' ) ) { ?>
+	<?php if (is_multisite() && current_user_can('manage_network_users')) { ?>
 	<tr>
-		<th scope="row"><?php _e( 'Skip Confirmation Email' ); ?></th>
+		<th scope="row"><?php _e('Skip Confirmation Email'); ?></th>
 		<td>
-			<input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> />
-			<label for="noconfirmation"><?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label>
+			<input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked($new_user_ignore_pass); ?> />
+			<label for="noconfirmation"><?php _e('Add the user without sending an email that requires their confirmation.'); ?></label>
 		</td>
 	</tr>
 	<?php } ?>
@@ -495,13 +495,13 @@ 
 
 <?php
 /** This action is documented in wp-admin/user-new.php */
-do_action( 'user_new_form', 'add-new-user' );
+do_action('user_new_form', 'add-new-user');
 ?>
 
-<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
+<?php submit_button(__('Add New User'), 'primary', 'createuser', true, array('id' => 'createusersub')); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
 </div>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/post-new.php

Braces +9 added lines, -6 removed lines

@@ -29,9 +29,10 @@ 
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
-		exit;
-} else {
+	if ( wp_redirect( admin_url( 'media-new.php' ) ) ) {
+			exit;
+	}
+	} else {
 	$submenu_file = "post-new.php?post_type=$post_type";
 	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
 		$parent_file = $post_type_object->show_in_menu;
@@ -63,8 +64,9 @@ 
 }
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+}
 
 wp_enqueue_script( 'autosave' );
 
@@ -73,8 +75,9 @@ 
 } else {
 	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if ( count( $check_users ) > 1 ) {
+			add_action( 'admin_footer', '_admin_notice_post_locked' );
+	}
 
 	unset( $check_users );
 }

Spacing +26 added lines, -26 removed lines

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

src/wp-admin/ms-admin.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url() );
+wp_redirect(network_admin_url());
 exit;

src/wp-admin/media-new.php

Braces +8 added lines, -5 removed lines

@@ -12,17 +12,19 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if (!current_user_can('upload_files'))
+if (!current_user_can('upload_files')) {
 	wp_die(__('You do not have permission to upload files.'));
+}
 
 wp_enqueue_script('plupload-handlers');
 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
-		$post_id = 0;
-}
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			$post_id = 0;
+	}
+	}
 
 if ( $_POST ) {
 	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
@@ -61,8 +63,9 @@ 
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) ) {
 	$form_class .= ' html-uploader';
+}
 ?>
 <div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>

Spacing +26 added lines, -26 removed lines

@@ -10,64 +10,64 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if (!current_user_can('upload_files'))
+if ( ! current_user_can('upload_files'))
 	wp_die(__('Sorry, you are not allowed to upload files.'));
 
 wp_enqueue_script('plupload-handlers');
 
 $post_id = 0;
-if ( isset( $_REQUEST['post_id'] ) ) {
-	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+if (isset($_REQUEST['post_id'])) {
+	$post_id = absint($_REQUEST['post_id']);
+	if ( ! get_post($post_id) || ! current_user_can('edit_post', $post_id))
 		$post_id = 0;
 }
 
-if ( $_POST ) {
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
+if ($_POST) {
+	if (isset($_POST['html-upload']) && ! empty($_FILES)) {
 		check_admin_referer('media-form');
 		// Upload File button was clicked
-		$upload_id = media_handle_upload( 'async-upload', $post_id );
-		if ( is_wp_error( $upload_id ) ) {
-			wp_die( $upload_id );
+		$upload_id = media_handle_upload('async-upload', $post_id);
+		if (is_wp_error($upload_id)) {
+			wp_die($upload_id);
 		}
 	}
-	wp_redirect( admin_url( 'upload.php' ) );
+	wp_redirect(admin_url('upload.php'));
 	exit;
 }
 
 $title = __('Upload New Media');
 $parent_file = 'upload.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-	'<ul>' .
-		'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-		'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-		'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
+	'<p>'.__('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:').'</p>'.
+	'<ul>'.
+		'<li>'.__('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.').'</li>'.
+		'<li>'.__('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.').'</li>'.
+		'<li>'.__('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.').'</li>'.
 	'</ul>'
-) );
+));
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen">Documentation on Uploading Media Files</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Add_New_Screen">Documentation on Uploading Media Files</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if (get_user_setting('uploader') || isset($_GET['browser-uploader']))
 	$form_class .= ' html-uploader';
 ?>
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 
-	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr($form_class); ?>" id="file-form">
 
 	<?php media_upload_form(); ?>
 
@@ -81,4 +81,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

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

Braces +5 added lines, -2 removed lines

@@ -177,9 +177,12 @@
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
-		else : ?>
+		else {
+			: ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
+			<th scope="row"><?php _e( 'Site Address (URL)' );
+		}
+		?></th>
 			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
 		</tr>
 		<?php endif; ?>

Spacing +87 added lines, -87 removed lines

@@ -8,74 +8,74 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_sites' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
+if ( ! current_user_can('manage_sites')) {
+	wp_die(__('Sorry, you are not allowed to edit this site.'));
 }
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '</p>' .
-		'<p>' . __( '<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
-		'<p>' . __( '<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '</p>' .
-		'<p>' . sprintf( __( '<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
-		'<p>' . __( '<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '</p>'
-) );
+		'<p>'.__('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.').'</p>'.
+		'<p>'.__('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.').'</p>'.
+		'<p>'.__('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.').'</p>'.
+		'<p>'.sprintf(__('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.'), network_admin_url('themes.php')).'</p>'.
+		'<p>'.__('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>').'</p>'
 );
 
-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 
-if ( ! $id ) {
-	wp_die( __('Invalid site ID.') );
+if ( ! $id) {
+	wp_die(__('Invalid site ID.'));
 }
 
-$details = get_site( $id );
-if ( ! $details ) {
-	wp_die( __( 'The requested site does not exist.' ) );
+$details = get_site($id);
+if ( ! $details) {
+	wp_die(__('The requested site does not exist.'));
 }
 
-if ( ! can_edit_network( $details->site_id ) ) {
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+if ( ! can_edit_network($details->site_id)) {
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 }
 
-$parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
-$is_main_site = is_main_site( $id );
+$parsed_scheme = parse_url($details->siteurl, PHP_URL_SCHEME);
+$is_main_site = is_main_site($id);
 
-if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
-	check_admin_referer( 'edit-site' );
+if (isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action']) {
+	check_admin_referer('edit-site');
 
-	switch_to_blog( $id );
+	switch_to_blog($id);
 
 	// Rewrite rules can't be flushed during switch to blog.
-	delete_option( 'rewrite_rules' );
+	delete_option('rewrite_rules');
 
-	$blog_data = wp_unslash( $_POST['blog'] );
+	$blog_data = wp_unslash($_POST['blog']);
 	$blog_data['scheme'] = $parsed_scheme;
 
-	if ( $is_main_site ) {
+	if ($is_main_site) {
 		// On the network's main site, don't allow the domain or path to change.
 		$blog_data['domain'] = $details->domain;
 		$blog_data['path'] = $details->path;
 	} else {
 		// For any other site, the scheme, domain, and path can all be changed. We first
 		// need to ensure a scheme has been provided, otherwise fallback to the existing.
-		$new_url_scheme = parse_url( $blog_data['url'], PHP_URL_SCHEME );
+		$new_url_scheme = parse_url($blog_data['url'], PHP_URL_SCHEME);
 
-		if ( ! $new_url_scheme ) {
-			$blog_data['url'] = esc_url( $parsed_scheme . '://' . $blog_data['url'] );
+		if ( ! $new_url_scheme) {
+			$blog_data['url'] = esc_url($parsed_scheme.'://'.$blog_data['url']);
 		}
-		$update_parsed_url = parse_url( $blog_data['url'] );
+		$update_parsed_url = parse_url($blog_data['url']);
 
 		// If a path is not provided, use the default of `/`.
-		if ( ! isset( $update_parsed_url['path'] ) ) {
+		if ( ! isset($update_parsed_url['path'])) {
 			$update_parsed_url['path'] = '/';
 		}
 
@@ -84,119 +84,119 @@ 
 		$blog_data['path'] = $update_parsed_url['path'];
 	}
 
-	$existing_details = get_site( $id );
-	$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
-	foreach ( $blog_data_checkboxes as $c ) {
-		if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
-			$blog_data[ $c ] = $existing_details->$c;
+	$existing_details = get_site($id);
+	$blog_data_checkboxes = array('public', 'archived', 'spam', 'mature', 'deleted');
+	foreach ($blog_data_checkboxes as $c) {
+		if ( ! in_array($existing_details->$c, array(0, 1))) {
+			$blog_data[$c] = $existing_details->$c;
 		} else {
-			$blog_data[ $c ] = isset( $_POST['blog'][ $c ] ) ? 1 : 0;
+			$blog_data[$c] = isset($_POST['blog'][$c]) ? 1 : 0;
 		}
 	}
 
-	update_blog_details( $id, $blog_data );
+	update_blog_details($id, $blog_data);
 
 	// Maybe update home and siteurl options.
-	$new_details = get_site( $id );
+	$new_details = get_site($id);
 
-	$old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
-	$old_home_parsed = parse_url( $old_home_url );
+	$old_home_url = trailingslashit(esc_url(get_option('home')));
+	$old_home_parsed = parse_url($old_home_url);
 
-	if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
-		$new_home_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
-		update_option( 'home', $new_home_url );
+	if ($old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path) {
+		$new_home_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
+		update_option('home', $new_home_url);
 	}
 
-	$old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
-	$old_site_parsed = parse_url( $old_site_url );
+	$old_site_url = trailingslashit(esc_url(get_option('siteurl')));
+	$old_site_parsed = parse_url($old_site_url);
 
-	if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
-		$new_site_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
-		update_option( 'siteurl', $new_site_url );
+	if ($old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path) {
+		$new_site_url = untrailingslashit(esc_url_raw($blog_data['scheme'].'://'.$new_details->domain.$new_details->path));
+		update_option('siteurl', $new_site_url);
 	}
 
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php' ) );
+	wp_redirect(add_query_arg(array('update' => 'updated', 'id' => $id), 'site-info.php'));
 	exit;
 }
 
-if ( isset( $_GET['update'] ) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] ) {
-		$messages[] = __( 'Site info updated.' );
+	if ('updated' == $_GET['update']) {
+		$messages[] = __('Site info updated.');
 	}
 }
 
 /* translators: %s: site name */
-$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
+$title = sprintf(__('Edit Site: %s'), esc_html($details->blogname));
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
-<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
+<p class="edit-site-actions"><a href="<?php echo esc_url(get_home_url($id, '/')); ?>"><?php _e('Visit'); ?></a> | <a href="<?php echo esc_url(get_admin_url($id)); ?>"><?php _e('Dashboard'); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
+network_edit_site_nav(array(
 	'blog_id'  => $id,
 	'selected' => 'site-info'
-) );
+));
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg ) {
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg) {
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 	}
 }
 ?>
 <form method="post" action="site-info.php?action=update-site">
-	<?php wp_nonce_field( 'edit-site' ); ?>
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<?php wp_nonce_field('edit-site'); ?>
+	<input type="hidden" name="id" value="<?php echo esc_attr($id) ?>" />
 	<table class="form-table">
 		<?php
 		// The main site of the network should not be updated on this page.
-		if ( $is_main_site ) : ?>
+		if ($is_main_site) : ?>
 		<tr class="form-field">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
-			<td><?php echo esc_url( $details->domain . $details->path ); ?></td>
+			<th scope="row"><?php _e('Site Address (URL)'); ?></th>
+			<td><?php echo esc_url($details->domain.$details->path); ?></td>
 		</tr>
 		<?php
 		// For any other site, the scheme, domain, and path can all be changed.
 		else : ?>
 		<tr class="form-field form-required">
-			<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
-			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
+			<th scope="row"><?php _e('Site Address (URL)'); ?></th>
+			<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme.'://'.esc_attr($details->domain).esc_attr($details->path); ?>" /></td>
 		</tr>
 		<?php endif; ?>
 
 		<tr class="form-field">
-			<th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
-			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
+			<th scope="row"><label for="blog_registered"><?php _ex('Registered', 'site') ?></label></th>
+			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr($details->registered) ?>" /></td>
 		</tr>
 		<tr class="form-field">
-			<th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
-			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
+			<th scope="row"><label for="blog_last_updated"><?php _e('Last Updated'); ?></label></th>
+			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr($details->last_updated) ?>" /></td>
 		</tr>
 		<?php
-		$attribute_fields = array( 'public' => __( 'Public' ) );
-		if ( ! $is_main_site ) {
-			$attribute_fields['archived'] = __( 'Archived' );
-			$attribute_fields['spam']     = _x( 'Spam', 'site' );
-			$attribute_fields['deleted']  = __( 'Deleted' );
+		$attribute_fields = array('public' => __('Public'));
+		if ( ! $is_main_site) {
+			$attribute_fields['archived'] = __('Archived');
+			$attribute_fields['spam']     = _x('Spam', 'site');
+			$attribute_fields['deleted']  = __('Deleted');
 		}
-		$attribute_fields['mature'] = __( 'Mature' );
+		$attribute_fields['mature'] = __('Mature');
 		?>
 		<tr>
-			<th scope="row"><?php _e( 'Attributes' ); ?></th>
+			<th scope="row"><?php _e('Attributes'); ?></th>
 			<td>
 			<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
-			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
-				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
+			<legend class="screen-reader-text"><?php _e('Set site attributes') ?></legend>
+			<?php foreach ($attribute_fields as $field_key => $field_label) : ?>
+				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked((bool) $details->$field_key, true); disabled( ! in_array($details->$field_key, array(0, 1))); ?> />
 				<?php echo $field_label; ?></label><br/>
 			<?php endforeach; ?>
 			<fieldset>
@@ -208,4 +208,4 @@ 
 
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

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

Indentation +6 added lines, -6 removed lines

@@ -115,12 +115,12 @@
 		}
 
 		/**
-		  * Fires after a new user has been created via the network site-new.php page.
-		  *
-		  * @since 4.4.0
-		  *
-		  * @param int $user_id ID of the newly created user.
-		  */
+		 * Fires after a new user has been created via the network site-new.php page.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param int $user_id ID of the newly created user.
+		 */
 		do_action( 'network_site_new_created_user', $user_id );
 	}
 

Spacing +90 added lines, -90 removed lines

@@ -8,48 +8,48 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-if ( ! current_user_can( 'manage_sites' ) )
-	wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
+if ( ! current_user_can('manage_sites'))
+	wp_die(__('Sorry, you are not allowed to add sites to this network.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
-		'<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
-) );
+		'<p>'.__('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.').'</p>'.
+		'<p>'.__('If the admin email for the new site does not exist in the database, a new user will also be created.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
+if (isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action']) {
+	check_admin_referer('add-blog', '_wpnonce_add-blog');
 
-	if ( ! is_array( $_POST['blog'] ) )
-		wp_die( __( 'Can&#8217;t create an empty site.' ) );
+	if ( ! is_array($_POST['blog']))
+		wp_die(__('Can&#8217;t create an empty site.'));
 
 	$blog = $_POST['blog'];
 	$domain = '';
-	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
-		$domain = strtolower( $blog['domain'] );
+	if (preg_match('|^([a-zA-Z0-9-])+$|', $blog['domain']))
+		$domain = strtolower($blog['domain']);
 
 	// If not a subdomain install, make sure the domain isn't a reserved word
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 		$subdirectory_reserved_names = get_subdirectory_reserved_names();
 
-		if ( in_array( $domain, $subdirectory_reserved_names ) ) {
+		if (in_array($domain, $subdirectory_reserved_names)) {
 			wp_die(
 				/* translators: %s: reserved names list */
-				sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ),
-					'<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
+				sprintf(__('The following words are reserved for use by WordPress functions and cannot be used as blog names: %s'),
+					'<code>'.implode('</code>, <code>', $subdirectory_reserved_names).'</code>'
 				)
 			);
 		}
@@ -62,40 +62,40 @@ 
 	);
 
 	// Handle translation install for the new site.
-	if ( isset( $_POST['WPLANG'] ) ) {
-		if ( '' === $_POST['WPLANG'] ) {
+	if (isset($_POST['WPLANG'])) {
+		if ('' === $_POST['WPLANG']) {
 			$meta['WPLANG'] = ''; // en_US
-		} elseif ( wp_can_install_language_pack() ) {
-			$language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
-			if ( $language ) {
+		} elseif (wp_can_install_language_pack()) {
+			$language = wp_download_language_pack(wp_unslash($_POST['WPLANG']));
+			if ($language) {
 				$meta['WPLANG'] = $language;
 			}
 		}
 	}
 
-	if ( empty( $domain ) )
-		wp_die( __( 'Missing or invalid site address.' ) );
+	if (empty($domain))
+		wp_die(__('Missing or invalid site address.'));
 
-	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
-		wp_die( __( 'Missing email address.' ) );
+	if (isset($blog['email']) && '' === trim($blog['email'])) {
+		wp_die(__('Missing email address.'));
 	}
 
-	$email = sanitize_email( $blog['email'] );
-	if ( ! is_email( $email ) ) {
-		wp_die( __( 'Invalid email address.' ) );
+	$email = sanitize_email($blog['email']);
+	if ( ! is_email($email)) {
+		wp_die(__('Invalid email address.'));
 	}
 
-	if ( is_subdomain_install() ) {
-		$newdomain = $domain . '.' . preg_replace( '|^www\.|', '', get_network()->domain );
+	if (is_subdomain_install()) {
+		$newdomain = $domain.'.'.preg_replace('|^www\.|', '', get_network()->domain);
 		$path      = get_network()->path;
 	} else {
 		$newdomain = get_network()->domain;
-		$path      = get_network()->path . $domain . '/';
+		$path      = get_network()->path.$domain.'/';
 	}
 
 	$password = 'N/A';
 	$user_id = email_exists($email);
-	if ( !$user_id ) { // Create a new user with a random password
+	if ( ! $user_id) { // Create a new user with a random password
 		/**
 		 * Fires immediately before a new user is created via the network site-new.php page.
 		 *
@@ -103,16 +103,16 @@ 
 		 *
 		 * @param string $email Email of the non-existent user.
 		 */
-		do_action( 'pre_network_site_new_created_user', $email );
+		do_action('pre_network_site_new_created_user', $email);
 
-		$user_id = username_exists( $domain );
-		if ( $user_id ) {
-			wp_die( __( 'The domain or path entered conflicts with an existing username.' ) );
+		$user_id = username_exists($domain);
+		if ($user_id) {
+			wp_die(__('The domain or path entered conflicts with an existing username.'));
 		}
-		$password = wp_generate_password( 12, false );
-		$user_id = wpmu_create_user( $domain, $password, $email );
-		if ( false === $user_id ) {
-			wp_die( __( 'There was an error creating the user.' ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user($domain, $password, $email);
+		if (false === $user_id) {
+			wp_die(__('There was an error creating the user.'));
 		}
 
 		/**
@@ -122,129 +122,129 @@ 
 		  *
 		  * @param int $user_id ID of the newly created user.
 		  */
-		do_action( 'network_site_new_created_user', $user_id );
+		do_action('network_site_new_created_user', $user_id);
 	}
 
 	$wpdb->hide_errors();
-	$id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
+	$id = wpmu_create_blog($newdomain, $path, $title, $user_id, $meta, get_current_network_id());
 	$wpdb->show_errors();
-	if ( ! is_wp_error( $id ) ) {
-		if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
-			update_user_option( $user_id, 'primary_blog', $id, true );
+	if ( ! is_wp_error($id)) {
+		if ( ! is_super_admin($user_id) && ! get_user_option('primary_blog', $user_id)) {
+			update_user_option($user_id, 'primary_blog', $id, true);
 		}
 
 		wp_mail(
-			get_site_option( 'admin_email' ),
+			get_site_option('admin_email'),
 			sprintf(
 				/* translators: %s: network name */
-				__( '[%s] New Site Created' ),
+				__('[%s] New Site Created'),
 				get_network()->site_name
 			),
 			sprintf(
 				/* translators: 1: user login, 2: site url, 3: site name/title */
-				__( 'New site created by %1$s
+				__('New site created by %1$s
 
 Address: %2$s
 Name: %3$s' ),
 				$current_user->user_login,
-				get_site_url( $id ),
-				wp_unslash( $title )
+				get_site_url($id),
+				wp_unslash($title)
 			),
 			sprintf(
 				'From: "%1$s" <%2$s>',
-				_x( 'Site Admin', 'email "From" field' ),
-				get_site_option( 'admin_email' )
+				_x('Site Admin', 'email "From" field'),
+				get_site_option('admin_email')
 			)
 		);
-		wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
-		wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
+		wpmu_welcome_notification($id, $user_id, $password, $title, array('public' => 1));
+		wp_redirect(add_query_arg(array('update' => 'added', 'id' => $id), 'site-new.php'));
 		exit;
 	} else {
-		wp_die( $id->get_error_message() );
+		wp_die($id->get_error_message());
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
+	if ('added' == $_GET['update'])
 		$messages[] = sprintf(
 			/* translators: 1: dashboard url, 2: network admin edit url */
-			__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
-			esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
-			network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
+			__('Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>'),
+			esc_url(get_admin_url(absint($_GET['id']))),
+			network_admin_url('site-info.php?id='.absint($_GET['id']))
 		);
 }
 
 $title = __('Add New Site');
 $parent_file = 'sites.php';
 
-wp_enqueue_script( 'user-suggest' );
+wp_enqueue_script('user-suggest');
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
+<h1 id="add-new-site"><?php _e('Add New Site'); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 } ?>
-<form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
-<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
+<form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>" novalidate="novalidate">
+<?php wp_nonce_field('add-blog', '_wpnonce_add-blog') ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ) ?></label></th>
+			<th scope="row"><label for="site-address"><?php _e('Site Address (URL)') ?></label></th>
 			<td>
-			<?php if ( is_subdomain_install() ) { ?>
-				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
+			<?php if (is_subdomain_install()) { ?>
+				<input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace('|^www\.|', '', get_network()->domain); ?></span>
 			<?php } else {
-				echo get_network()->domain . get_network()->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
+				echo get_network()->domain.get_network()->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />
 			<?php }
-			echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
+			echo '<p class="description" id="site-address-desc">'.__('Only lowercase letters (a-z), numbers, and hyphens are allowed.').'</p>';
 			?>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
+			<th scope="row"><label for="site-title"><?php _e('Site Title') ?></label></th>
 			<td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
 		</tr>
 		<?php
 		$languages    = get_available_languages();
 		$translations = wp_get_available_translations();
-		if ( ! empty( $languages ) || ! empty( $translations ) ) :
+		if ( ! empty($languages) || ! empty($translations)) :
 			?>
 			<tr class="form-field form-required">
-				<th scope="row"><label for="site-language"><?php _e( 'Site Language' ); ?></label></th>
+				<th scope="row"><label for="site-language"><?php _e('Site Language'); ?></label></th>
 				<td>
 					<?php
 					// Network default.
-					$lang = get_site_option( 'WPLANG' );
+					$lang = get_site_option('WPLANG');
 
 					// Use English if the default isn't available.
-					if ( ! in_array( $lang, $languages ) ) {
+					if ( ! in_array($lang, $languages)) {
 						$lang = '';
 					}
 
-					wp_dropdown_languages( array(
+					wp_dropdown_languages(array(
 						'name'                        => 'WPLANG',
 						'id'                          => 'site-language',
 						'selected'                    => $lang,
 						'languages'                   => $languages,
 						'translations'                => $translations,
 						'show_available_translations' => wp_can_install_language_pack(),
-					) );
+					));
 					?>
 				</td>
 			</tr>
 		<?php endif; // Languages. ?>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>
+			<th scope="row"><label for="admin-email"><?php _e('Admin Email') ?></label></th>
 			<td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
+			<td colspan="2"><?php _e('A new user will be created if the above email address is not in the database.') ?><br /><?php _e('The username and password will be mailed to this email address.') ?></td>
 		</tr>
 	</table>
 
@@ -254,11 +254,11 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	do_action( 'network_site_new_form' );
+	do_action('network_site_new_form');
 
-	submit_button( __( 'Add Site' ), 'primary', 'add-site' );
+	submit_button(__('Add Site'), 'primary', 'add-site');
 	?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +19 added lines, -13 removed lines

@@ -13,8 +13,9 @@ 
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -33,13 +34,15 @@ 
 if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
-	if ( ! is_array( $_POST['blog'] ) )
-		wp_die( __( 'Can’t create an empty site.' ) );
+	if ( ! is_array( $_POST['blog'] ) ) {
+			wp_die( __( 'Can’t create an empty site.' ) );
+	}
 
 	$blog = $_POST['blog'];
 	$domain = '';
-	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
-		$domain = strtolower( $blog['domain'] );
+	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) {
+			$domain = strtolower( $blog['domain'] );
+	}
 
 	// If not a subdomain install, make sure the domain isn't a reserved word
 	if ( ! is_subdomain_install() ) {
@@ -73,8 +76,9 @@ 
 		}
 	}
 
-	if ( empty( $domain ) )
-		wp_die( __( 'Missing or invalid site address.' ) );
+	if ( empty( $domain ) ) {
+			wp_die( __( 'Missing or invalid site address.' ) );
+	}
 
 	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
 		wp_die( __( 'Missing email address.' ) );
@@ -166,14 +170,15 @@ 
 
 if ( isset($_GET['update']) ) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
-		$messages[] = sprintf(
+	if ( 'added' == $_GET['update'] ) {
+			$messages[] = sprintf(
 			/* translators: 1: dashboard url, 2: network admin edit url */
 			__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
 			esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
 			network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
 		);
-}
+	}
+	}
 
 $title = __('Add New Site');
 $parent_file = 'sites.php';
@@ -188,9 +193,10 @@ 
 <h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	} ?>
 <form method="post" action="<?php echo network_admin_url( 'site-new.php?action=add-site' ); ?>" novalidate="novalidate">
 <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
 	<table class="form-table">

src/wp-admin/edit-comments.php

Braces +31 added lines, -21 removed lines

@@ -47,8 +47,9 @@ 
 	wp_defer_comment_counting( true );
 
 	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
-			continue;
+		if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+					continue;
+		}
 
 		switch ( $doaction ) {
 			case 'approve' :
@@ -84,22 +85,30 @@ 
 
 	wp_defer_comment_counting( false );
 
-	if ( $approved )
-		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
-		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
-		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
-		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
-		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
-		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
-		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
-		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
+	if ( $approved ) {
+			$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
+	}
+	if ( $unapproved ) {
+			$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
+	}
+	if ( $spammed ) {
+			$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
+	}
+	if ( $unspammed ) {
+			$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
+	}
+	if ( $trashed ) {
+			$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
+	}
+	if ( $untrashed ) {
+			$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
+	}
+	if ( $deleted ) {
+			$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
+	}
+	if ( $trashed || $spammed ) {
+			$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
+	}
 
 	wp_safe_redirect( $redirect_to );
 	exit;
@@ -213,9 +222,10 @@ 
 			$error_msg = __( 'You are not allowed to edit comments on this post.' );
 			break;
 	}
-	if ( $error_msg )
-		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
-}
+	if ( $error_msg ) {
+			echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+	}
+	}
 
 if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
 	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;

Spacing +139 added lines, -139 removed lines

@@ -7,11 +7,11 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'edit_posts' ) ) {
+require_once(dirname(__FILE__).'/admin.php');
+if ( ! current_user_can('edit_posts')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit comments.').'</p>',
 		403
 	);
 }
@@ -21,68 +21,68 @@ 
 
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
-	check_admin_referer( 'bulk-comments' );
+if ($doaction) {
+	check_admin_referer('bulk-comments');
 
-	if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
-		$comment_status = wp_unslash( $_REQUEST['comment_status'] );
-		$delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
-		$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
+	if ('delete_all' == $doaction && ! empty($_REQUEST['pagegen_timestamp'])) {
+		$comment_status = wp_unslash($_REQUEST['comment_status']);
+		$delete_time = wp_unslash($_REQUEST['pagegen_timestamp']);
+		$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time));
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['delete_comments'] ) ) {
+	} elseif (isset($_REQUEST['delete_comments'])) {
 		$comment_ids = $_REQUEST['delete_comments'];
-		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
-	} elseif ( wp_get_referer() ) {
-		wp_safe_redirect( wp_get_referer() );
+		$doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
+	} elseif (isset($_REQUEST['ids'])) {
+		$comment_ids = array_map('absint', explode(',', $_REQUEST['ids']));
+	} elseif (wp_get_referer()) {
+		wp_safe_redirect(wp_get_referer());
 		exit;
 	}
 
 	$approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
 
-	$redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
-	$redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
+	$redirect_to = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer());
+	$redirect_to = add_query_arg('paged', $pagenum, $redirect_to);
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
+	foreach ($comment_ids as $comment_id) { // Check the permissions on each
+		if ( ! current_user_can('edit_comment', $comment_id))
 			continue;
 
-		switch ( $doaction ) {
+		switch ($doaction) {
 			case 'approve' :
-				wp_set_comment_status( $comment_id, 'approve' );
+				wp_set_comment_status($comment_id, 'approve');
 				$approved++;
 				break;
 			case 'unapprove' :
-				wp_set_comment_status( $comment_id, 'hold' );
+				wp_set_comment_status($comment_id, 'hold');
 				$unapproved++;
 				break;
 			case 'spam' :
-				wp_spam_comment( $comment_id );
+				wp_spam_comment($comment_id);
 				$spammed++;
 				break;
 			case 'unspam' :
-				wp_unspam_comment( $comment_id );
+				wp_unspam_comment($comment_id);
 				$unspammed++;
 				break;
 			case 'trash' :
-				wp_trash_comment( $comment_id );
+				wp_trash_comment($comment_id);
 				$trashed++;
 				break;
 			case 'untrash' :
-				wp_untrash_comment( $comment_id );
+				wp_untrash_comment($comment_id);
 				$untrashed++;
 				break;
 			case 'delete' :
-				wp_delete_comment( $comment_id );
+				wp_delete_comment($comment_id);
 				$deleted++;
 				break;
 		}
 	}
 
-	if ( ! in_array( $doaction, array( 'approve', 'unapprove', 'spam', 'unspam', 'trash', 'delete' ), true ) ) {
+	if ( ! in_array($doaction, array('approve', 'unapprove', 'spam', 'unspam', 'trash', 'delete'), true)) {
 		$screen = get_current_screen()->id;
 
 		/**
@@ -99,32 +99,32 @@ 
 		 * @param string $doaction     The action being taken.
 		 * @param array  $items        The items to take the action on.
 		 */
-		$redirect_to = apply_filters( "handle_bulk_actions-{$screen}", $redirect_to, $doaction, $comment_ids );
+		$redirect_to = apply_filters("handle_bulk_actions-{$screen}", $redirect_to, $doaction, $comment_ids);
 	}
 
-	wp_defer_comment_counting( false );
-
-	if ( $approved )
-		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
-		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
-		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
-		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
-		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
-		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
-		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
-		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
-
-	wp_safe_redirect( $redirect_to );
+	wp_defer_comment_counting(false);
+
+	if ($approved)
+		$redirect_to = add_query_arg('approved', $approved, $redirect_to);
+	if ($unapproved)
+		$redirect_to = add_query_arg('unapproved', $unapproved, $redirect_to);
+	if ($spammed)
+		$redirect_to = add_query_arg('spammed', $spammed, $redirect_to);
+	if ($unspammed)
+		$redirect_to = add_query_arg('unspammed', $unspammed, $redirect_to);
+	if ($trashed)
+		$redirect_to = add_query_arg('trashed', $trashed, $redirect_to);
+	if ($untrashed)
+		$redirect_to = add_query_arg('untrashed', $untrashed, $redirect_to);
+	if ($deleted)
+		$redirect_to = add_query_arg('deleted', $deleted, $redirect_to);
+	if ($trashed || $spammed)
+		$redirect_to = add_query_arg('ids', join(',', $comment_ids), $redirect_to);
+
+	wp_safe_redirect($redirect_to);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -133,91 +133,91 @@ 
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 
-if ( $post_id ) {
-	$comments_count = wp_count_comments( $post_id );
-	$draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' );
-	if ( $comments_count->moderated > 0 ) {
+if ($post_id) {
+	$comments_count = wp_count_comments($post_id);
+	$draft_or_post_title = wp_html_excerpt(_draft_or_post_title($post_id), 50, '&hellip;');
+	if ($comments_count->moderated > 0) {
 		/* translators: 1: comments count 2: post title */
-		$title = sprintf( __( 'Comments (%1$s) on &#8220;%2$s&#8221;' ),
-			number_format_i18n( $comments_count->moderated ),
+		$title = sprintf(__('Comments (%1$s) on &#8220;%2$s&#8221;'),
+			number_format_i18n($comments_count->moderated),
 			$draft_or_post_title
 		);
 	} else {
 		/* translators: %s: post title */
-		$title = sprintf( __( 'Comments on &#8220;%s&#8221;' ),
+		$title = sprintf(__('Comments on &#8220;%s&#8221;'),
 			$draft_or_post_title
 		);
 	}
 } else {
 	$comments_count = wp_count_comments();
-	if ( $comments_count->moderated > 0 ) {
+	if ($comments_count->moderated > 0) {
 		/* translators: %s: comments count */
-		$title = sprintf( __( 'Comments (%s)' ),
-			number_format_i18n( $comments_count->moderated )
+		$title = sprintf(__('Comments (%s)'),
+			number_format_i18n($comments_count->moderated)
 		);
 	} else {
-		$title = __( 'Comments' );
+		$title = __('Comments');
 	}
 }
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'moderating-comments',
 'title'		=> __('Moderating Comments'),
 'content'	=>
-		'<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
-		'<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>'
-) );
+		'<p>'.__('A red bar on the left means the comment is waiting for you to moderate it.').'</p>'.
+		'<p>'.__('In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.').'</p>'.
+		'<p>'.__('In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.').'</p>'.
+		'<p>'.__('In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.').'</p>'.
+		'<p>'.__('In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.').'</p>'.
+		'<p>'.__('Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Comment_Spam">Documentation on Comment Spam</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Comment_Spam">Documentation on Comment Spam</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Keyboard_Shortcuts">Documentation on Keyboard Shortcuts</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter comments list' ),
-	'heading_pagination' => __( 'Comments list navigation' ),
-	'heading_list'       => __( 'Comments list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter comments list'),
+	'heading_pagination' => __('Comments list navigation'),
+	'heading_list'       => __('Comments list'),
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php
-if ( $post_id ) {
+if ($post_id) {
 	/* translators: %s: link to post */
-	printf( __( 'Comments on &#8220;%s&#8221;' ),
-		sprintf( '<a href="%1$s">%2$s</a>',
-			get_edit_post_link( $post_id ),
-			wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
+	printf(__('Comments on &#8220;%s&#8221;'),
+		sprintf('<a href="%1$s">%2$s</a>',
+			get_edit_post_link($post_id),
+			wp_html_excerpt(_draft_or_post_title($post_id), 50, '&hellip;')
 		)
 	);
 } else {
-	_e( 'Comments' );
+	_e('Comments');
 }
 ?></h1>
 
 <?php
-if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	echo '<span class="subtitle">';
 	/* translators: %s: search keywords */
-	printf( __( 'Search results for &#8220;%s&#8221;' ),
-		wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' )
+	printf(__('Search results for &#8220;%s&#8221;'),
+		wp_html_excerpt(esc_html(wp_unslash($_REQUEST['s'])), 50, '&hellip;')
 	);
 	echo '</span>';
 }
@@ -226,78 +226,78 @@ 
 <hr class="wp-header-end">
 
 <?php
-if ( isset( $_REQUEST['error'] ) ) {
+if (isset($_REQUEST['error'])) {
 	$error = (int) $_REQUEST['error'];
 	$error_msg = '';
-	switch ( $error ) {
+	switch ($error) {
 		case 1 :
-			$error_msg = __( 'Invalid comment ID.' );
+			$error_msg = __('Invalid comment ID.');
 			break;
 		case 2 :
-			$error_msg = __( 'Sorry, you are not allowed to edit comments on this post.' );
+			$error_msg = __('Sorry, you are not allowed to edit comments on this post.');
 			break;
 	}
-	if ( $error_msg )
-		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+	if ($error_msg)
+		echo '<div id="moderated" class="error"><p>'.$error_msg.'</p></div>';
 }
 
-if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
-	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
-	$deleted   = isset( $_REQUEST['deleted']   ) ? (int) $_REQUEST['deleted']   : 0;
-	$trashed   = isset( $_REQUEST['trashed']   ) ? (int) $_REQUEST['trashed']   : 0;
-	$untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
-	$spammed   = isset( $_REQUEST['spammed']   ) ? (int) $_REQUEST['spammed']   : 0;
-	$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
-	$same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
-
-	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
-		if ( $approved > 0 ) {
+if (isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same'])) {
+	$approved  = isset($_REQUEST['approved']) ? (int) $_REQUEST['approved'] : 0;
+	$deleted   = isset($_REQUEST['deleted']) ? (int) $_REQUEST['deleted'] : 0;
+	$trashed   = isset($_REQUEST['trashed']) ? (int) $_REQUEST['trashed'] : 0;
+	$untrashed = isset($_REQUEST['untrashed']) ? (int) $_REQUEST['untrashed'] : 0;
+	$spammed   = isset($_REQUEST['spammed']) ? (int) $_REQUEST['spammed'] : 0;
+	$unspammed = isset($_REQUEST['unspammed']) ? (int) $_REQUEST['unspammed'] : 0;
+	$same      = isset($_REQUEST['same']) ? (int) $_REQUEST['same'] : 0;
+
+	if ($approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0) {
+		if ($approved > 0) {
 			/* translators: %s: number of comments approved */
-			$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
+			$messages[] = sprintf(_n('%s comment approved', '%s comments approved', $approved), $approved);
 		}
 
-		if ( $spammed > 0 ) {
+		if ($spammed > 0) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
 			/* translators: %s: number of comments marked as spam */
-			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf(_n('%s comment marked as spam.', '%s comments marked as spam.', $spammed), $spammed).' <a href="'.esc_url(wp_nonce_url("edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments")).'">'.__('Undo').'</a><br />';
 		}
 
-		if ( $unspammed > 0 ) {
+		if ($unspammed > 0) {
 			/* translators: %s: number of comments restored from the spam */
-			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+			$messages[] = sprintf(_n('%s comment restored from the spam', '%s comments restored from the spam', $unspammed), $unspammed);
 		}
 
-		if ( $trashed > 0 ) {
+		if ($trashed > 0) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
 			/* translators: %s: number of comments moved to the Trash */
-			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf(_n('%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed), $trashed).' <a href="'.esc_url(wp_nonce_url("edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments")).'">'.__('Undo').'</a><br />';
 		}
 
-		if ( $untrashed > 0 ) {
+		if ($untrashed > 0) {
 			/* translators: %s: number of comments restored from the Trash */
-			$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+			$messages[] = sprintf(_n('%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed), $untrashed);
 		}
 
-		if ( $deleted > 0 ) {
+		if ($deleted > 0) {
 			/* translators: %s: number of comments permanently deleted */
-			$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+			$messages[] = sprintf(_n('%s comment permanently deleted', '%s comments permanently deleted', $deleted), $deleted);
 		}
 
-		if ( $same > 0 && $comment = get_comment( $same ) ) {
-			switch ( $comment->comment_approved ) {
+		if ($same > 0 && $comment = get_comment($same)) {
+			switch ($comment->comment_approved) {
 				case '1' :
-					$messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					$messages[] = __('This comment is already approved.').' <a href="'.esc_url(admin_url("comment.php?action=editcomment&c=$same")).'">'.__('Edit comment').'</a>';
 					break;
 				case 'trash' :
-					$messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+					$messages[] = __('This comment is already in the Trash.').' <a href="'.esc_url(admin_url('edit-comments.php?comment_status=trash')).'"> '.__('View Trash').'</a>';
 					break;
 				case 'spam' :
-					$messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					$messages[] = __('This comment is already marked as spam.').' <a href="'.esc_url(admin_url("comment.php?action=editcomment&c=$same")).'">'.__('Edit comment').'</a>';
 					break;
 			}
 		}
 
-		echo '<div id="moderated" class="updated notice is-dismissible"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';
+		echo '<div id="moderated" class="updated notice is-dismissible"><p>'.implode("<br/>\n", $messages).'</p></div>';
 	}
 }
 ?>
@@ -306,20 +306,20 @@ 
 
 <form id="comments-form" method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Comments' ), 'comment' ); ?>
+<?php $wp_list_table->search_box(__('Search Comments'), 'comment'); ?>
 
-<?php if ( $post_id ) : ?>
-<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
+<?php if ($post_id) : ?>
+<input type="hidden" name="p" value="<?php echo esc_attr(intval($post_id)); ?>" />
 <?php endif; ?>
 <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
 <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
 
-<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
+<input type="hidden" name="_total" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('total_items')); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('per_page')); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('page')); ?>" />
 
-<?php if ( isset($_REQUEST['paged']) ) { ?>
-	<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
+<?php if (isset($_REQUEST['paged'])) { ?>
+	<input type="hidden" name="paged" value="<?php echo esc_attr(absint($_REQUEST['paged'])); ?>" />
 <?php } ?>
 
 <?php $wp_list_table->display(); ?>
@@ -331,4 +331,4 @@ 
 <?php
 wp_comment_reply('-1', true, 'detail');
 wp_comment_trashnotice();
-include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/network.php

Braces +5 added lines, -4 removed lines

@@ -97,10 +97,11 @@
 	if ( ! network_domain_check() ) {
 		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
 		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
-			else
-				network_step1( $result );
+			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() ) {
+							network_step2( $result );
+			} else {
+							network_step1( $result );
+			}
 		} else {
 			network_step2();
 		}

Spacing +47 added lines, -47 removed lines

@@ -10,104 +10,104 @@ 
  * @subpackage Administration
  */
 
-define( 'WP_INSTALLING_NETWORK', true );
+define('WP_INSTALLING_NETWORK', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_super_admin() ) {
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! is_super_admin()) {
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 }
 
-if ( is_multisite() ) {
-	if ( ! is_network_admin() ) {
-		wp_redirect( network_admin_url( 'setup.php' ) );
+if (is_multisite()) {
+	if ( ! is_network_admin()) {
+		wp_redirect(network_admin_url('setup.php'));
 		exit;
 	}
 
-	if ( ! defined( 'MULTISITE' ) ) {
-		wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
+	if ( ! defined('MULTISITE')) {
+		wp_die(__('The Network creation panel is not for WordPress MU networks.'));
 	}
 }
 
-require_once( dirname( __FILE__ ) . '/includes/network.php' );
+require_once(dirname(__FILE__).'/includes/network.php');
 
 // We need to create references to ms global tables to enable Network.
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
+foreach ($wpdb->tables('ms_global') as $table => $prefixed_table) {
 	$wpdb->$table = $prefixed_table;
 }
 
-if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) {
+if ( ! network_domain_check() && ( ! defined('WP_ALLOW_MULTISITE') || ! WP_ALLOW_MULTISITE)) {
 	wp_die(
 		printf(
 			/* translators: 1: WP_ALLOW_MULTISITE 2: wp-config.php */
-			__( 'You must define the %1$s constant as true in your %2$s file to allow creation of a Network.' ),
+			__('You must define the %1$s constant as true in your %2$s file to allow creation of a Network.'),
 			'<code>WP_ALLOW_MULTISITE</code>',
 			'<code>wp-config.php</code>'
 		)
 	);
 }
 
-if ( is_network_admin() ) {
-	$title = __( 'Network Setup' );
+if (is_network_admin()) {
+	$title = __('Network Setup');
 	$parent_file = 'settings.php';
 } else {
-	$title = __( 'Create a Network of WordPress Sites' );
+	$title = __('Create a Network of WordPress Sites');
 	$parent_file = 'tools.php';
 }
 
-$network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
-	'<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
-	'<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
-	'<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
-	'<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
-	'<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.') . '</p>' .
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>' ) . '</p>';
-
-get_current_screen()->add_help_tab( array(
+$network_help = '<p>'.__('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.').'</p>'.
+	'<p>'.__('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).').'</p>'.
+	'<p>'.__('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.').'</p>'.
+	'<p>'.__('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).').'</p>'.
+	'<p>'.__('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.').'</p>'.
+	'<p>'.__('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.').'</p>'.
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>').'</p>';
+
+get_current_screen()->add_help_tab(array(
 	'id'      => 'network',
 	'title'   => __('Network'),
 	'content' => $network_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
-if ( $_POST ) {
+if ($_POST) {
 
-	check_admin_referer( 'install-network-1' );
+	check_admin_referer('install-network-1');
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 	// Create network tables.
 	install_network();
-	$base              = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
-	$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
-	if ( ! network_domain_check() ) {
-		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
-		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
+	$base              = parse_url(trailingslashit(get_option('home')), PHP_URL_PATH);
+	$subdomain_install = allow_subdomain_install() ? ! empty($_POST['subdomain_install']) : false;
+	if ( ! network_domain_check()) {
+		$result = populate_network(1, get_clean_basedomain(), sanitize_email($_POST['email']), wp_unslash($_POST['sitename']), $base, $subdomain_install);
+		if (is_wp_error($result)) {
+			if (1 == count($result->get_error_codes()) && 'no_wildcard_dns' == $result->get_error_code())
+				network_step2($result);
 			else
-				network_step1( $result );
+				network_step1($result);
 		} else {
 			network_step2();
 		}
 	} else {
 		network_step2();
 	}
-} elseif ( is_multisite() || network_domain_check() ) {
+} elseif (is_multisite() || network_domain_check()) {
 	network_step2();
 } else {
 	network_step1();
@@ -115,4 +115,4 @@ 
 ?>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/edit-tag-form.php

Braces +4 added lines, -1 removed lines

@@ -119,7 +119,10 @@
 	<table class="form-table">
 		<tr class="form-field form-required term-name-wrap">
 			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) {
+	echo esc_attr($tag->name);
+}
+?>" size="40" aria-required="true" />
 			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
 <?php if ( !global_terms_enabled() ) { ?>

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
 	/**
- 	 * Fires before the Edit Category form.
+	 * Fires before the Edit Category form.
 	 *
 	 * @since 2.1.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.

Spacing +48 added lines, -48 removed lines

@@ -7,12 +7,12 @@ 
  */
 
 // don't load directly
-if ( ! defined( 'ABSPATH' ) ) {
-	die( '-1' );
+if ( ! defined('ABSPATH')) {
+	die('-1');
 }
 
 // Back compat hooks
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/**
  	 * Fires before the Edit Category form.
 	 *
@@ -21,8 +21,8 @@ 
 	 *
 	 * @param object $tag Current category term object.
 	 */
-	do_action( 'edit_category_form_pre', $tag );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form_pre', $tag);
+} elseif ('link_category' == $taxonomy) {
 	/**
 	 * Fires before the Edit Link Category form.
 	 *
@@ -31,7 +31,7 @@ 
 	 *
 	 * @param object $tag Current link category term object.
 	 */
-	do_action( 'edit_link_category_form_pre', $tag );
+	do_action('edit_link_category_form_pre', $tag);
 } else {
 	/**
 	 * Fires before the Edit Tag form.
@@ -41,18 +41,18 @@ 
 	 *
 	 * @param object $tag Current tag term object.
 	 */
-	do_action( 'edit_tag_form_pre', $tag );
+	do_action('edit_tag_form_pre', $tag);
 }
 
 /**
  * Use with caution, see https://codex.wordpress.org/Function_Reference/wp_reset_vars
  */
-wp_reset_vars( array( 'wp_http_referer' ) );
+wp_reset_vars(array('wp_http_referer'));
 
-$wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg(array('action', 'message', 'tag_ID'), $wp_http_referer);
 
 /** Also used by Edit Tags */
-require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+require_once(ABSPATH.'wp-admin/includes/edit-tag-messages.php');
 
 /**
  * Fires before the Edit Term form for all taxonomies.
@@ -65,18 +65,18 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current $taxonomy slug.
  */
-do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
+do_action("{$taxonomy}_pre_edit_form", $tag, $taxonomy); ?>
 
 <div class="wrap">
 <h1><?php echo $tax->labels->edit_item; ?></h1>
 
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="updated">
 	<p><strong><?php echo $message; ?></strong></p>
-	<?php if ( $wp_http_referer ) { ?>
-	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php
+	<?php if ($wp_http_referer) { ?>
+	<p><a href="<?php echo esc_url($wp_http_referer); ?>"><?php
 		/* translators: %s: taxonomy name */
-		printf( _x( '&larr; Back to %s', 'admin screen' ), $tax->labels->name );
+		printf(_x('&larr; Back to %s', 'admin screen'), $tax->labels->name);
 	?></a></p>
 	<?php } ?>
 </div>
@@ -92,14 +92,14 @@ 
  *
  * @since 3.7.0
  */
-do_action( "{$taxonomy}_term_edit_form_tag" );
+do_action("{$taxonomy}_term_edit_form_tag");
 ?>>
 <input type="hidden" name="action" value="editedtag"/>
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ) ?>"/>
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ) ?>"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag_ID) ?>"/>
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>"/>
 <?php
-wp_original_referer_field( true, 'previous' );
-wp_nonce_field( 'update-tag_' . $tag_ID );
+wp_original_referer_field(true, 'previous');
+wp_nonce_field('update-tag_'.$tag_ID);
 
 /**
  * Fires at the beginning of the Edit Term form.
@@ -113,17 +113,17 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current $taxonomy slug.
  */
-do_action( "{$taxonomy}_term_edit_form_top", $tag, $taxonomy );
+do_action("{$taxonomy}_term_edit_form_top", $tag, $taxonomy);
 ?>
 	<table class="form-table">
 		<tr class="form-field form-required term-name-wrap">
-			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<th scope="row"><label for="name"><?php _ex('Name', 'term name'); ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php if (isset($tag->name)) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
 			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
-<?php if ( !global_terms_enabled() ) { ?>
+<?php if ( ! global_terms_enabled()) { ?>
 		<tr class="form-field term-slug-wrap">
-			<th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
+			<th scope="row"><label for="slug"><?php _e('Slug'); ?></label></th>
 			<?php
 			/**
 			 * Filters the editable slug.
@@ -138,15 +138,15 @@ 
 			 *                             upon the context in which it is evaluated.
 			 * @param object|WP_Post $tag  Term or WP_Post object.
 			 */
-			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';
+			$slug = isset($tag->slug) ? apply_filters('editable_slug', $tag->slug, $tag) : '';
 			?>
-			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
+			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr($slug); ?>" size="40" />
 			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
 <?php } ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if (is_taxonomy_hierarchical($taxonomy)) : ?>
 		<tr class="form-field term-parent-wrap">
-			<th scope="row"><label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label></th>
+			<th scope="row"><label for="parent"><?php _ex('Parent', 'term parent'); ?></label></th>
 			<td>
 				<?php
 				$dropdown_args = array(
@@ -158,26 +158,26 @@ 
 					'selected'         => $tag->parent,
 					'exclude_tree'     => $tag->term_id,
 					'hierarchical'     => true,
-					'show_option_none' => __( 'None' ),
+					'show_option_none' => __('None'),
 				);
 
 				/** This filter is documented in wp-admin/edit-tags.php */
-				$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
-				wp_dropdown_categories( $dropdown_args ); ?>
-				<?php if ( 'category' == $taxonomy ) : ?>
+				$dropdown_args = apply_filters('taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit');
+				wp_dropdown_categories($dropdown_args); ?>
+				<?php if ('category' == $taxonomy) : ?>
 				<p class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
 				<?php endif; ?>
 			</td>
 		</tr>
 <?php endif; // is_taxonomy_hierarchical() ?>
 		<tr class="form-field term-description-wrap">
-			<th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
+			<th scope="row"><label for="description"><?php _e('Description'); ?></label></th>
 			<td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
 			<p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
 		</tr>
 		<?php
 		// Back compat hooks
-		if ( 'category' == $taxonomy ) {
+		if ('category' == $taxonomy) {
 			/**
 			 * Fires after the Edit Category form fields are displayed.
 			 *
@@ -186,8 +186,8 @@ 
 			 *
 			 * @param object $tag Current category term object.
 			 */
-			do_action( 'edit_category_form_fields', $tag );
-		} elseif ( 'link_category' == $taxonomy ) {
+			do_action('edit_category_form_fields', $tag);
+		} elseif ('link_category' == $taxonomy) {
 			/**
 			 * Fires after the Edit Link Category form fields are displayed.
 			 *
@@ -196,7 +196,7 @@ 
 			 *
 			 * @param object $tag Current link category term object.
 			 */
-			do_action( 'edit_link_category_form_fields', $tag );
+			do_action('edit_link_category_form_fields', $tag);
 		} else {
 			/**
 			 * Fires after the Edit Tag form fields are displayed.
@@ -206,7 +206,7 @@ 
 			 *
 			 * @param object $tag Current tag term object.
 			 */
-			do_action( 'edit_tag_form_fields', $tag );
+			do_action('edit_tag_form_fields', $tag);
 		}
 		/**
 		 * Fires after the Edit Term form fields are displayed.
@@ -219,17 +219,17 @@ 
 		 * @param object $tag      Current taxonomy term object.
 		 * @param string $taxonomy Current taxonomy slug.
 		 */
-		do_action( "{$taxonomy}_edit_form_fields", $tag, $taxonomy );
+		do_action("{$taxonomy}_edit_form_fields", $tag, $taxonomy);
 		?>
 	</table>
 <?php
 // Back compat hooks
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/** This action is documented in wp-admin/edit-tags.php */
-	do_action( 'edit_category_form', $tag );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form', $tag);
+} elseif ('link_category' == $taxonomy) {
 	/** This action is documented in wp-admin/edit-tags.php */
-	do_action( 'edit_link_category_form', $tag );
+	do_action('edit_link_category_form', $tag);
 } else {
 	/**
 	 * Fires at the end of the Edit Term form.
@@ -239,7 +239,7 @@ 
 	 *
 	 * @param object $tag Current taxonomy term object.
 	 */
-	do_action( 'edit_tag_form', $tag );
+	do_action('edit_tag_form', $tag);
 }
 /**
  * Fires at the end of the Edit Term form for all taxonomies.
@@ -251,14 +251,14 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current taxonomy slug.
  */
-do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
+do_action("{$taxonomy}_edit_form", $tag, $taxonomy);
 
-submit_button( __('Update') );
+submit_button(__('Update'));
 ?>
 </form>
 </div>
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.forms.edittag.name.focus();}catch(e){}
 </script>