Changeset 50109 for trunk/src/wp-comments-post.php

Timestamp:

01/31/2021 12:48:24 PM (6 years ago)

Author:

johnbillion

Message:

Comments: Introduce a method for commenters to opt-in to receiving an email notification when their moderated comment gets approved.

The opt-in form is shown after the comment is submitted and held for moderation.

Sorry this took five years.

Props jeffr0, swissspidy, mrahmadawais, wonderboymusic, jdgrimes, obenland, Monika, imath, garrett-eclipse, johnbillion

Fixes #33717

File:

• trunk/src/wp-comments-post.php (modified) (1 diff)

trunk/src/wp-comments-post.php

@@ -23 +23 @@
 nocache_headers();
 
-$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
-if ( is_wp_error( $comment ) ) {
-        $data = (int) $comment->get_error_data();
-        if ( ! empty( $data ) ) {
+if ( isset( $_POST['wp-comment-approved-notification-optin'], $_POST['comment_ID'], $_POST['moderation-hash'] ) ) {
+        $comment = get_comment( $_POST['comment_ID'] );
+
+        if ( $comment && hash_equals( $_POST['moderation-hash'], wp_hash( $comment->comment_date_gmt ) ) ) {
+                update_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true );
+        } else {
                 wp_die(
-                        '<p>' . $comment->get_error_message() . '</p>',
-                        __( 'Comment Submission Failure' ),
+                        '<p>' . __( 'Invalid comment ID.' ) . '</p>',
+                        __( 'Comment Notification Opt-in Failure' ),
                         array(
-                                'response'  => $data,
+                                'response'  => 404,
                                 'back_link' => true,
                         )
                 );
-        } else {
-                exit;
         }
+} else {
+        $comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
+        if ( is_wp_error( $comment ) ) {
+                $data = (int) $comment->get_error_data();
+                if ( ! empty( $data ) ) {
+                        wp_die(
+                                '<p>' . $comment->get_error_message() . '</p>',
+                                __( 'Comment Submission Failure' ),
+                                array(
+                                        'response'  => $data,
+                                        'back_link' => true,
+                                )
+                        );
+                } else {
+                        exit;
+                }
+        }
+
+        $user            = wp_get_current_user();
+        $cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
+
+        /**
+         * Perform other actions when comment cookies are set.
+         *
+         * @since 3.4.0
+         * @since 4.9.6 The `$cookies_consent` parameter was added.
+         *
+         * @param WP_Comment $comment         Comment object.
+         * @param WP_User    $user            Comment author's user object. The user may not exist.
+         * @param bool       $cookies_consent Comment author's consent to store cookies.
+         */
+        do_action( 'set_comment_cookies', $comment, $user, $cookies_consent );
 }
-
-$user            = wp_get_current_user();
-$cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
-
-/**
- * Perform other actions when comment cookies are set.
- *
- * @since 3.4.0
- * @since 4.9.6 The `$cookies_consent` parameter was added.
- *
- * @param WP_Comment $comment         Comment object.
- * @param WP_User    $user            Comment author's user object. The user may not exist.
- * @param bool       $cookies_consent Comment author's consent to store cookies.
- */
-do_action( 'set_comment_cookies', $comment, $user, $cookies_consent );
 
 $location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;