iqltechnologies / brighty

brighty/wp-admin/post.php

Switch Indentation +263 added lines, -263 removed lines

@@ -70,108 +70,108 @@ 
 }
 
 switch ( $action ) {
-	case 'post-quickdraft-save':
-		// Check nonce and capabilities.
-		$nonce     = $_REQUEST['_wpnonce'];
-		$error_msg = false;
-
-		// For output of the Quick Draft dashboard widget.
-		require_once ABSPATH . 'wp-admin/includes/dashboard.php';
-
-		if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
-			$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
-		}
-
-		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-			exit;
-		}
-
-		if ( $error_msg ) {
-			return wp_dashboard_quick_press( $error_msg );
-		}
-
-		$post = get_post( $_REQUEST['post_ID'] );
-		check_admin_referer( 'add-' . $post->post_type );
-
-		$_POST['comment_status'] = get_default_comment_status( $post->post_type );
-		$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
-
-		// Wrap Quick Draft content in the Paragraph block.
-		if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
-			$_POST['content'] = sprintf(
-				'<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
-				str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
-			);
-		}
-
-		edit_post();
-		wp_dashboard_quick_press();
-		exit;
-
-	case 'postajaxpost':
-	case 'post':
-		check_admin_referer( 'add-' . $post_type );
-		$post_id = 'postajaxpost' === $action ? edit_post() : write_post();
-		redirect_post( $post_id );
-		exit;
-
-	case 'edit':
-		$editing = true;
-
-		if ( empty( $post_id ) ) {
-			wp_redirect( admin_url( 'post.php' ) );
-			exit;
-		}
-
-		if ( ! $post ) {
-			wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
-
-		if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
-		}
-
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
-		}
-
-		if ( 'trash' === $post->post_status ) {
-			wp_die( __( 'You cannot edit this item because it is in the Trash. Please restore it and try again.' ) );
-		}
-
-		if ( ! empty( $_GET['get-post-lock'] ) ) {
-			check_admin_referer( 'lock-post_' . $post_id );
-			wp_set_post_lock( $post_id );
-			wp_redirect( get_edit_post_link( $post_id, 'url' ) );
-			exit;
-		}
-
-		$post_type = $post->post_type;
-		if ( 'post' === $post_type ) {
-			$parent_file   = 'edit.php';
-			$submenu_file  = 'edit.php';
-			$post_new_file = 'post-new.php';
-		} elseif ( 'attachment' === $post_type ) {
-			$parent_file   = 'upload.php';
-			$submenu_file  = 'upload.php';
-			$post_new_file = 'media-new.php';
-		} else {
-			if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
-				$parent_file = $post_type_object->show_in_menu;
-			} else {
-				$parent_file = "edit.php?post_type=$post_type";
-			}
-			$submenu_file  = "edit.php?post_type=$post_type";
-			$post_new_file = "post-new.php?post_type=$post_type";
-		}
-
-		$title = $post_type_object->labels->edit_item;
-
-		/**
+	    case 'post-quickdraft-save':
+		    // Check nonce and capabilities.
+		    $nonce     = $_REQUEST['_wpnonce'];
+		    $error_msg = false;
+
+		    // For output of the Quick Draft dashboard widget.
+		    require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+
+		    if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
+			    $error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+		    }
+
+		    if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+			    exit;
+		    }
+
+		    if ( $error_msg ) {
+			    return wp_dashboard_quick_press( $error_msg );
+		    }
+
+		    $post = get_post( $_REQUEST['post_ID'] );
+		    check_admin_referer( 'add-' . $post->post_type );
+
+		    $_POST['comment_status'] = get_default_comment_status( $post->post_type );
+		    $_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+
+		    // Wrap Quick Draft content in the Paragraph block.
+		    if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
+			    $_POST['content'] = sprintf(
+				    '<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
+				    str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
+			    );
+		    }
+
+		    edit_post();
+		    wp_dashboard_quick_press();
+		    exit;
+
+	    case 'postajaxpost':
+	    case 'post':
+		    check_admin_referer( 'add-' . $post_type );
+		    $post_id = 'postajaxpost' === $action ? edit_post() : write_post();
+		    redirect_post( $post_id );
+		    exit;
+
+	    case 'edit':
+		    $editing = true;
+
+		    if ( empty( $post_id ) ) {
+			    wp_redirect( admin_url( 'post.php' ) );
+			    exit;
+		    }
+
+		    if ( ! $post ) {
+			    wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) );
+		    }
+
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
+
+		    if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+		    }
+
+		    if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+		    }
+
+		    if ( 'trash' === $post->post_status ) {
+			    wp_die( __( 'You cannot edit this item because it is in the Trash. Please restore it and try again.' ) );
+		    }
+
+		    if ( ! empty( $_GET['get-post-lock'] ) ) {
+			    check_admin_referer( 'lock-post_' . $post_id );
+			    wp_set_post_lock( $post_id );
+			    wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+			    exit;
+		    }
+
+		    $post_type = $post->post_type;
+		    if ( 'post' === $post_type ) {
+			    $parent_file   = 'edit.php';
+			    $submenu_file  = 'edit.php';
+			    $post_new_file = 'post-new.php';
+		    } elseif ( 'attachment' === $post_type ) {
+			    $parent_file   = 'upload.php';
+			    $submenu_file  = 'upload.php';
+			    $post_new_file = 'media-new.php';
+		    } else {
+			    if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
+				    $parent_file = $post_type_object->show_in_menu;
+			    } else {
+				    $parent_file = "edit.php?post_type=$post_type";
+			    }
+			    $submenu_file  = "edit.php?post_type=$post_type";
+			    $post_new_file = "post-new.php?post_type=$post_type";
+		    }
+
+		    $title = $post_type_object->labels->edit_item;
+
+		    /**
 		 * Allows replacement of the editor.
 		 *
 		 * @since 4.9.0
@@ -179,179 +179,179 @@ 
 		 * @param bool    $replace Whether to replace the editor. Default false.
 		 * @param WP_Post $post    Post object.
 		 */
-		if ( true === apply_filters( 'replace_editor', false, $post ) ) {
-			break;
-		}
-
-		if ( use_block_editor_for_post( $post ) ) {
-			require ABSPATH . 'wp-admin/edit-form-blocks.php';
-			break;
-		}
-
-		if ( ! wp_check_post_lock( $post->ID ) ) {
-			$active_post_lock = wp_set_post_lock( $post->ID );
-
-			if ( 'attachment' !== $post_type ) {
-				wp_enqueue_script( 'autosave' );
-			}
-		}
-
-		$post = get_post( $post_id, OBJECT, 'edit' );
-
-		if ( post_type_supports( $post_type, 'comments' ) ) {
-			wp_enqueue_script( 'admin-comments' );
-			enqueue_comment_hotkeys_js();
-		}
-
-		require ABSPATH . 'wp-admin/edit-form-advanced.php';
+		    if ( true === apply_filters( 'replace_editor', false, $post ) ) {
+			    break;
+		    }
 
-		break;
+		    if ( use_block_editor_for_post( $post ) ) {
+			    require ABSPATH . 'wp-admin/edit-form-blocks.php';
+			    break;
+		    }
 
-	case 'editattachment':
-		check_admin_referer( 'update-post_' . $post_id );
+		    if ( ! wp_check_post_lock( $post->ID ) ) {
+			    $active_post_lock = wp_set_post_lock( $post->ID );
 
-		// Don't let these be changed.
-		unset( $_POST['guid'] );
-		$_POST['post_type'] = 'attachment';
+			    if ( 'attachment' !== $post_type ) {
+				    wp_enqueue_script( 'autosave' );
+			    }
+		    }
 
-		// Update the thumbnail filename.
-		$newmeta          = wp_get_attachment_metadata( $post_id, true );
-		$newmeta['thumb'] = wp_basename( $_POST['thumb'] );
+		    $post = get_post( $post_id, OBJECT, 'edit' );
 
-		wp_update_attachment_metadata( $post_id, $newmeta );
+		    if ( post_type_supports( $post_type, 'comments' ) ) {
+			    wp_enqueue_script( 'admin-comments' );
+			    enqueue_comment_hotkeys_js();
+		    }
+
+		    require ABSPATH . 'wp-admin/edit-form-advanced.php';
 
-		// Intentional fall-through to trigger the edit_post() call.
-	case 'editpost':
-		check_admin_referer( 'update-post_' . $post_id );
+		    break;
+
+	    case 'editattachment':
+		    check_admin_referer( 'update-post_' . $post_id );
 
-		$post_id = edit_post();
+		    // Don't let these be changed.
+		    unset( $_POST['guid'] );
+		    $_POST['post_type'] = 'attachment';
 
-		// Session cookie flag that the post was saved.
-		if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-			setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
-		}
-
-		redirect_post( $post_id ); // Send user on their way while we keep working.
+		    // Update the thumbnail filename.
+		    $newmeta          = wp_get_attachment_metadata( $post_id, true );
+		    $newmeta['thumb'] = wp_basename( $_POST['thumb'] );
 
-		exit;
+		    wp_update_attachment_metadata( $post_id, $newmeta );
+
+		    // Intentional fall-through to trigger the edit_post() call.
+	    case 'editpost':
+		    check_admin_referer( 'update-post_' . $post_id );
+
+		    $post_id = edit_post();
+
+		    // Session cookie flag that the post was saved.
+		    if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+			    setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
+		    }
+
+		    redirect_post( $post_id ); // Send user on their way while we keep working.
+
+		    exit;
+
+	    case 'trash':
+		    check_admin_referer( 'trash-post_' . $post_id );
 
-	case 'trash':
-		check_admin_referer( 'trash-post_' . $post_id );
+		    if ( ! $post ) {
+			    wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+		    }
 
-		if ( ! $post ) {
-			wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
+
+		    if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+		    }
 
