diff --git src/wp-admin/css/dashboard.css src/wp-admin/css/dashboard.css index 2411c79900..e76acdeaa5 100644 --- src/wp-admin/css/dashboard.css +++ src/wp-admin/css/dashboard.css @@ -821,6 +821,12 @@ body #dashboard-widgets .postbox form .submit { position: relative; } +#activity-widget #the-comment-list .comment-item .attention { + display: none; + color: #d54e21; + font-size: 90%; +} + #activity-widget #the-comment-list .avatar { position: absolute; top: 12px; @@ -857,6 +863,10 @@ body #dashboard-widgets .postbox form .submit { width: 4px; } +#activity-widget #the-comment-list .unapproved .attention { + display: block; +} + #activity-widget #the-comment-list .spam-undo-inside .avatar, #activity-widget #the-comment-list .trash-undo-inside .avatar { position: relative; diff --git src/wp-admin/css/list-tables.css src/wp-admin/css/list-tables.css index 1febe4e837..56334925a7 100644 --- src/wp-admin/css/list-tables.css +++ src/wp-admin/css/list-tables.css @@ -217,6 +217,12 @@ background-color: #f5f5f5; } +#the-comment-list .comment .attention { + display: none; + color: #d54e21; + font-size: 90%; +} + #the-comment-list .unapproved th, #the-comment-list .unapproved td { background-color: #fef7f1; @@ -230,6 +236,10 @@ margin-left: 4px; } +#the-comment-list .comment.unapproved .attention { + display: block; +} + #the-comment-list .approve a { color: #006505; } diff --git src/wp-admin/includes/class-wp-comments-list-table.php src/wp-admin/includes/class-wp-comments-list-table.php index 563187ffe4..daf837aaa6 100644 --- src/wp-admin/includes/class-wp-comments-list-table.php +++ src/wp-admin/includes/class-wp-comments-list-table.php @@ -882,6 +882,11 @@ class WP_Comments_List_Table extends WP_List_Table { } } + if ( 0 === (int) $comment->comment_approved && true === (bool) get_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true ) ) { + /* translators: %s is the comment author name. */ + echo '

' . sprintf( esc_html__( '%s has opted in to receive a notification on comment’s approval.' ), get_comment_author( $comment ) ) . '

'; + } + comment_text( $comment ); if ( $this->user_can ) { diff --git src/wp-admin/includes/dashboard.php src/wp-admin/includes/dashboard.php index 6855aa6c96..7042972aad 100644 --- src/wp-admin/includes/dashboard.php +++ src/wp-admin/includes/dashboard.php @@ -827,8 +827,19 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) { } ?>

- comment_approved && true === (bool) get_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true ) ) : + ?> +

+ + +