-		if ( ! current_user_can( 'delete_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
-		}
-
-		$user_id = wp_check_post_lock( $post_id );
-		if ( $user_id ) {
-			$user = get_userdata( $user_id );
-			/* translators: %s: User's display name. */
-			wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
-		}
-
-		if ( ! wp_trash_post( $post_id ) ) {
-			wp_die( __( 'Error in moving the item to Trash.' ) );
-		}
-
-		wp_redirect(
-			add_query_arg(
-				array(
-					'trashed' => 1,
-					'ids'     => $post_id,
-				),
-				$sendback
-			)
-		);
-		exit;
-
-	case 'untrash':
-		check_admin_referer( 'untrash-post_' . $post_id );
-
-		if ( ! $post ) {
-			wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
+		    $user_id = wp_check_post_lock( $post_id );
+		    if ( $user_id ) {
+			    $user = get_userdata( $user_id );
+			    /* translators: %s: User's display name. */
+			    wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+		    }
+
+		    if ( ! wp_trash_post( $post_id ) ) {
+			    wp_die( __( 'Error in moving the item to Trash.' ) );
+		    }
+
+		    wp_redirect(
+			    add_query_arg(
+				    array(
+					    'trashed' => 1,
+					    'ids'     => $post_id,
+				    ),
+				    $sendback
+			    )
+		    );
+		    exit;
+
+	    case 'untrash':
+		    check_admin_referer( 'untrash-post_' . $post_id );
+
+		    if ( ! $post ) {
+			    wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+		    }
+
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
 
-		if ( ! current_user_can( 'delete_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
-		}
-
-		if ( ! wp_untrash_post( $post_id ) ) {
-			wp_die( __( 'Error in restoring the item from Trash.' ) );
-		}
-
-		$sendback = add_query_arg(
-			array(
-				'untrashed' => 1,
-				'ids'       => $post_id,
-			),
-			$sendback
-		);
-		wp_redirect( $sendback );
-		exit;
-
-	case 'delete':
-		check_admin_referer( 'delete-post_' . $post_id );
-
-		if ( ! $post ) {
-			wp_die( __( 'This item has already been deleted.' ) );
-		}
-
-		if ( ! $post_type_object ) {
-			wp_die( __( 'Invalid post type.' ) );
-		}
-
-		if ( ! current_user_can( 'delete_post', $post_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
-		}
-
-		if ( 'attachment' === $post->post_type ) {
-			$force = ( ! MEDIA_TRASH );
-			if ( ! wp_delete_attachment( $post_id, $force ) ) {
-				wp_die( __( 'Error in deleting the attachment.' ) );
-			}
-		} else {
-			if ( ! wp_delete_post( $post_id, true ) ) {
-				wp_die( __( 'Error in deleting the item.' ) );
-			}
-		}
-
-		wp_redirect( add_query_arg( 'deleted', 1, $sendback ) );
-		exit;
-
-	case 'preview':
-		check_admin_referer( 'update-post_' . $post_id );
-
-		$url = post_preview();
-
-		wp_redirect( $url );
-		exit;
-
-	case 'toggle-custom-fields':
-		check_admin_referer( 'toggle-custom-fields', 'toggle-custom-fields-nonce' );
-
-		$current_user_id = get_current_user_id();
-		if ( $current_user_id ) {
-			$enable_custom_fields = (bool) get_user_meta( $current_user_id, 'enable_custom_fields', true );
-			update_user_meta( $current_user_id, 'enable_custom_fields', ! $enable_custom_fields );
-		}
+		    if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+		    }
 
-		wp_safe_redirect( wp_get_referer() );
-		exit;
+		    if ( ! wp_untrash_post( $post_id ) ) {
+			    wp_die( __( 'Error in restoring the item from Trash.' ) );
+		    }
 
-	default:
-		/**
+		    $sendback = add_query_arg(
+			    array(
+				    'untrashed' => 1,
+				    'ids'       => $post_id,
+			    ),
+			    $sendback
+		    );
+		    wp_redirect( $sendback );
+		    exit;
+
+	    case 'delete':
+		    check_admin_referer( 'delete-post_' . $post_id );
+
+		    if ( ! $post ) {
+			    wp_die( __( 'This item has already been deleted.' ) );
+		    }
+
+		    if ( ! $post_type_object ) {
+			    wp_die( __( 'Invalid post type.' ) );
+		    }
+
+		    if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+		    }
+
+		    if ( 'attachment' === $post->post_type ) {
+			    $force = ( ! MEDIA_TRASH );
+			    if ( ! wp_delete_attachment( $post_id, $force ) ) {
+				    wp_die( __( 'Error in deleting the attachment.' ) );
+			    }
+		    } else {
+			    if ( ! wp_delete_post( $post_id, true ) ) {
+				    wp_die( __( 'Error in deleting the item.' ) );
+			    }
+		    }
+
+		    wp_redirect( add_query_arg( 'deleted', 1, $sendback ) );
+		    exit;
+
+	    case 'preview':
+		    check_admin_referer( 'update-post_' . $post_id );
+
+		    $url = post_preview();
+
+		    wp_redirect( $url );
+		    exit;
+
+	    case 'toggle-custom-fields':
+		    check_admin_referer( 'toggle-custom-fields', 'toggle-custom-fields-nonce' );
+
+		    $current_user_id = get_current_user_id();
+		    if ( $current_user_id ) {
+			    $enable_custom_fields = (bool) get_user_meta( $current_user_id, 'enable_custom_fields', true );
+			    update_user_meta( $current_user_id, 'enable_custom_fields', ! $enable_custom_fields );
+		    }
+
+		    wp_safe_redirect( wp_get_referer() );
+		    exit;
+
+	    default:
+		    /**
 		 * Fires for a given custom post action request.
 		 *
 		 * The dynamic portion of the hook name, `$action`, refers to the custom post action.
@@ -360,10 +360,10 @@ 
 		 *
 		 * @param int $post_id Post ID sent with the request.
 		 */
-		do_action( "post_action_{$action}", $post_id );
+		    do_action( "post_action_{$action}", $post_id );
 
-		wp_redirect( admin_url( 'edit.php' ) );
-		exit;
+		    wp_redirect( admin_url( 'edit.php' ) );
+		    exit;
 } // End switch.
 
 require_once ABSPATH . 'wp-admin/admin-footer.php';

brighty/wp-admin/comment.php

Switch Indentation +127 added lines, -127 removed lines

@@ -52,83 +52,83 @@ 
 
 switch ( $action ) {
 
-	case 'editcomment':
-		// Used in the HTML title tag.
-		$title = __( 'Edit Comment' );
-
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => 'overview',
-				'title'   => __( 'Overview' ),
-				'content' =>
-					'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-					'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>',
-			)
-		);
-
-		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
-		);
-
-		wp_enqueue_script( 'comment' );
-		require_once ABSPATH . 'wp-admin/admin-header.php';
-
-		if ( ! $comment ) {
-			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
-		}
-
-		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
-			comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
-		}
-
-		if ( 'trash' === $comment->comment_approved ) {
-			comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
-		}
-
-		$comment = get_comment_to_edit( $comment_id );
-
-		require ABSPATH . 'wp-admin/edit-form-comment.php';
-
-		break;
-
-	case 'delete':
-	case 'approve':
-	case 'trash':
-	case 'spam':
-		// Used in the HTML title tag.
-		$title = __( 'Moderate Comment' );
-
-		if ( ! $comment ) {
-			wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
-			die();
-		}
-
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-			wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
-			die();
-		}
-
-		// No need to re-approve/re-trash/re-spam a comment.
-		if ( str_replace( '1', 'approve', $comment->comment_approved ) === $action ) {
-			wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-			die();
-		}
-
-		require_once ABSPATH . 'wp-admin/admin-header.php';
-
-		$formaction    = $action . 'comment';
-		$nonce_action  = ( 'approve' === $action ) ? 'approve-comment_' : 'delete-comment_';
-		$nonce_action .= $comment_id;
-
-		?>
+	    case 'editcomment':
+		    // Used in the HTML title tag.
+		    $title = __( 'Edit Comment' );
+
+		    get_current_screen()->add_help_tab(
+			    array(
+				    'id'      => 'overview',
+				    'title'   => __( 'Overview' ),
+				    'content' =>
+					    '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+					    '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>',
+			    )
+		    );
+
+		    get_current_screen()->set_help_sidebar(
+			    '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+			    '<p>' . __( '<a href="https://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
+			    '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+		    );
+
+		    wp_enqueue_script( 'comment' );
+		    require_once ABSPATH . 'wp-admin/admin-header.php';
+
+		    if ( ! $comment ) {
+			    comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
+		    }
+
+		    if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+			    comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
+		    }
+
+		    if ( 'trash' === $comment->comment_approved ) {
+			    comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
+		    }
+
+		    $comment = get_comment_to_edit( $comment_id );
+
+		    require ABSPATH . 'wp-admin/edit-form-comment.php';
+
+		    break;
+
+	    case 'delete':
+	    case 'approve':
+	    case 'trash':
+	    case 'spam':
+		    // Used in the HTML title tag.
+		    $title = __( 'Moderate Comment' );
+
+		    if ( ! $comment ) {
+			    wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
+			    die();
+		    }
+
+		    if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			    wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
+			    die();
+		    }
+
+		    // No need to re-approve/re-trash/re-spam a comment.
+		    if ( str_replace( '1', 'approve', $comment->comment_approved ) === $action ) {
+			    wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+			    die();
+		    }
+
+		    require_once ABSPATH . 'wp-admin/admin-header.php';
+
+		    $formaction    = $action . 'comment';
+		    $nonce_action  = ( 'approve' === $action ) ? 'approve-comment_' : 'delete-comment_';
+		    $nonce_action .= $comment_id;
+
+		    ?>
 	<div class="wrap">
 
 	<h1><?php echo esc_html( $title ); ?></h1>
 
 		<?php
-		switch ( $action ) {
+		    switch ( $action ) {
 			case 'spam':
 				$caution_msg = __( 'You are about to mark the following comment as spam:' );
 				$button      = _x( 'Mark as spam', 'comment' );
@@ -145,7 +145,7 @@ 
 				$caution_msg = __( 'You are about to approve the following comment:' );
 				$button      = __( 'Approve comment' );
 				break;
-		}
+		    }
 
 		if ( '0' !== $comment->comment_approved ) { // If not unapproved.
 			$message = '';
@@ -257,44 +257,44 @@ 
 		<?php
 		break;
 
-	case 'deletecomment':
-	case 'trashcomment':
-	case 'untrashcomment':
-	case 'spamcomment':
-	case 'unspamcomment':
-	case 'approvecomment':
-	case 'unapprovecomment':
-		$comment_id = absint( $_REQUEST['c'] );
-
-		if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
-			check_admin_referer( 'approve-comment_' . $comment_id );
-		} else {
-			check_admin_referer( 'delete-comment_' . $comment_id );
-		}
-
-		$noredir = isset( $_REQUEST['noredir'] );
-
-		$comment = get_comment( $comment_id );
-		if ( ! $comment ) {
-			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
-		}
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-			comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
-		}
-
-		if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
-			$redir = wp_get_referer();
-		} elseif ( wp_get_original_referer() && ! $noredir ) {
-			$redir = wp_get_original_referer();
-		} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
-			$redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-		} else {
-			$redir = admin_url( 'edit-comments.php' );
-		}
-
-		$redir = remove_query_arg( array( 'spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved' ), $redir );
-
-		switch ( $action ) {
+	    case 'deletecomment':
+	    case 'trashcomment':
+	    case 'untrashcomment':
+	    case 'spamcomment':
+	    case 'unspamcomment':
+	    case 'approvecomment':
+	    case 'unapprovecomment':
+		    $comment_id = absint( $_REQUEST['c'] );
+
+		    if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
+			    check_admin_referer( 'approve-comment_' . $comment_id );
+		    } else {
+			    check_admin_referer( 'delete-comment_' . $comment_id );
+		    }
+
+		    $noredir = isset( $_REQUEST['noredir'] );
+
+		    $comment = get_comment( $comment_id );
+		    if ( ! $comment ) {
+			    comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
+		    }
+		    if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			    comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+		    }
+
+		    if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
+			    $redir = wp_get_referer();
+		    } elseif ( wp_get_original_referer() && ! $noredir ) {
+			    $redir = wp_get_original_referer();
+		    } elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
+			    $redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+		    } else {
+			    $redir = admin_url( 'edit-comments.php' );
+		    }
+
+		    $redir = remove_query_arg( array( 'spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved' ), $redir );
+
+		    switch ( $action ) {
 			case 'deletecomment':
 				wp_delete_comment( $comment );
 				$redir = add_query_arg( array( 'deleted' => '1' ), $redir );
@@ -335,25 +335,25 @@ 
 				wp_set_comment_status( $comment, 'hold' );
 				$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
 				break;
-		}
+		    }
 
 		wp_redirect( $redir );
 		die;
 
-	case 'editedcomment':
-		$comment_id      = absint( $_POST['comment_ID'] );
-		$comment_post_id = absint( $_POST['comment_post_ID'] );
+	    case 'editedcomment':
+		    $comment_id      = absint( $_POST['comment_ID'] );
+		    $comment_post_id = absint( $_POST['comment_post_ID'] );
 
-		check_admin_referer( 'update-comment_' . $comment_id );
+		    check_admin_referer( 'update-comment_' . $comment_id );
 
-		$updated = edit_comment();
-		if ( is_wp_error( $updated ) ) {
-			wp_die( $updated->get_error_message() );
-		}
+		    $updated = edit_comment();
+		    if ( is_wp_error( $updated ) ) {
+			    wp_die( $updated->get_error_message() );
+		    }
 
-		$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+		    $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
 
-		/**
+		    /**
 		 * Filters the URI the user is redirected to after editing a comment in the admin.
 		 *
 		 * @since 2.1.0
@@ -361,13 +361,13 @@ 
 		 * @param string $location The URI the user will be redirected to.
 		 * @param int $comment_id The ID of the comment being edited.
 		 */
-		$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+		    $location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
 
-		wp_redirect( $location );
-		exit;
+		    wp_redirect( $location );
+		    exit;
 
-	default:
-		wp_die( __( 'Unknown action.' ) );
+	    default:
+		    wp_die( __( 'Unknown action.' ) );
 
 } // End switch.
 

brighty/wp-admin/user-edit.php

Switch Indentation +305 added lines, -305 removed lines

@@ -125,15 +125,15 @@ 
 }
 
 switch ( $action ) {
-	case 'update':
-		check_admin_referer( 'update-user_' . $user_id );
+	    case 'update':
+		    check_admin_referer( 'update-user_' . $user_id );
 
-		if ( ! current_user_can( 'edit_user', $user_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
-		}
+		    if ( ! current_user_can( 'edit_user', $user_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+		    }
 
-		if ( IS_PROFILE_PAGE ) {
-			/**
+		    if ( IS_PROFILE_PAGE ) {
+			    /**
 			 * Fires before the page loads on the 'Profile' editing screen.
 			 *
 			 * The action only fires if the current user is editing their own profile.
@@ -142,86 +142,86 @@ 
 			 *
 			 * @param int $user_id The user ID.
 			 */
-			do_action( 'personal_options_update', $user_id );
-		} else {
-			/**
+			    do_action( 'personal_options_update', $user_id );
+		    } else {
+			    /**
 			 * Fires before the page loads on the 'Edit User' screen.
 			 *
 			 * @since 2.7.0
 			 *
 			 * @param int $user_id The user ID.
 			 */
-			do_action( 'edit_user_profile_update', $user_id );
-		}
-
-		// Update the email address in signups, if present.
-		if ( is_multisite() ) {
-			$user = get_userdata( $user_id );
-
-			if ( $user->user_login && isset( $_POST['email'] ) && is_email( $_POST['email'] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login ) );
-			}
-		}
-
-		// Update the user.
-		$errors = edit_user( $user_id );
-
-		// Grant or revoke super admin status if requested.
-		if ( is_multisite() && is_network_admin()
-			&& ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' )
-			&& ! isset( $super_admins ) && empty( $_POST['super_admin'] ) === is_super_admin( $user_id )
-		) {
-			empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
-		}
-
-		if ( ! is_wp_error( $errors ) ) {
-			$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-			if ( $wp_http_referer ) {
-				$redirect = add_query_arg( 'wp_http_referer', urlencode( $wp_http_referer ), $redirect );
-			}
-			wp_redirect( $redirect );
-			exit;
-		}
-
-		// Intentional fall-through to display $errors.
-	default:
-		$profile_user = get_user_to_edit( $user_id );
-
-		if ( ! current_user_can( 'edit_user', $user_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
-		}
-
-		$title    = sprintf( $title, $profile_user->display_name );
-		$sessions = WP_Session_Tokens::get_instance( $profile_user->ID );
-
-		require_once ABSPATH . 'wp-admin/admin-header.php';
-		?>
-
+			    do_action( 'edit_user_profile_update', $user_id );
+		    }
+
+		    // Update the email address in signups, if present.
+		    if ( is_multisite() ) {
+			    $user = get_userdata( $user_id );
+
+			    if ( $user->user_login && isset( $_POST['email'] ) && is_email( $_POST['email'] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
+				    $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login ) );
+			    }
+		    }
+
+		    // Update the user.
+		    $errors = edit_user( $user_id );
+
+		    // Grant or revoke super admin status if requested.
+		    if ( is_multisite() && is_network_admin()
+			    && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' )
+			    && ! isset( $super_admins ) && empty( $_POST['super_admin'] ) === is_super_admin( $user_id )
+		    ) {
+			    empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+		    }
+
+		    if ( ! is_wp_error( $errors ) ) {
+			    $redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
+			    if ( $wp_http_referer ) {
+				    $redirect = add_query_arg( 'wp_http_referer', urlencode( $wp_http_referer ), $redirect );
+			    }
+			    wp_redirect( $redirect );
+			    exit;
+		    }
+
+		    // Intentional fall-through to display $errors.
+	    default:
+		    $profile_user = get_user_to_edit( $user_id );
+
+		    if ( ! current_user_can( 'edit_user', $user_id ) ) {
+			    wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+		    }
+
+		    $title    = sprintf( $title, $profile_user->display_name );
+		    $sessions = WP_Session_Tokens::get_instance( $profile_user->ID );
+
+		    require_once ABSPATH . 'wp-admin/admin-header.php';
+		    ?>
+    
 		<?php if ( ! IS_PROFILE_PAGE && is_super_admin( $profile_user->ID ) && current_user_can( 'manage_network_options' ) ) : ?>
-			<div class="notice notice-info"><p><strong><?php _e( 'Important:' ); ?></strong> <?php _e( 'This user has super admin privileges.' ); ?></p></div>
+    			<div class="notice notice-info"><p><strong><?php _e( 'Important:' ); ?></strong> <?php _e( 'This user has super admin privileges.' ); ?></p></div>
 		<?php endif; ?>
-
+    
 		<?php if ( isset( $_GET['updated'] ) ) : ?>
-			<div id="message" class="updated notice is-dismissible">
+    			<div id="message" class="updated notice is-dismissible">
 				<?php if ( IS_PROFILE_PAGE ) : ?>
-					<p><strong><?php _e( 'Profile updated.' ); ?></strong></p>
+    					<p><strong><?php _e( 'Profile updated.' ); ?></strong></p>
 				<?php else : ?>
-					<p><strong><?php _e( 'User updated.' ); ?></strong></p>
+    					<p><strong><?php _e( 'User updated.' ); ?></strong></p>
 				<?php endif; ?>
-				<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
-					<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Go to Users' ); ?></a></p>
+    				<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
+    					<p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Go to Users' ); ?></a></p>
 				<?php endif; ?>
-			</div>
+    			</div>
 		<?php endif; ?>
-
+    
 		<?php if ( isset( $_GET['error'] ) ) : ?>
-			<div class="notice notice-error">
+    			<div class="notice notice-error">
 			<?php if ( 'new-email' === $_GET['error'] ) : ?>
-				<p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
+    				<p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
 			<?php endif; ?>
-			</div>
+    			</div>
 		<?php endif; ?>
-
+    
 		<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
 			<div class="error">
 				<p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p>
@@ -231,31 +231,31 @@ 
 		<div class="wrap" id="profile-page">
 			<h1 class="wp-heading-inline">
 					<?php echo esc_html( $title ); ?>
-			</h1>
+    			</h1>
 
 			<?php if ( ! IS_PROFILE_PAGE ) : ?>
-				<?php if ( current_user_can( 'create_users' ) ) : ?>
-					<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
+    				<?php if ( current_user_can( 'create_users' ) ) : ?>
+    					<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
 				<?php elseif ( is_multisite() && current_user_can( 'promote_users' ) ) : ?>
-					<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+    					<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 				<?php endif; ?>
-			<?php endif; ?>
+    			<?php endif; ?>
 
 			<hr class="wp-header-end">
 
 			<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"
 				<?php
-				/**
+				    /**
 				 * Fires inside the your-profile form tag on the user editing screen.
 				 *
 				 * @since 3.0.0
 				 */
-				do_action( 'user_edit_form_tag' );
-				?>
-				>
+				    do_action( 'user_edit_form_tag' );
+				    ?>
+    				>
 				<?php wp_nonce_field( 'update-user_' . $user_id ); ?>
-				<?php if ( $wp_http_referer ) : ?>
-					<input type="hidden" name="wp_http_referer" value="<?php echo esc_url( $wp_http_referer ); ?>" />
+    				<?php if ( $wp_http_referer ) : ?>
+    					<input type="hidden" name="wp_http_referer" value="<?php echo esc_url( $wp_http_referer ); ?>" />
 				<?php endif; ?>
 				<p>
 					<input type="hidden" name="from" value="profile" />
@@ -275,20 +275,20 @@ 
 							</td>
 						</tr>
 					<?php endif; ?>
-
+    
 					<?php
-					$show_syntax_highlighting_preference = (
-					// For Custom HTML widget and Additional CSS in Customizer.
-					user_can( $profile_user, 'edit_theme_options' )
-					||
-					// Edit plugins.
-					user_can( $profile_user, 'edit_plugins' )
-					||
-					// Edit themes.
-					user_can( $profile_user, 'edit_themes' )
-					);
-					?>
-
+					    $show_syntax_highlighting_preference = (
+					    // For Custom HTML widget and Additional CSS in Customizer.
+					    user_can( $profile_user, 'edit_theme_options' )
+					    ||
+					    // Edit plugins.
+					    user_can( $profile_user, 'edit_plugins' )
+					    ||
+					    // Edit themes.
+					    user_can( $profile_user, 'edit_themes' )
+					    );
+					    ?>
+    
 					<?php if ( $show_syntax_highlighting_preference ) : ?>
 					<tr class="user-syntax-highlighting-wrap">
 						<th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
@@ -299,13 +299,13 @@ 
 						</td>
 					</tr>
 					<?php endif; ?>
-
+    
 					<?php if ( count( $_wp_admin_css_colors ) > 1 && has_action( 'admin_color_scheme_picker' ) ) : ?>
 					<tr class="user-admin-color-wrap">
 						<th scope="row"><?php _e( 'Admin Color Scheme' ); ?></th>
 						<td>
 							<?php
-							/**
+							    /**
 							 * Fires in the 'Admin Color Scheme' section of the user editing screen.
 							 *
 							 * The section is only enabled if a callback is hooked to the action,
@@ -316,12 +316,12 @@ 
 							 *
 							 * @param int $user_id The user ID.
 							 */
-							do_action( 'admin_color_scheme_picker', $user_id );
-							?>
+							    do_action( 'admin_color_scheme_picker', $user_id );
+							    ?>
 						</td>
 					</tr>
 					<?php endif; // End if count ( $_wp_admin_css_colors ) > 1 ?>
-
+    
 					<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
 					<tr class="user-comment-shortcuts-wrap">
 						<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
@@ -329,7 +329,7 @@ 
 							<label for="comment_shortcuts">
 								<input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profile_user->comment_shortcuts ); ?> />
 								<?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?>
-							</label>
+    							</label>
 							<?php _e( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/" target="_blank">More information</a>' ); ?>
 						</td>
 					</tr>
@@ -346,52 +346,52 @@ 
 					</tr>
 
 					<?php $languages = get_available_languages(); ?>
-					<?php if ( $languages ) : ?>
+    					<?php if ( $languages ) : ?>
 					<tr class="user-language-wrap">
 						<th scope="row">
 							<?php /* translators: The user language selection field label. */ ?>
-							<label for="locale"><?php _e( 'Language' ); ?><span class="dashicons dashicons-translation" aria-hidden="true"></span></label>
+    							<label for="locale"><?php _e( 'Language' ); ?><span class="dashicons dashicons-translation" aria-hidden="true"></span></label>
 						</th>
 						<td>
 							<?php
-								$user_locale = $profile_user->locale;
-
-							if ( 'en_US' === $user_locale ) {
-								$user_locale = '';
-							} elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
-								$user_locale = 'site-default';
-							}
-
-							wp_dropdown_languages(
-								array(
-									'name'      => 'locale',
-									'id'        => 'locale',
-									'selected'  => $user_locale,
-									'languages' => $languages,
-									'show_available_translations' => false,
-									'show_option_site_default' => true,
-								)
-							);
-							?>
+								    $user_locale = $profile_user->locale;
+
+							    if ( 'en_US' === $user_locale ) {
+								    $user_locale = '';
+							    } elseif ( '' === $user_locale || ! in_array( $user_locale, $languages, true ) ) {
+								    $user_locale = 'site-default';
+							    }
+
+							    wp_dropdown_languages(
+								    array(
+									    'name'      => 'locale',
+									    'id'        => 'locale',
+									    'selected'  => $user_locale,
+									    'languages' => $languages,
+									    'show_available_translations' => false,
+									    'show_option_site_default' => true,
+								    )
+							    );
+							    ?>
 						</td>
 					</tr>
 					<?php endif; ?>
-
+    
 					<?php
-					/**
+					    /**
 					 * Fires at the end of the 'Personal Options' settings table on the user editing screen.
 					 *
 					 * @since 2.7.0
 					 *
 					 * @param WP_User $profile_user The current WP_User object.
 					 */
-					do_action( 'personal_options', $profile_user );
-					?>
+					    do_action( 'personal_options', $profile_user );
+					    ?>
 
 				</table>
 				<?php
-				if ( IS_PROFILE_PAGE ) {
-					/**
+				    if ( IS_PROFILE_PAGE ) {
+					    /**
 					 * Fires after the 'Personal Options' settings table on the 'Profile' editing screen.
 					 *
 					 * The action only fires if the current user is editing their own profile.
@@ -400,9 +400,9 @@ 
 					 *
 					 * @param WP_User $profile_user The current WP_User object.
 					 */
-					do_action( 'profile_personal_options', $profile_user );
-				}
-				?>
+					    do_action( 'profile_personal_options', $profile_user );
+				    }
+				    ?>
 
 				<h2><?php _e( 'Name' ); ?></h2>
 
@@ -418,33 +418,33 @@ 
 							<td>
 								<select name="role" id="role">
 									<?php
-									// Compare user role against currently editable roles.
-									$user_roles = array_intersect( array_values( $profile_user->roles ), array_keys( get_editable_roles() ) );
-									$user_role  = reset( $user_roles );
-
-									// Print the full list of roles with the primary one selected.
-									wp_dropdown_roles( $user_role );
-
-									// Print the 'no role' option. Make it selected if the user has no role yet.
-									if ( $user_role ) {
-										echo '<option value="">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
-									} else {
-										echo '<option value="" selected="selected">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
-									}
-									?>
+									    // Compare user role against currently editable roles.
+									    $user_roles = array_intersect( array_values( $profile_user->roles ), array_keys( get_editable_roles() ) );
+									    $user_role  = reset( $user_roles );
+
+									    // Print the full list of roles with the primary one selected.
+									    wp_dropdown_roles( $user_role );
+
+									    // Print the 'no role' option. Make it selected if the user has no role yet.
+									    if ( $user_role ) {
+										    echo '<option value="">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
+									    } else {
+										    echo '<option value="" selected="selected">' . __( '&mdash; No role for this site &mdash;' ) . '</option>';
+									    }
+									    ?>
 							</select>
 							</td>
 						</tr>
 					<?php endif; // End if ! IS_PROFILE_PAGE. ?>