+ comment_type ) { case 'pingback': diff --git src/wp-comments-post.php src/wp-comments-post.php index 06cbd460f4..3b1a8b44ca 100644 --- src/wp-comments-post.php +++ src/wp-comments-post.php @@ -22,37 +22,53 @@ require __DIR__ . '/wp-load.php'; 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 ( ! is_null( $comment->comment_ID ) && 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( - '

' . $comment->get_error_message() . '

', - __( 'Comment Submission Failure' ), + '

' . __( 'Sorry we haven’t found your comment.' ) . '

', + __( 'Comment Notification opt-in failure' ), array( - 'response' => $data, '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( + '

' . $comment->get_error_message() . '

', + __( 'Comment Submission Failure' ), + array( + 'response' => $data, + 'back_link' => true, + ) + ); + } else { + exit; + } + } -$user = wp_get_current_user(); -$cookies_consent = ( isset( $_POST['wp-comment-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 ); + /** + * 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; diff --git src/wp-includes/class-walker-comment.php src/wp-includes/class-walker-comment.php index 9df2d20b3b..72f536118e 100644 --- src/wp-includes/class-walker-comment.php +++ src/wp-includes/class-walker-comment.php @@ -275,6 +275,59 @@ class Walker_Comment extends Walker { return $comment_text; } + /** + * Outputs the awaiting moderation text. + * + * @since 5.7.0 + * + * @param WP_Comment $comment Comment to display. + */ + protected function awaiting_moderation_text( $comment ) { + if ( 0 !== (int) $comment->comment_approved ) { + return; + } + + $commenter = wp_get_current_commenter(); + if ( $commenter['comment_author_email'] ) { + $moderation_note = __( 'Your comment is awaiting moderation.' ); + } else { + $moderation_note = __( 'Your comment is awaiting moderation. This is a preview, your comment will be visible after it has been approved.' ); + } + + printf( '%s', esc_html( $moderation_note ) ); + } + + /** + * Outputs the comment's approval notification form. + * + * @since 5.7.0 + * + * @param WP_Comment $comment Comment to display. + */ + protected function comment_approval_notification_form( $comment ) { + if ( 0 !== (int) $comment->comment_approved || ! has_action( 'comment_unapproved_to_approved', 'wp_new_comment_notify_comment_author' ) ) { + return; + } + + if ( true === (bool) get_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true ) ) : + ?> +

+ +
+

+ +

+ + + +
+ < has_children ? 'parent' : '', $comment ); ?> id="comment-"> @@ -328,10 +375,8 @@ class Walker_Comment extends Walker { ); ?> - comment_approved ) : ?> - + awaiting_moderation_text( $comment ); ?>
-
comment_approval_notification_form( $comment ); ?> < id="comment-" has_children ? 'parent' : '', $comment ); ?>>
@@ -450,13 +492,16 @@ class Walker_Comment extends Walker { ?>
- comment_approved ) : ?> - - + awaiting_moderation_text( $comment ); ?>
- + comment_approval_notification_form( $comment ); + ?>
comment_post_ID ); + $comment_author = get_user_by( 'email', $comment->comment_author_email ); + + if ( ! $post ) { + return false; + } + + // The comment was left by the post author. + if ( $comment->user_id === $post->post_author || get_userdata( $post->post_author ) === $comment_author ) { + return false; + } + + // Make sure the comment author can notified by email. + if ( empty( $comment->comment_author_email ) ) { + return false; + } + + if ( true !== (bool) get_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin', true ) ) { + return false; + } + + /** + * The blogname option is escaped with esc_html when + * saved into the database, we need to reverse this for + * the plain text area of the email. + */ + $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); + + /* translators: 1: blog name, 2: post title */ + $subject = sprintf( __( '[%1$s] Your comment on "%2$s" has been approved' ), $blogname, $post->post_title ); + + if ( ! empty( $comment->comment_author ) ) { + /* translators: 1: comment author's name */ + $notify_message = sprintf( __( 'Howdy %s,' ), $comment->comment_author ) . "\r\n\r\n"; + } else { + $notify_message = __( 'Howdy,' ) . "\r\n\r\n"; + } + + /* translators: 1: post title */ + $notify_message .= sprintf( __( 'Your comment on the post "%s" has been approved.' ), $post->post_title ) . "\r\n\r\n"; + /* translators: 1: comment permalink */ + $notify_message .= sprintf( __( 'View comment: %s' ), get_comment_link( $comment ) ) . "\r\n"; + + /** + * Filter the comment approval notification email text. + * + * @since 5.7.0 + * + * @param string $notify_message The comment notification email text. + * @param WP_Comment $comment Comment object. + */ + $notify_message = apply_filters( 'comment_approval_notification_text', $notify_message, $comment ); + + /** + * Filter the comment approval notification email subject. + * + * @since 5.7.0 + * + * @param string $subject The comment notification email subject. + * @param WP_Comment $comment Comment object. + */ + $subject = apply_filters( 'comment_approval_notification_subject', $subject, $comment ); + + $sent = wp_mail( $comment->comment_author_email, wp_specialchars_decode( $subject ), $notify_message ); + + // Delete the opt-in now the notification has been sent. + delete_comment_meta( $comment->comment_ID, '_wp_comment_author_notification_optin' ); + + return $sent; +} + /** * Sets the status of a comment. * diff --git src/wp-includes/default-filters.php src/wp-includes/default-filters.php index 96ef7d82eb..fd1d02a0f3 100644 --- src/wp-includes/default-filters.php +++ src/wp-includes/default-filters.php @@ -458,6 +458,7 @@ add_action( 'comment_post', 'wp_new_comment_notify_postauthor' ); add_action( 'after_password_reset', 'wp_password_change_notification' ); add_action( 'register_new_user', 'wp_send_new_user_notifications' ); add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 ); +add_action( 'comment_unapproved_to_approved', 'wp_new_comment_notify_comment_author' ); // REST API actions. add_action( 'init', 'rest_api_init' ); diff --git tests/phpunit/tests/comment.php tests/phpunit/tests/comment.php index c3013ad2c6..2bd1fd690e 100644 --- tests/phpunit/tests/comment.php +++ tests/phpunit/tests/comment.php @@ -554,6 +554,34 @@ class Tests_Comment extends WP_UnitTestCase { return $notify_message; } + /** + * @ticket 33717 + */ + public function test_wp_new_comment_notify_comment_author_once_only() { + $c = self::factory()->comment->create( + array( + 'comment_post_ID' => self::$post_id, + 'comment_approved' => '0', + 'comment_author_email' => 'foo@bar.mail', + ) + ); + + // The user subscribed to receive an email once comment is approved. + update_comment_meta( $c, '_wp_comment_author_notification_optin', true ); + + // For the purpose of the test we are removing this hook to directly use the function to notify the comment author. + remove_action( 'comment_unapproved_to_approved', 'wp_new_comment_notify_comment_author' ); + + // Approve the comment. + wp_set_comment_status( $c, 'approve' ); + + $sent = wp_new_comment_notify_comment_author( $c ); + $this->assertTrue( $sent ); + + $resent = wp_new_comment_notify_comment_author( $c ); + $this->assertFalse( $resent ); + } + /** * @ticket 12431 */