-
+    
 					<?php if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) ) : ?>
 						<tr class="user-super-admin-wrap">
 							<th><?php _e( 'Super Admin' ); ?></th>
 							<td>
 								<?php if ( 0 !== strcasecmp( $profile_user->user_email, get_site_option( 'admin_email' ) ) || ! is_super_admin( $profile_user->ID ) ) : ?>
-									<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profile_user->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
+    									<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profile_user->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
 								<?php else : ?>
-									<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+    									<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
 								<?php endif; ?>
 							</td>
 						</tr>
@@ -472,33 +472,33 @@ 
 						<td>
 							<select name="display_name" id="display_name">
 								<?php
-									$public_display                     = array();
-									$public_display['display_nickname'] = $profile_user->nickname;
-									$public_display['display_username'] = $profile_user->user_login;
+									    $public_display                     = array();
+									    $public_display['display_nickname'] = $profile_user->nickname;
+									    $public_display['display_username'] = $profile_user->user_login;
 
-								if ( ! empty( $profile_user->first_name ) ) {
-									$public_display['display_firstname'] = $profile_user->first_name;
-								}
+								    if ( ! empty( $profile_user->first_name ) ) {
+									    $public_display['display_firstname'] = $profile_user->first_name;
+								    }
 
-								if ( ! empty( $profile_user->last_name ) ) {
-									$public_display['display_lastname'] = $profile_user->last_name;
-								}
+								    if ( ! empty( $profile_user->last_name ) ) {
+									    $public_display['display_lastname'] = $profile_user->last_name;
+								    }
 
-								if ( ! empty( $profile_user->first_name ) && ! empty( $profile_user->last_name ) ) {
-									$public_display['display_firstlast'] = $profile_user->first_name . ' ' . $profile_user->last_name;
-									$public_display['display_lastfirst'] = $profile_user->last_name . ' ' . $profile_user->first_name;
-								}
+								    if ( ! empty( $profile_user->first_name ) && ! empty( $profile_user->last_name ) ) {
+									    $public_display['display_firstlast'] = $profile_user->first_name . ' ' . $profile_user->last_name;
+									    $public_display['display_lastfirst'] = $profile_user->last_name . ' ' . $profile_user->first_name;
+								    }
 
-								if ( ! in_array( $profile_user->display_name, $public_display, true ) ) { // Only add this if it isn't duplicated elsewhere.
-									$public_display = array( 'display_displayname' => $profile_user->display_name ) + $public_display;
-								}
+								    if ( ! in_array( $profile_user->display_name, $public_display, true ) ) { // Only add this if it isn't duplicated elsewhere.
+									    $public_display = array( 'display_displayname' => $profile_user->display_name ) + $public_display;
+								    }
 
-								$public_display = array_map( 'trim', $public_display );
-								$public_display = array_unique( $public_display );
+								    $public_display = array_map( 'trim', $public_display );
+								    $public_display = array_unique( $public_display );
 
-								?>
-								<?php foreach ( $public_display as $id => $item ) : ?>
-									<option <?php selected( $profile_user->display_name, $item ); ?>><?php echo $item; ?></option>
+								    ?>
+    								<?php foreach ( $public_display as $id => $item ) : ?>
+    									<option <?php selected( $profile_user->display_name, $item ); ?>><?php echo $item; ?></option>
 								<?php endforeach; ?>
 							</select>
 						</td>
@@ -513,27 +513,27 @@ 
 						<td>
 							<input type="email" name="email" id="email" aria-describedby="email-description" value="<?php echo esc_attr( $profile_user->user_email ); ?>" class="regular-text ltr" />
 							<?php if ( $profile_user->ID === $current_user->ID ) : ?>
-								<p class="description" id="email-description">
+    								<p class="description" id="email-description">
 									<?php _e( 'If you change this, an email will be sent at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?>
-								</p>
+    								</p>
 							<?php endif; ?>
-
+    
 							<?php $new_email = get_user_meta( $current_user->ID, '_new_email', true ); ?>
-							<?php if ( $new_email && $new_email['newemail'] !== $current_user->user_email && $profile_user->ID === $current_user->ID ) : ?>
+    							<?php if ( $new_email && $new_email['newemail'] !== $current_user->user_email && $profile_user->ID === $current_user->ID ) : ?>
 							<div class="updated inline">
 								<p>
 									<?php
-									printf(
-										/* translators: %s: New email. */
-										__( 'There is a pending change of your email to %s.' ),
-										'<code>' . esc_html( $new_email['newemail'] ) . '</code>'
-									);
-									printf(
-										' <a href="%1$s">%2$s</a>',
-										esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
-										__( 'Cancel' )
-									);
-									?>
+									    printf(
+										    /* translators: %s: New email. */
+										    __( 'There is a pending change of your email to %s.' ),
+										    '<code>' . esc_html( $new_email['newemail'] ) . '</code>'
+									    );
+									    printf(
+										    ' <a href="%1$s">%2$s</a>',
+										    esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
+										    __( 'Cancel' )
+									    );
+									    ?>
 								</p>
 							</div>
 							<?php endif; ?>
@@ -546,11 +546,11 @@ 
 					</tr>
 
 					<?php foreach ( wp_get_user_contact_methods( $profile_user ) as $name => $desc ) : ?>
-					<tr class="user-<?php echo $name; ?>-wrap">
+    					<tr class="user-<?php echo $name; ?>-wrap">
 						<th>
 							<label for="<?php echo $name; ?>">
 							<?php
-							/**
+							    /**
 							 * Filters a user contactmethod label.
 							 *
 							 * The dynamic portion of the hook name, `$name`, refers to
@@ -560,8 +560,8 @@ 
 							 *
 							 * @param string $desc The translatable label for the contact method.
 							 */
-							echo apply_filters( "user_{$name}_label", $desc );
-							?>
+							    echo apply_filters( "user_{$name}_label", $desc );
+							    ?>
 							</label>
 						</th>
 						<td>
@@ -585,19 +585,19 @@ 
 							<th><?php _e( 'Profile Picture' ); ?></th>
 							<td>
 								<?php echo get_avatar( $user_id ); ?>
-								<p class="description">
+    								<p class="description">
 									<?php
-									if ( IS_PROFILE_PAGE ) {
-										$description = sprintf(
-											/* translators: %s: Gravatar URL. */
-											__( '<a href="%s">You can change your profile picture on Gravatar</a>.' ),
-											__( 'https://en.gravatar.com/' )
-										);
-									} else {
-										$description = '';
-									}
-
-									/**
+									    if ( IS_PROFILE_PAGE ) {
+										    $description = sprintf(
+											    /* translators: %s: Gravatar URL. */
+											    __( '<a href="%s">You can change your profile picture on Gravatar</a>.' ),
+											    __( 'https://en.gravatar.com/' )
+										    );
+									    } else {
+										    $description = '';
+									    }
+
+									    /**
 									 * Filters the user profile picture description displayed under the Gravatar.
 									 *
 									 * @since 4.4.0
@@ -606,14 +606,14 @@ 
 									 * @param string  $description  The description that will be printed.
 									 * @param WP_User $profile_user The current WP_User object.
 									 */
-									echo apply_filters( 'user_profile_picture_description', $description, $profile_user );
-									?>
+									    echo apply_filters( 'user_profile_picture_description', $description, $profile_user );
+									    ?>
 								</p>
 							</td>
 						</tr>
 					<?php endif; ?>
-					<?php
-					/**
+    					<?php
+					    /**
 					 * Filters the display of the password fields.
 					 *
 					 * @since 1.5.1
@@ -623,9 +623,9 @@ 
 					 * @param bool    $show         Whether to show the password fields. Default true.
 					 * @param WP_User $profile_user User object for the current user to edit.
 					 */
-					$show_password_fields = apply_filters( 'show_password_fields', true, $profile_user );
-					?>
-					<?php if ( $show_password_fields ) : ?>
+					    $show_password_fields = apply_filters( 'show_password_fields', true, $profile_user );
+					    ?>
+    					<?php if ( $show_password_fields ) : ?>
 						</table>
 
 						<h2><?php _e( 'Account Management' ); ?></h2>
@@ -657,9 +657,9 @@ 
 								<td>
 								<input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="new-password" aria-describedby="pass2-desc" />
 									<?php if ( IS_PROFILE_PAGE ) : ?>
-										<p class="description" id="pass2-desc"><?php _e( 'Type your new password again.' ); ?></p>
+    										<p class="description" id="pass2-desc"><?php _e( 'Type your new password again.' ); ?></p>
 									<?php else : ?>
-										<p class="description" id="pass2-desc"><?php _e( 'Type the new password again.' ); ?></p>
+    										<p class="description" id="pass2-desc"><?php _e( 'Type the new password again.' ); ?></p>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -673,9 +673,9 @@ 
 								</td>
 							</tr>
 							<?php endif; // End Show Password Fields. ?>
-
+    
 							<?php // Allow admins to send reset password link. ?>
-							<?php if ( ! IS_PROFILE_PAGE ) : ?>
+    							<?php if ( ! IS_PROFILE_PAGE ) : ?>
 								<tr class="user-generate-reset-link-wrap hide-if-no-js">
 									<th><?php _e( 'Password Reset' ); ?></th>
 									<td>
@@ -686,17 +686,17 @@ 
 										</div>
 										<p class="description">
 											<?php
-											printf(
-												/* translators: %s: User's display name. */
-												__( 'Send %s a link to reset their password. This will not change their password, nor will it force a change.' ),
-												esc_html( $profile_user->display_name )
-											);
-											?>
+											    printf(
+												    /* translators: %s: User's display name. */
+												    __( 'Send %s a link to reset their password. This will not change their password, nor will it force a change.' ),
+												    esc_html( $profile_user->display_name )
+											    );
+											    ?>
 										</p>
 									</td>
 								</tr>
 							<?php endif; ?>
-
+    
 							<?php if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
 								<tr class="user-sessions-wrap hide-if-no-js">
 									<th><?php _e( 'Sessions' ); ?></th>
@@ -724,57 +724,57 @@ 
 										<p><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
 										<p class="description">
 											<?php
-											/* translators: %s: User's display name. */
-											printf( __( 'Log %s out of all locations.' ), $profile_user->display_name );
-											?>
+											    /* translators: %s: User's display name. */
+											    printf( __( 'Log %s out of all locations.' ), $profile_user->display_name );
+											    ?>
 										</p>
 									</td>
 								</tr>
 							<?php endif; ?>
-						</table>
+    						</table>
 
 					<?php if ( wp_is_application_passwords_available_for_user( $user_id ) || ! wp_is_application_passwords_supported() ) : ?>
 						<div class="application-passwords hide-if-no-js" id="application-passwords-section">
 							<h2><?php _e( 'Application Passwords' ); ?></h2>
 							<p><?php _e( 'Application passwords allow authentication via non-interactive systems, such as XML-RPC or the REST API, without providing your actual password. Application passwords can be easily revoked. They cannot be used for traditional logins to your website.' ); ?></p>
 							<?php if ( wp_is_application_passwords_available_for_user( $user_id ) ) : ?>
-								<?php
-								if ( is_multisite() ) :
-									$blogs       = get_blogs_of_user( $user_id, true );
-									$blogs_count = count( $blogs );
-
-									if ( $blogs_count > 1 ) :
-										?>
-										<p>
+    								<?php
+								    if ( is_multisite() ) :
+									    $blogs       = get_blogs_of_user( $user_id, true );
+									    $blogs_count = count( $blogs );
+
+									    if ( $blogs_count > 1 ) :
+										    ?>
+    										<p>
 											<?php
-											/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
-											$message = _n(
-												'Application passwords grant access to <a href="%1$s">the %2$s site in this installation that you have permissions on</a>.',
-												'Application passwords grant access to <a href="%1$s">all %2$s sites in this installation that you have permissions on</a>.',
-												$blogs_count
-											);
-
-											if ( is_super_admin( $user_id ) ) {
-												/* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
-												$message = _n(
-													'Application passwords grant access to <a href="%1$s">the %2$s site on the network as you have Super Admin rights</a>.',
-													'Application passwords grant access to <a href="%1$s">all %2$s sites on the network as you have Super Admin rights</a>.',
-													$blogs_count
-												);
-											}
-
-											printf(
-												$message,
-												admin_url( 'my-sites.php' ),
-												number_format_i18n( $blogs_count )
-											);
-											?>
-										</p>
+											    /* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
+											    $message = _n(
+												    'Application passwords grant access to <a href="%1$s">the %2$s site in this installation that you have permissions on</a>.',
+												    'Application passwords grant access to <a href="%1$s">all %2$s sites in this installation that you have permissions on</a>.',
+												    $blogs_count
+											    );
+
+											    if ( is_super_admin( $user_id ) ) {
+												    /* translators: 1: URL to my-sites.php, 2: Number of sites the user has. */
+												    $message = _n(
+													    'Application passwords grant access to <a href="%1$s">the %2$s site on the network as you have Super Admin rights</a>.',
+													    'Application passwords grant access to <a href="%1$s">all %2$s sites on the network as you have Super Admin rights</a>.',
+													    $blogs_count
+												    );
+											    }
+
+											    printf(
+												    $message,
+												    admin_url( 'my-sites.php' ),
+												    number_format_i18n( $blogs_count )
+											    );
+											    ?>
+    										</p>
 										<?php
-									endif;
-								endif;
-								?>
-
+									    endif;
+								    endif;
+								    ?>
+    
 								<?php if ( ! wp_is_site_protected_by_basic_auth( 'front' ) ) : ?>
 									<div class="create-application-password form-wrap">
 										<div class="form-field">
@@ -784,15 +784,15 @@ 
 										</div>
 
 										<?php
-										/**
+										    /**
 										 * Fires in the create Application Passwords form.
 										 *
 										 * @since 5.6.0
 										 *
 										 * @param WP_User $profile_user The current WP_User object.
 										 */
-										do_action( 'wp_create_application_password_form', $profile_user );
-										?>
+										    do_action( 'wp_create_application_password_form', $profile_user );
+										    ?>
 
 										<button type="button" name="do_new_application_password" id="do_new_application_password" class="button button-secondary"><?php _e( 'Add New Application Password' ); ?></button>
 									</div>
@@ -804,29 +804,29 @@ 
 
 								<div class="application-passwords-list-table-wrapper">
 									<?php
-									$application_passwords_list_table = _get_list_table( 'WP_Application_Passwords_List_Table', array( 'screen' => 'application-passwords-user' ) );
-									$application_passwords_list_table->prepare_items();
-									$application_passwords_list_table->display();
-									?>
-								</div>
+									    $application_passwords_list_table = _get_list_table( 'WP_Application_Passwords_List_Table', array( 'screen' => 'application-passwords-user' ) );
+									    $application_passwords_list_table->prepare_items();
+									    $application_passwords_list_table->display();
+									    ?>
+    								</div>
 							<?php elseif ( ! wp_is_application_passwords_supported() ) : ?>
-								<p><?php _e( 'The application password feature requires HTTPS, which is not enabled on this site.' ); ?></p>
+    								<p><?php _e( 'The application password feature requires HTTPS, which is not enabled on this site.' ); ?></p>
 								<p>
 									<?php
-									printf(
-										/* translators: %s: Documentation URL. */
-										__( 'If this is a development website you can <a href="%s" target="_blank">set the environment type accordingly</a> to enable application passwords.' ),
-										__( 'https://wordpress.org/support/article/editing-wp-config-php/#wp_environment_type' )
-									);
-									?>
-								</p>
+									    printf(
+										    /* translators: %s: Documentation URL. */
+										    __( 'If this is a development website you can <a href="%s" target="_blank">set the environment type accordingly</a> to enable application passwords.' ),
+										    __( 'https://wordpress.org/support/article/editing-wp-config-php/#wp_environment_type' )
+									    );
+									    ?>
+    								</p>
 							<?php endif; ?>
-						</div>
+    						</div>
 					<?php endif; // End Application Passwords. ?>
-
+    
 					<?php
-					if ( IS_PROFILE_PAGE ) {
-						/**
+					    if ( IS_PROFILE_PAGE ) {
+						    /**
 						 * Fires after the 'About Yourself' settings table on the 'Profile' editing screen.
 						 *
 						 * The action only fires if the current user is editing their own profile.
@@ -835,21 +835,21 @@ 
 						 *
 						 * @param WP_User $profile_user The current WP_User object.
 						 */
-						do_action( 'show_user_profile', $profile_user );
-					} else {
-						/**
+						    do_action( 'show_user_profile', $profile_user );
+					    } else {
+						    /**
 						 * Fires after the 'About the User' settings table on the 'Edit User' screen.
 						 *
 						 * @since 2.0.0
 						 *
 						 * @param WP_User $profile_user The current WP_User object.
 						 */
-						do_action( 'edit_user_profile', $profile_user );
-					}
-					?>
-
+						    do_action( 'edit_user_profile', $profile_user );
+					    }
+					    ?>
+    
 					<?php
-					/**
+					    /**
 					 * Filters whether to display additional capabilities for the user.
 					 *
 					 * The 'Additional Capabilities' section will only be enabled if
@@ -861,34 +861,34 @@ 
 					 * @param bool    $enable      Whether to display the capabilities. Default true.
 					 * @param WP_User $profile_user The current WP_User object.
 					 */
-					$display_additional_caps = apply_filters( 'additional_capabilities_display', true, $profile_user );
-					?>
-
+					    $display_additional_caps = apply_filters( 'additional_capabilities_display', true, $profile_user );
+					    ?>
+    
 				<?php if ( count( $profile_user->caps ) > count( $profile_user->roles ) && ( true === $display_additional_caps ) ) : ?>
-					<h2><?php _e( 'Additional Capabilities' ); ?></h2>
+    					<h2><?php _e( 'Additional Capabilities' ); ?></h2>
 
 					<table class="form-table" role="presentation">
 						<tr class="user-capabilities-wrap">
 							<th scope="row"><?php _e( 'Capabilities' ); ?></th>
 							<td>
 								<?php
-								$output = '';
-								foreach ( $profile_user->caps as $cap => $value ) {
-									if ( ! $wp_roles->is_role( $cap ) ) {
-										if ( '' !== $output ) {
-											$output .= ', ';
-										}
-
-										if ( $value ) {
-											$output .= $cap;
-										} else {
-											/* translators: %s: Capability name. */
-											$output .= sprintf( __( 'Denied: %s' ), $cap );
-										}
-									}
-								}
-								echo $output;
-								?>
+								    $output = '';
+								    foreach ( $profile_user->caps as $cap => $value ) {
+									    if ( ! $wp_roles->is_role( $cap ) ) {
+										    if ( '' !== $output ) {
+											    $output .= ', ';
+										    }
+
+										    if ( $value ) {
+											    $output .= $cap;
+										    } else {
+											    /* translators: %s: Capability name. */
+											    $output .= sprintf( __( 'Denied: %s' ), $cap );
+										    }
+									    }
+								    }
+								    echo $output;
+								    ?>
 							</td>
 						</tr>
 					</table>
@@ -902,7 +902,7 @@ 
 			</form>
 		</div>
 		<?php
-		break;
+		    break;
 }
 ?>
 <script type="text/javascript">

brighty/wp-admin/setup-config.php

Switch Indentation +179 added lines, -179 removed lines

@@ -124,40 +124,40 @@ 
 }
 
 switch ( $step ) {
-	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) ) {
-			$languages = wp_get_available_translations();
-			if ( $languages ) {
-				setup_config_display_header( 'language-chooser' );
-				echo '<h1 class="screen-reader-text">Select a default language</h1>';
-				echo '<form id="setup" method="post" action="?step=0">';
-				wp_install_language_form( $languages );
-				echo '</form>';
-				break;
-			}
-		}
-
-		// Deliberately fall through if we can't reach the translations API.
-
-	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
-				$GLOBALS['wp_locale'] = new WP_Locale();
-			}
-		}
-
-		setup_config_display_header();
-		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
-			$step_1 .= '&amp;noapi';
-		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
-		}
-		?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
+	    case -1:
+		    if ( wp_can_install_language_pack() && empty( $language ) ) {
+			    $languages = wp_get_available_translations();
+			    if ( $languages ) {
+				    setup_config_display_header( 'language-chooser' );
+				    echo '<h1 class="screen-reader-text">Select a default language</h1>';
+				    echo '<form id="setup" method="post" action="?step=0">';
+				    wp_install_language_form( $languages );
+				    echo '</form>';
+				    break;
+			    }
+		    }
+
+		    // Deliberately fall through if we can't reach the translations API.
+
+	    case 0:
+		    if ( ! empty( $language ) ) {
+			    $loaded_language = wp_download_language_pack( $language );
+			    if ( $loaded_language ) {
+				    load_default_textdomain( $loaded_language );
+				    $GLOBALS['wp_locale'] = new WP_Locale();
+			    }
+		    }
+
+		    setup_config_display_header();
+		    $step_1 = 'setup-config.php?step=1';
+		    if ( isset( $_REQUEST['noapi'] ) ) {
+			    $step_1 .= '&amp;noapi';
+		    }
+		    if ( ! empty( $loaded_language ) ) {
+			    $step_1 .= '&amp;language=' . $loaded_language;
+		    }
+		    ?>
+    <h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
 <p><?php _e( 'Welcome to WordPress. Before getting started, you will need to know the following items.' ); ?></p>
 <ol>
 	<li><?php _e( 'Database name' ); ?></li>
@@ -168,46 +168,46 @@ 
 </ol>
 <p>
 		<?php
-		printf(
-			/* translators: %s: wp-config.php */
-			__( 'This information is being used to create a %s file.' ),
-			'<code>wp-config.php</code>'
-		);
-		?>
-	<strong>
+		    printf(
+			    /* translators: %s: wp-config.php */
+			    __( 'This information is being used to create a %s file.' ),
+			    '<code>wp-config.php</code>'
+		    );
+		    ?>
+    	<strong>
 		<?php
-		printf(
-			/* translators: 1: wp-config-sample.php, 2: wp-config.php */
-			__( 'If for any reason this automatic file creation does not work, do not worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
-			'<code>wp-config-sample.php</code>',
-			'<code>wp-config.php</code>'
-		);
-		?>
-	</strong>
+		    printf(
+			    /* translators: 1: wp-config-sample.php, 2: wp-config.php */
+			    __( 'If for any reason this automatic file creation does not work, do not worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
+			    '<code>wp-config-sample.php</code>',
+			    '<code>wp-config.php</code>'
+		    );
+		    ?>
+    	</strong>
 		<?php
-		printf(
-			/* translators: 1: Documentation URL, 2: wp-config.php */
-			__( 'Need more help? <a href="%1$s">Read the support article on %2$s</a>.' ),
-			__( 'https://wordpress.org/support/article/editing-wp-config-php/' ),
-			'<code>wp-config.php</code>'
-		);
-		?>
+		    printf(
+			    /* translators: 1: Documentation URL, 2: wp-config.php */
+			    __( 'Need more help? <a href="%1$s">Read the support article on %2$s</a>.' ),
+			    __( 'https://wordpress.org/support/article/editing-wp-config-php/' ),
+			    '<code>wp-config.php</code>'
+		    );
+		    ?>
 </p>
 <p><?php _e( 'In all likelihood, these items were supplied to you by your web host. If you do not have this information, then you will need to contact them before you can continue. If you are ready&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
 		<?php
-		break;
+		    break;
 
-	case 1:
-		load_default_textdomain( $language );
-		$GLOBALS['wp_locale'] = new WP_Locale();
+	    case 1:
+		    load_default_textdomain( $language );
+		    $GLOBALS['wp_locale'] = new WP_Locale();
 
-		setup_config_display_header();
+		    setup_config_display_header();
 
-		$autofocus = wp_is_mobile() ? '' : ' autofocus';
-		?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1>
+		    $autofocus = wp_is_mobile() ? '' : ' autofocus';
+		    ?>
+    <h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( 'Below you should enter your database connection details. If you are not sure about these, contact your host.' ); ?></p>
 	<table class="form-table" role="presentation">
@@ -231,9 +231,9 @@ 
 			<td><input name="dbhost" id="dbhost" type="text" aria-describedby="dbhost-desc" size="25" value="localhost" /></td>
 			<td id="dbhost-desc">
 			<?php
-				/* translators: %s: localhost */
-				printf( __( 'You should be able to get this info from your web host, if %s does not work.' ), '<code>localhost</code>' );
-			?>
+				    /* translators: %s: localhost */
+				    printf( __( 'You should be able to get this info from your web host, if %s does not work.' ), '<code>localhost</code>' );
+			    ?>
 			</td>
 		</tr>
 		<tr>
@@ -243,128 +243,128 @@ 
 		</tr>
 	</table>
 		<?php
-		if ( isset( $_GET['noapi'] ) ) {
-			?>
-<input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
+		    if ( isset( $_GET['noapi'] ) ) {
+			    ?>
+    <input name="noapi" type="hidden" value="1" /><?php } ?>
+    	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
 	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 		<?php
-		break;
-
-	case 2:
-		load_default_textdomain( $language );
-		$GLOBALS['wp_locale'] = new WP_Locale();
-
-		$dbname = trim( wp_unslash( $_POST['dbname'] ) );
-		$uname  = trim( wp_unslash( $_POST['uname'] ) );
-		$pwd    = trim( wp_unslash( $_POST['pwd'] ) );
-		$dbhost = trim( wp_unslash( $_POST['dbhost'] ) );
-		$prefix = trim( wp_unslash( $_POST['prefix'] ) );
-
-		$step_1  = 'setup-config.php?step=1';
-		$install = 'install.php';
-		if ( isset( $_REQUEST['noapi'] ) ) {
-			$step_1 .= '&amp;noapi';
-		}
-
-		if ( ! empty( $language ) ) {
-			$step_1  .= '&amp;language=' . $language;
-			$install .= '?language=' . $language;
-		} else {
-			$install .= '?language=en_US';
-		}
-
-		$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
-
-		if ( empty( $prefix ) ) {
-			wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
-		}
-
-		// Validate $prefix: it can only contain letters, numbers and underscores.
-		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
-			wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
-		}
-
-		// Test the DB connection.
-		/**#@+
+		    break;
+
+	    case 2:
+		    load_default_textdomain( $language );
+		    $GLOBALS['wp_locale'] = new WP_Locale();
+
+		    $dbname = trim( wp_unslash( $_POST['dbname'] ) );
+		    $uname  = trim( wp_unslash( $_POST['uname'] ) );
+		    $pwd    = trim( wp_unslash( $_POST['pwd'] ) );
+		    $dbhost = trim( wp_unslash( $_POST['dbhost'] ) );
+		    $prefix = trim( wp_unslash( $_POST['prefix'] ) );
+
+		    $step_1  = 'setup-config.php?step=1';
+		    $install = 'install.php';
+		    if ( isset( $_REQUEST['noapi'] ) ) {
+			    $step_1 .= '&amp;noapi';
+		    }
+
+		    if ( ! empty( $language ) ) {
+			    $step_1  .= '&amp;language=' . $language;
+			    $install .= '?language=' . $language;
+		    } else {
+			    $install .= '?language=en_US';
+		    }
+
+		    $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
+
+		    if ( empty( $prefix ) ) {
+			    wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
+		    }
+
+		    // Validate $prefix: it can only contain letters, numbers and underscores.
+		    if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+			    wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
+		    }
+
+		    // Test the DB connection.
+		    /**#@+
 		 *
 		 * @ignore
 		 */
-		define( 'DB_NAME', $dbname );
-		define( 'DB_USER', $uname );
-		define( 'DB_PASSWORD', $pwd );
-		define( 'DB_HOST', $dbhost );
-		/**#@-*/
+		    define( 'DB_NAME', $dbname );
+		    define( 'DB_USER', $uname );
+		    define( 'DB_PASSWORD', $pwd );
+		    define( 'DB_HOST', $dbhost );
+		    /**#@-*/
 
-		// Re-construct $wpdb with these new values.
-		unset( $wpdb );
-		require_wp_db();
+		    // Re-construct $wpdb with these new values.
+		    unset( $wpdb );
+		    require_wp_db();
 
-		/*
+		    /*
 		* The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
 		* fire this manually. We'll fail here if the values are no good.
 		*/
-		$wpdb->db_connect();
-
-		if ( ! empty( $wpdb->error ) ) {
-			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
-		}
-
-		$errors = $wpdb->hide_errors();
-		$wpdb->query( "SELECT $prefix" );
-		$wpdb->show_errors( $errors );
-		if ( ! $wpdb->last_error ) {
-			// MySQL was able to parse the prefix as a value, which we don't want. Bail.
-			wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) );
-		}
-
-		// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
-		try {
-			$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
-			$max   = strlen( $chars ) - 1;
-			for ( $i = 0; $i < 8; $i++ ) {
-				$key = '';
-				for ( $j = 0; $j < 64; $j++ ) {
-					$key .= substr( $chars, random_int( 0, $max ), 1 );
-				}
-				$secret_keys[] = $key;
-			}
-		} catch ( Exception $ex ) {
-			$no_api = isset( $_POST['noapi'] );
-
-			if ( ! $no_api ) {
-				$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-			}
-
-			if ( $no_api || is_wp_error( $secret_keys ) ) {
-				$secret_keys = array();
-				for ( $i = 0; $i < 8; $i++ ) {
-					$secret_keys[] = wp_generate_password( 64, true, true );
-				}
-			} else {
-				$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-				foreach ( $secret_keys as $k => $v ) {
-					$secret_keys[ $k ] = substr( $v, 28, 64 );
-				}
-			}
-		}
-
-		$key = 0;
-		foreach ( $config_file as $line_num => $line ) {
-			if ( '$table_prefix =' === substr( $line, 0, 15 ) ) {
-				$config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
-				continue;
-			}
-
-			if ( ! preg_match( '/^define\(\s*\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
-				continue;
-			}
-
-			$constant = $match[1];
-			$padding  = $match[2];
-
-			switch ( $constant ) {
+		    $wpdb->db_connect();
+
+		    if ( ! empty( $wpdb->error ) ) {
+			    wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+		    }
+
+		    $errors = $wpdb->hide_errors();
+		    $wpdb->query( "SELECT $prefix" );
+		    $wpdb->show_errors( $errors );
+		    if ( ! $wpdb->last_error ) {
+			    // MySQL was able to parse the prefix as a value, which we don't want. Bail.
+			    wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) );
+		    }
+
+		    // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
+		    try {
+			    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
+			    $max   = strlen( $chars ) - 1;
+			    for ( $i = 0; $i < 8; $i++ ) {
+				    $key = '';
+				    for ( $j = 0; $j < 64; $j++ ) {
+					    $key .= substr( $chars, random_int( 0, $max ), 1 );
+				    }
+				    $secret_keys[] = $key;
+			    }
+		    } catch ( Exception $ex ) {
+			    $no_api = isset( $_POST['noapi'] );
+
+			    if ( ! $no_api ) {
+				    $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+			    }
+
+			    if ( $no_api || is_wp_error( $secret_keys ) ) {
+				    $secret_keys = array();
+				    for ( $i = 0; $i < 8; $i++ ) {
+					    $secret_keys[] = wp_generate_password( 64, true, true );
+				    }
+			    } else {
+				    $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
+				    foreach ( $secret_keys as $k => $v ) {
+					    $secret_keys[ $k ] = substr( $v, 28, 64 );
+				    }
+			    }
+		    }
+
+		    $key = 0;
+		    foreach ( $config_file as $line_num => $line ) {
+			    if ( '$table_prefix =' === substr( $line, 0, 15 ) ) {
+				    $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+				    continue;
+			    }
+
+			    if ( ! preg_match( '/^define\(\s*\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
+				    continue;
+			    }
+
+			    $constant = $match[1];
+			    $padding  = $match[2];
+
+			    switch ( $constant ) {
 				case 'DB_NAME':
 				case 'DB_USER':
 				case 'DB_PASSWORD':
@@ -386,7 +386,7 @@ 
 				case 'NONCE_SALT':
 					$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . $secret_keys[ $key++ ] . "' );\r\n";
 					break;
-			}
+			    }
 		}
 		unset( $line );
 

brighty/wp-includes/Text/Diff/Engine/shell.php

Switch Indentation +23 added lines, -23 removed lines

@@ -91,29 +91,29 @@
             }
 
             switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
+                case 'd':
+                    // deleted lines
+                    array_push($edits,
+                        new Text_Diff_Op_delete(
+                            $this->_getLines($from_lines, $from_line_no, $match[2])));
+                    $to_line_no++;
+                    break;
+
+                case 'c':
+                    // changed lines
+                    array_push($edits,
+                        new Text_Diff_Op_change(
+                            $this->_getLines($from_lines, $from_line_no, $match[2]),
+                            $this->_getLines($to_lines, $to_line_no, $match[5])));
+                    break;
+
+                case 'a':
+                    // added lines
+                    array_push($edits,
+                        new Text_Diff_Op_add(
+                            $this->_getLines($to_lines, $to_line_no, $match[5])));
+                    $from_line_no++;
+                    break;
             }
         }
 

brighty/wp-includes/Text/Diff/Engine/string.php

Switch Indentation +69 added lines, -69 removed lines

@@ -95,41 +95,41 @@ 
         for ($i = 0; $i < $end;) {
             $diff1 = array();
             switch (substr($diff[$i], 0, 1)) {
-            case ' ':
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
-                $edits[] = new Text_Diff_Op_copy($diff1);
-                break;
-
-            case '+':
-                // get all new lines
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
-                $edits[] = new Text_Diff_Op_add($diff1);
-                break;
-
-            case '-':
-                // get changed or removed lines
-                $diff2 = array();
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+                case ' ':
+                    do {
+                        $diff1[] = substr($diff[$i], 1);
+                    } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+                    $edits[] = new Text_Diff_Op_copy($diff1);
+                    break;
 
-                while ($i < $end && substr($diff[$i], 0, 1) == '+') {
-                    $diff2[] = substr($diff[$i++], 1);
-                }
-                if (count($diff2) == 0) {
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                } else {
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                }
-                break;
+                case '+':
+                    // get all new lines
+                    do {
+                        $diff1[] = substr($diff[$i], 1);
+                    } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+                    $edits[] = new Text_Diff_Op_add($diff1);
+                    break;
 
-            default:
-                $i++;
-                break;
+                case '-':
+                    // get changed or removed lines
+                    $diff2 = array();
+                    do {
+                        $diff1[] = substr($diff[$i], 1);
+                    } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+
+                    while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+                        $diff2[] = substr($diff[$i++], 1);
+                    }
+                    if (count($diff2) == 0) {
+                        $edits[] = new Text_Diff_Op_delete($diff1);
+                    } else {
+                        $edits[] = new Text_Diff_Op_change($diff1, $diff2);
+                    }
+                    break;
+
+                default:
+                    $i++;
+                    break;
             }
         }
 
@@ -195,49 +195,49 @@ 
             if ($i < $max_i) {
                 $diff1 = array();
                 switch (substr($diff[$i], 0, 1)) {
-                case '!':
-                    $diff2 = array();
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                        if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
-                            $diff2[] = substr($diff[$j++], 2);
-                        }
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                    break;
-
-                case '+':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff1);
-                    break;
-
-                case '-':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                    break;
+                    case '!':
+                        $diff2 = array();
+                        do {
+                            $diff1[] = substr($diff[$i], 2);
+                            if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+                                $diff2[] = substr($diff[$j++], 2);
+                            }
+                        } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+                        $edits[] = new Text_Diff_Op_change($diff1, $diff2);
+                        break;
+
+                    case '+':
+                        do {
+                            $diff1[] = substr($diff[$i], 2);
+                        } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+                        $edits[] = new Text_Diff_Op_add($diff1);
+                        break;
+
+                    case '-':
+                        do {
+                            $diff1[] = substr($diff[$i], 2);
+                        } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+                        $edits[] = new Text_Diff_Op_delete($diff1);
+                        break;
                 }
             }
 
             if ($j < $max_j) {
                 $diff2 = array();
                 switch (substr($diff[$j], 0, 1)) {
-                case '+':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff2);
-                    break;
+                    case '+':
+                        do {
+                            $diff2[] = substr($diff[$j++], 2);
+                        } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+                        $edits[] = new Text_Diff_Op_add($diff2);
+                        break;
 
-                case '-':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff2);
-                    break;
+                    case '-':
+                        do {
+                            $diff2[] = substr($diff[$j++], 2);
+                        } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+                        $edits[] = new Text_Diff_Op_delete($diff2);
+                        break;
                 }
             }
         }

brighty/wp-includes/Text/Diff/Engine/xdiff.php

Switch Indentation +9 added lines, -9 removed lines

@@ -44,17 +44,17 @@
                 continue;
             }
             switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+                case ' ':
+                    $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+                    break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+                case '+':
+                    $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+                    break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
+                case '-':
+                    $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+                    break;
             }
         }
 

brighty/wp-includes/Text/Diff/Renderer.php

Switch Indentation +12 added lines, -12 removed lines

@@ -154,21 +154,21 @@
 
         foreach ($edits as $edit) {
             switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
+                case 'text_diff_op_copy':
+                    $output .= $this->_context($edit->orig);
+                    break;
 
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
+                case 'text_diff_op_add':
+                    $output .= $this->_added($edit->final);
+                    break;
 
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
+                case 'text_diff_op_delete':
+                    $output .= $this->_deleted($edit->orig);
+                    break;
 
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
+                case 'text_diff_op_change':
+                    $output .= $this->_changed($edit->orig, $edit->final);
+                    break;
             }
         }
 

brighty/wp-content/plugins/awesome-support/includes/gas-framework/inc/scssphp/scss.inc.php

Switch Indentation +336 added lines, -336 removed lines

@@ -353,12 +353,12 @@ 
 		foreach ($piece as &$p) {
 			if (!is_array($p)) continue;
 			switch ($p[0]) {
-			case "interpolate":
-				$p = $this->compileValue($p);
-				break;
-			case "string":
-				$p = $this->compileValue($p);
-				break;
+			    case "interpolate":
+				    $p = $this->compileValue($p);
+				    break;
+			    case "string":
+				    $p = $this->compileValue($p);
+				    break;
 			}
 		}
 		return $this->flattenSelectorSingle($piece);
@@ -374,12 +374,12 @@ 
 		foreach ($piece as &$p) {
 			if (!is_array($p)) continue;
 			switch ($p[0]) {
-			case "self":
-				$p = "&";
-				break;
-			default:
-				$p = $this->compileValue($p);
-				break;
+			    case "self":
+				    $p = "&";
+				    break;
+			    default:
+				    $p = $this->compileValue($p);
+				    break;
 			}
 		}
 		return implode($piece);
@@ -461,186 +461,186 @@ 
 		$this->sourcePos = isset($child[-1]) ? $child[-1] : -1;
 		$this->sourceParser = isset($child[-2]) ? $child[-2] : $this->parser;
 		switch ($child[0]) {
-		case "import":
-			list(,$rawPath) = $child;
-			$rawPath = $this->reduce($rawPath);
-			if (!$this->compileImport($rawPath, $out)) {
-				$out->lines[] = "@import " . $this->compileValue($rawPath) . ";";
-			}
-			break;
-		case "directive":
-			list(, $directive) = $child;
-			$s = "@" . $directive->name;
-			if (!empty($directive->value)) {
-				$s .= " " . $this->compileValue($directive->value);
-			}
-			$this->compileNestedBlock($directive, array($s));
-			break;
-		case "media":
-			$this->compileMedia($child[1]);
-			break;
-		case "block":
-			$this->compileBlock($child[1]);
-			break;
-		case "charset":
-			$out->lines[] = "@charset ".$this->compileValue($child[1]).";";
-			break;
-		case "assign":
-			list(,$name, $value) = $child;
-			if ($name[0] == "var") {
-				$isDefault = !empty($child[3]);
-				if ($isDefault) {
-					$existingValue = $this->get($name[1], true);
-					$shouldSet = $existingValue === true || $existingValue == self::$null;
-				}
-				if (!$isDefault || $shouldSet) {
-					$this->set($name[1], $this->reduce($value));
-				}
-				break;
-			}
-			// if the value reduces to null from something else then
-			// the property should be discarded
-			if ($value[0] != "null") {
-				$value = $this->reduce($value);
-				if ($value[0] == "null") {
-					break;
-				}
-			}
-			$compiledValue = $this->compileValue($value);
-			$out->lines[] = $this->formatter->property(
-				$this->compileValue($name),
-				$compiledValue);
-			break;
-		case "comment":
-			$out->lines[] = $child[1];
-			break;
-		case "mixin":
-		case "function":
-			list(,$block) = $child;
-			$this->set(self::$namespaces[$block->type] . $block->name, $block);
-			break;
-		case "extend":
-			list(, $selectors) = $child;
-			foreach ($selectors as $sel) {
-				// only use the first one
-				$sel = current($this->evalSelector($sel));
-				$this->pushExtends($sel, $out->selectors);
-			}
-			break;
-		case "if":
-			list(, $if) = $child;
-			if ($this->isTruthy($this->reduce($if->cond, true))) {
-				return $this->compileChildren($if->children, $out);
-			} else {
-				foreach ($if->cases as $case) {
-					if ($case->type == "else" ||
-						$case->type == "elseif" && $this->isTruthy($this->reduce($case->cond)))
-					{
-						return $this->compileChildren($case->children, $out);
-					}
-				}
-			}
-			break;
-		case "return":
-			return $this->reduce($child[1], true);
-		case "each":
-			list(,$each) = $child;
-			$list = $this->coerceList($this->reduce($each->list));
-			foreach ($list[2] as $item) {
-				$this->pushEnv();
-				$this->set($each->var, $item);
-				// TODO: allow return from here
-				$this->compileChildren($each->children, $out);
-				$this->popEnv();
-			}
-			break;
-		case "while":
-			list(,$while) = $child;
-			while ($this->isTruthy($this->reduce($while->cond, true))) {
-				$ret = $this->compileChildren($while->children, $out);
-				if ($ret) return $ret;
-			}
-			break;
-		case "for":
-			list(,$for) = $child;
-			$start = $this->reduce($for->start, true);
-			$start = $start[1];
-			$end = $this->reduce($for->end, true);
-			$end = $end[1];
-			$d = $start < $end ? 1 : -1;
-			while (true) {
-				if ((!$for->until && $start - $d == $end) ||
-					($for->until && $start == $end))
-				{
-					break;
-				}
-				$this->set($for->var, array("number", $start, ""));
-				$start += $d;
-				$ret = $this->compileChildren($for->children, $out);
-				if ($ret) return $ret;
-			}
-			break;
-		case "nestedprop":
-			list(,$prop) = $child;
-			$prefixed = array();
-			$prefix = $this->compileValue($prop->prefix) . "-";
-			foreach ($prop->children as $child) {
-				if ($child[0] == "assign") {
-					array_unshift($child[1][2], $prefix);
-				}
-				if ($child[0] == "nestedprop") {
-					array_unshift($child[1]->prefix[2], $prefix);
-				}
-				$prefixed[] = $child;
-			}
-			$this->compileChildren($prefixed, $out);
-			break;
-		case "include": // including a mixin
-			list(,$name, $argValues, $content) = $child;
-			$mixin = $this->get(self::$namespaces["mixin"] . $name, false);
-			if (!$mixin) {
-				$this->throwError("Undefined mixin $name");
-			}
-			$callingScope = $this->env;
-			// push scope, apply args
-			$this->pushEnv();
-			if ($this->env->depth > 0) {
-				$this->env->depth--;
-			}
-			if (!is_null($content)) {
-				$content->scope = $callingScope;
-				$this->setRaw(self::$namespaces["special"] . "content", $content);
-			}
-			if (!is_null($mixin->args)) {
-				$this->applyArguments($mixin->args, $argValues);
-			}
-			foreach ($mixin->children as $child) {
-				$this->compileChild($child, $out);
-			}
-			$this->popEnv();
-			break;
-		case "mixin_content":
-			$content = $this->get(self::$namespaces["special"] . "content");
-			if (is_null($content)) {
-				$this->throwError("Expected @content inside of mixin");
-			}
-			$strongTypes = array('include', 'block', 'for', 'while');
-			foreach ($content->children as $child) {
-				$this->storeEnv = (in_array($child[0], $strongTypes))
-					? null
-					: $content->scope;
-				$this->compileChild($child, $out);
-			}
-			unset($this->storeEnv);
-			break;
-		case "debug":
-			list(,$value, $pos) = $child;
-			$line = $this->parser->getLineNo($pos);
-			$value = $this->compileValue($this->reduce($value, true));
-			fwrite(STDERR, "Line $line DEBUG: $value\n");
-			break;
-		default:
-			$this->throwError("unknown child type: $child[0]");
+		    case "import":
+			    list(,$rawPath) = $child;
+			    $rawPath = $this->reduce($rawPath);
+			    if (!$this->compileImport($rawPath, $out)) {
+				    $out->lines[] = "@import " . $this->compileValue($rawPath) . ";";
+			    }
+			    break;
+		    case "directive":
+			    list(, $directive) = $child;
+			    $s = "@" . $directive->name;
+			    if (!empty($directive->value)) {
+				    $s .= " " . $this->compileValue($directive->value);
+			    }
+			    $this->compileNestedBlock($directive, array($s));
+			    break;
+		    case "media":
+			    $this->compileMedia($child[1]);
+			    break;
+		    case "block":
+			    $this->compileBlock($child[1]);
+			    break;
+		    case "charset":
+			    $out->lines[] = "@charset ".$this->compileValue($child[1]).";";
+			    break;
+		    case "assign":
+			    list(,$name, $value) = $child;
+			    if ($name[0] == "var") {
+				    $isDefault = !empty($child[3]);
+				    if ($isDefault) {
+					    $existingValue = $this->get($name[1], true);
+					    $shouldSet = $existingValue === true || $existingValue == self::$null;
+				    }
+				    if (!$isDefault || $shouldSet) {
+					    $this->set($name[1], $this->reduce($value));
+				    }
+				    break;
+			    }
+			    // if the value reduces to null from something else then
+			    // the property should be discarded
+			    if ($value[0] != "null") {
+				    $value = $this->reduce($value);
+				    if ($value[0] == "null") {
+					    break;
+				    }
+			    }
+			    $compiledValue = $this->compileValue($value);
+			    $out->lines[] = $this->formatter->property(
+				    $this->compileValue($name),
+				    $compiledValue);
+			    break;
+		    case "comment":
+			    $out->lines[] = $child[1];
+			    break;
+		    case "mixin":
+		    case "function":
+			    list(,$block) = $child;
+			    $this->set(self::$namespaces[$block->type] . $block->name, $block);
+			    break;
+		    case "extend":
+			    list(, $selectors) = $child;
+			    foreach ($selectors as $sel) {
+				    // only use the first one
+				    $sel = current($this->evalSelector($sel));
+				    $this->pushExtends($sel, $out->selectors);
+			    }
+			    break;
+		    case "if":
+			    list(, $if) = $child;
+			    if ($this->isTruthy($this->reduce($if->cond, true))) {
+				    return $this->compileChildren($if->children, $out);
+			    } else {
+				    foreach ($if->cases as $case) {
+					    if ($case->type == "else" ||
+						    $case->type == "elseif" && $this->isTruthy($this->reduce($case->cond)))
+					    {
+						    return $this->compileChildren($case->children, $out);
+					    }
+				    }
+			    }
+			    break;
+		    case "return":
+			    return $this->reduce($child[1], true);
+		    case "each":
+			    list(,$each) = $child;
+			    $list = $this->coerceList($this->reduce($each->list));
+			    foreach ($list[2] as $item) {
+				    $this->pushEnv();
+				    $this->set($each->var, $item);
+				    // TODO: allow return from here
+				    $this->compileChildren($each->children, $out);
+				    $this->popEnv();
+			    }
+			    break;
+		    case "while":
+			    list(,$while) = $child;
+			    while ($this->isTruthy($this->reduce($while->cond, true))) {
+				    $ret = $this->compileChildren($while->children, $out);
+				    if ($ret) return $ret;
+			    }
+			    break;
+		    case "for":
+			    list(,$for) = $child;
+			    $start = $this->reduce($for->start, true);
+			    $start = $start[1];
+			    $end = $this->reduce($for->end, true);
+			    $end = $end[1];
+			    $d = $start < $end ? 1 : -1;
+			    while (true) {
+				    if ((!$for->until && $start - $d == $end) ||
+					    ($for->until && $start == $end))
+				    {
+					    break;
+				    }
+				    $this->set($for->var, array("number", $start, ""));
+				    $start += $d;
+				    $ret = $this->compileChildren($for->children, $out);
+				    if ($ret) return $ret;
+			    }
+			    break;
+		    case "nestedprop":
+			    list(,$prop) = $child;
+			    $prefixed = array();
+			    $prefix = $this->compileValue($prop->prefix) . "-";
+			    foreach ($prop->children as $child) {
+				    if ($child[0] == "assign") {
+					    array_unshift($child[1][2], $prefix);
+				    }
+				    if ($child[0] == "nestedprop") {
+					    array_unshift($child[1]->prefix[2], $prefix);
+				    }
+				    $prefixed[] = $child;
+			    }
+			    $this->compileChildren($prefixed, $out);
+			    break;
+		    case "include": // including a mixin
+			    list(,$name, $argValues, $content) = $child;
+			    $mixin = $this->get(self::$namespaces["mixin"] . $name, false);
+			    if (!$mixin) {
+				    $this->throwError("Undefined mixin $name");
+			    }
+			    $callingScope = $this->env;
+			    // push scope, apply args
+			    $this->pushEnv();
+			    if ($this->env->depth > 0) {
+				    $this->env->depth--;
+			    }
+			    if (!is_null($content)) {
+				    $content->scope = $callingScope;
+				    $this->setRaw(self::$namespaces["special"] . "content", $content);
+			    }
+			    if (!is_null($mixin->args)) {
+				    $this->applyArguments($mixin->args, $argValues);
+			    }
+			    foreach ($mixin->children as $child) {
+				    $this->compileChild($child, $out);
+			    }
+			    $this->popEnv();
+			    break;
+		    case "mixin_content":
+			    $content = $this->get(self::$namespaces["special"] . "content");
+			    if (is_null($content)) {
+				    $this->throwError("Expected @content inside of mixin");
+			    }
+			    $strongTypes = array('include', 'block', 'for', 'while');
+			    foreach ($content->children as $child) {
+				    $this->storeEnv = (in_array($child[0], $strongTypes))
+					    ? null
+					    : $content->scope;
+				    $this->compileChild($child, $out);
+			    }
+			    unset($this->storeEnv);
+			    break;
+		    case "debug":
+			    list(,$value, $pos) = $child;
+			    $line = $this->parser->getLineNo($pos);
+			    $value = $this->compileValue($this->reduce($value, true));
+			    fwrite(STDERR, "Line $line DEBUG: $value\n");
+			    break;
+		    default:
+			    $this->throwError("unknown child type: $child[0]");
 		}
 	}
 	protected function expToString($exp) {
@@ -658,13 +658,13 @@ 
 	// should $value cause its operand to eval
 	protected function shouldEval($value) {
 		switch ($value[0]) {
-		case "exp":
-			if ($value[1] == "/") {
-				return $this->shouldEval($value[2], $value[3]);
-			}
-		case "var":
-		case "fncall":
-			return true;
+		    case "exp":
+			    if ($value[1] == "/") {
+				    return $this->shouldEval($value[2], $value[3]);
+			    }
+		    case "var":
+		    case "fncall":
+			    return true;
 		}
 		return false;
 	}
@@ -749,11 +749,11 @@ 
 				$exp = $this->reduce($exp);
 				if ($exp[0] == "number") {
 					switch ($op) {
-					case "+":
-						return $exp;
-					case "-":
-						$exp[1] *= -1;
-						return $exp;
+					    case "+":
+						    return $exp;
+					    case "-":
+						    $exp[1] *= -1;
+						    return $exp;
 					}
 				}
 				if ($op == "not") {
@@ -825,19 +825,19 @@ 
 		$value = $this->coerceForExpression($this->reduce($value));
 		list($type) = $value;
 		switch ($type) {
-		case "list":
-			$value = $this->extractInterpolation($value);
-			if ($value[0] != "list") {
-				return array("keyword", $this->compileValue($value));
-			}
-			foreach ($value[2] as $key => $item) {
-				$value[2][$key] = $this->normalizeValue($item);
-			}
-			return $value;
-		case "number":
-			return $this->normalizeNumber($value);
-		default:
-			return $value;
+		    case "list":
+			    $value = $this->extractInterpolation($value);
+			    if ($value[0] != "list") {
+				    return array("keyword", $this->compileValue($value));
+			    }
+			    foreach ($value[2] as $key => $item) {
+				    $value[2][$key] = $this->normalizeValue($item);
+			    }
+			    return $value;
+		    case "number":
+			    return $this->normalizeNumber($value);
+		    default:
+			    return $value;
 		}
 	}
 	// just does physical lengths for now
@@ -905,30 +905,30 @@ 
 			$lval = isset($left[$i]) ? $left[$i] : 0;
 			$rval = isset($right[$i]) ? $right[$i] : 0;
 			switch ($op) {
-			case '+':
-				$out[] = $lval + $rval;
-				break;
-			case '-':
-				$out[] = $lval - $rval;
-				break;
-			case '*':
-				$out[] = $lval * $rval;
-				break;
-			case '%':
-				$out[] = $lval % $rval;
-				break;
-			case '/':
-				if ($rval == 0) {
-					$this->throwError("color: Can't divide by zero");
-				}
-				$out[] = $lval / $rval;
-				break;
-			case "==":
-				return $this->op_eq($left, $right);
-			case "!=":
-				return $this->op_neq($left, $right);
-			default:
-				$this->throwError("color: unknown op $op");
+			    case '+':
+				    $out[] = $lval + $rval;
+				    break;
+			    case '-':
+				    $out[] = $lval - $rval;
+				    break;
+			    case '*':
+				    $out[] = $lval * $rval;
+				    break;
+			    case '%':
+				    $out[] = $lval % $rval;
+				    break;
+			    case '/':
+				    if ($rval == 0) {
+					    $this->throwError("color: Can't divide by zero");
+				    }
+				    $out[] = $lval / $rval;
+				    break;
+			    case "==":
+				    return $this->op_eq($left, $right);
+			    case "!=":
+				    return $this->op_neq($left, $right);
+			    default:
+				    $this->throwError("color: unknown op $op");
 			}
 		}
 		if (isset($left[4])) $out[4] = $left[4];
@@ -988,68 +988,68 @@ 
 		$value = $this->reduce($value);
 		list($type) = $value;
 		switch ($type) {
-		case "keyword":
-			return $value[1];
-		case "color":
-			// [1] - red component (either number for a %)
-			// [2] - green component
-			// [3] - blue component
-			// [4] - optional alpha component
-			list(, $r, $g, $b) = $value;
-			$r = round($r);
-			$g = round($g);
-			$b = round($b);
-			if (count($value) == 5 && $value[4] != 1) { // rgba
-				return 'rgba('.$r.', '.$g.', '.$b.', '.$value[4].')';
-			}
-			$h = sprintf("#%02x%02x%02x", $r, $g, $b);
-			// Converting hex color to short notation (e.g. #003399 to #039)
-			if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
-				$h = '#' . $h[1] . $h[3] . $h[5];
-			}
-			return $h;
-		case "number":
-			return round($value[1], $this->numberPrecision) . $value[2];
-		case "string":
-			return $value[1] . $this->compileStringContent($value) . $value[1];
-		case "function":
-			$args = !empty($value[2]) ? $this->compileValue($value[2]) : "";
-			return "$value[1]($args)";
-		case "list":
-			$value = $this->extractInterpolation($value);
-			if ($value[0] != "list") return $this->compileValue($value);
-			list(, $delim, $items) = $value;
-			$filtered = array();
-			foreach ($items as $item) {
-				if ($item[0] == "null") continue;
-				$filtered[] = $this->compileValue($item);
-			}
-			return implode("$delim ", $filtered);
-		case "interpolated": # node created by extractInterpolation
-			list(, $interpolate, $left, $right) = $value;
-			list(,, $whiteLeft, $whiteRight) = $interpolate;
-			$left = count($left[2]) > 0 ?
-				$this->compileValue($left).$whiteLeft : "";
-			$right = count($right[2]) > 0 ?
-				$whiteRight.$this->compileValue($right) : "";
-			return $left.$this->compileValue($interpolate).$right;
-		case "interpolate": # raw parse node
-			list(, $exp) = $value;
-			// strip quotes if it's a string
-			$reduced = $this->reduce($exp);
-			switch ($reduced[0]) {
+		    case "keyword":
+			    return $value[1];
+		    case "color":
+			    // [1] - red component (either number for a %)
+			    // [2] - green component
+			    // [3] - blue component
+			    // [4] - optional alpha component
+			    list(, $r, $g, $b) = $value;
+			    $r = round($r);
+			    $g = round($g);
+			    $b = round($b);
+			    if (count($value) == 5 && $value[4] != 1) { // rgba
+				    return 'rgba('.$r.', '.$g.', '.$b.', '.$value[4].')';
+			    }
+			    $h = sprintf("#%02x%02x%02x", $r, $g, $b);
+			    // Converting hex color to short notation (e.g. #003399 to #039)
+			    if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
+				    $h = '#' . $h[1] . $h[3] . $h[5];
+			    }
+			    return $h;
+		    case "number":
+			    return round($value[1], $this->numberPrecision) . $value[2];
+		    case "string":
+			    return $value[1] . $this->compileStringContent($value) . $value[1];
+		    case "function":
+			    $args = !empty($value[2]) ? $this->compileValue($value[2]) : "";
+			    return "$value[1]($args)";
+		    case "list":
+			    $value = $this->extractInterpolation($value);
+			    if ($value[0] != "list") return $this->compileValue($value);
+			    list(, $delim, $items) = $value;
+			    $filtered = array();
+			    foreach ($items as $item) {
+				    if ($item[0] == "null") continue;
+				    $filtered[] = $this->compileValue($item);
+			    }
+			    return implode("$delim ", $filtered);
+		    case "interpolated": # node created by extractInterpolation
+			    list(, $interpolate, $left, $right) = $value;
+			    list(,, $whiteLeft, $whiteRight) = $interpolate;
+			    $left = count($left[2]) > 0 ?
+				    $this->compileValue($left).$whiteLeft : "";
+			    $right = count($right[2]) > 0 ?
+				    $whiteRight.$this->compileValue($right) : "";
+			    return $left.$this->compileValue($interpolate).$right;
+		    case "interpolate": # raw parse node
+			    list(, $exp) = $value;
+			    // strip quotes if it's a string
+			    $reduced = $this->reduce($exp);
+			    switch ($reduced[0]) {
 				case "string":
 					$reduced = array("keyword",
 						$this->compileStringContent($reduced));
 					break;
 				case "null":
 					$reduced = array("keyword", "");
-			}
+			    }
 			return $this->compileValue($reduced);
-		case "null":
-			return "null";
-		default:
-			$this->throwError("unknown value type: $type");
+		    case "null":
+			    return "null";
+		    default:
+			    $this->throwError("unknown value type: $type");
 		}
 	}
 	protected function compileStringContent($string) {
@@ -1419,25 +1419,25 @@ 
 	}
 	protected function coerceColor($value) {
 		switch ($value[0]) {
-		case "color": return $value;
-		case "keyword":
-			$name = $value[1];
-			if (isset(self::$cssColors[$name])) {
-				@list($r, $g, $b, $a) = explode(',', self::$cssColors[$name]);
-				return isset($a)
-					? array('color', (int) $r, (int) $g, (int) $b, (int) $a)
-					: array('color', (int) $r, (int) $g, (int) $b);
-			}
-			return null;
+		    case "color": return $value;
+		    case "keyword":
+			    $name = $value[1];
+			    if (isset(self::$cssColors[$name])) {
+				    @list($r, $g, $b, $a) = explode(',', self::$cssColors[$name]);
+				    return isset($a)
+					    ? array('color', (int) $r, (int) $g, (int) $b, (int) $a)
+					    : array('color', (int) $r, (int) $g, (int) $b);
+			    }
+			    return null;
 		}
 		return null;
 	}
 	protected function coerceString($value) {
 		switch ($value[0]) {
-		case "string":
-			return $value;
-		case "keyword":
-			return array("string", "", array($value[1]));
+		    case "string":
+			    return $value;
+		    case "keyword":
+			    return array("string", "", array($value[1]));
 		}
 		return null;
 	}
@@ -1615,16 +1615,16 @@ 
 		// 4, 5, 6 - hsl
 		// 7 - a
 		switch ($i) {
-		case 1:
-		case 2:
-		case 3:
-			$max = 255; break;
-		case 4:
-			$max = 360; break;
-		case 7:
-			$max = 1; break;
-		default:
-			$max = 100;
+		    case 1:
+		    case 2:
+		    case 3:
+			    $max = 255; break;
+		    case 4:
+			    $max = 360; break;
+		    case 7:
+			    $max = 1; break;
+		    default:
+			    $max = 100;
 		}
 		$scale = $scale / 100;
 		if ($scale < 0) {
@@ -1910,12 +1910,12 @@ 
 	protected function listSeparatorForJoin($list1, $sep) {
 		if (is_null($sep)) return $list1[1];
 		switch ($this->compileValue($sep)) {
-		case "comma":
-			return ",";
-		case "space":
-			return "";
-		default:
-			return $list1[1];
+		    case "comma":
+			    return ",";
+		    case "space":
+			    return "";
+		    default:
+			    return $list1[1];
 		}
 	}
 	protected static $lib_join = array("list1", "list2", "separator");
@@ -1956,16 +1956,16 @@ 
 	protected function lib_type_of($args) {
 		$value = $args[0];
 		switch ($value[0]) {
-		case "keyword":
-			if ($value == self::$true || $value == self::$false) {
-				return "bool";
-			}
-			if ($this->coerceColor($value)) {
-				return "color";
-			}
-			return "string";
-		default:
-			return $value[0];
+		    case "keyword":
+			    if ($value == self::$true || $value == self::$false) {
+				    return "bool";
+			    }
+			    if ($this->coerceColor($value)) {
+				    return "color";
+			    }
+			    return "string";
+		    default:
+			    return $value[0];
 		}
 	}
 	protected static $lib_unit = array("number");