--- a/wp/wp-comments-post.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-comments-post.php Mon Oct 14 17:39:30 2019 +0200
@@ -6,8 +6,13 @@
*/
if ( 'POST' != $_SERVER['REQUEST_METHOD'] ) {
+ $protocol = $_SERVER['SERVER_PROTOCOL'];
+ if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+ $protocol = 'HTTP/1.0';
+ }
+
header('Allow: POST');
- header('HTTP/1.1 405 Method Not Allowed');
+ header("$protocol 405 Method Not Allowed");
header('Content-Type: text/plain');
exit;
}
@@ -17,149 +22,40 @@
nocache_headers();
-$comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post_ID'] : 0;
-
-$post = get_post($comment_post_ID);
-
-if ( empty( $post->comment_status ) ) {
- /**
- * Fires when a comment is attempted on a post that does not exist.
- *
- * @since 1.5.0
- *
- * @param int $comment_post_ID Post ID.
- */
- do_action( 'comment_id_not_found', $comment_post_ID );
- exit;
-}
-
-// get_post_status() will get the parent status for attachments.
-$status = get_post_status($post);
-
-$status_obj = get_post_status_object($status);
-
-if ( ! comments_open( $comment_post_ID ) ) {
- /**
- * Fires when a comment is attempted on a post that has comments closed.
- *
- * @since 1.5.0
- *
- * @param int $comment_post_ID Post ID.
- */
- do_action( 'comment_closed', $comment_post_ID );
- wp_die( __( 'Sorry, comments are closed for this item.' ), 403 );
-} elseif ( 'trash' == $status ) {
- /**
- * Fires when a comment is attempted on a trashed post.
- *
- * @since 2.9.0
- *
- * @param int $comment_post_ID Post ID.
- */
- do_action( 'comment_on_trash', $comment_post_ID );
- exit;
-} elseif ( ! $status_obj->public && ! $status_obj->private ) {
- /**
- * Fires when a comment is attempted on a post in draft mode.
- *
- * @since 1.5.1
- *
- * @param int $comment_post_ID Post ID.
- */
- do_action( 'comment_on_draft', $comment_post_ID );
- exit;
-} elseif ( post_password_required( $comment_post_ID ) ) {
- /**
- * Fires when a comment is attempted on a password-protected post.
- *
- * @since 2.9.0
- *
- * @param int $comment_post_ID Post ID.
- */
- do_action( 'comment_on_password_protected', $comment_post_ID );
- exit;
-} else {
- /**
- * Fires before a comment is posted.
- *
- * @since 2.8.0
- *
- * @param int $comment_post_ID Post ID.
- */
- do_action( 'pre_comment_on_post', $comment_post_ID );
-}
-
-$comment_author = ( isset($_POST['author']) ) ? trim(strip_tags($_POST['author'])) : null;
-$comment_author_email = ( isset($_POST['email']) ) ? trim($_POST['email']) : null;
-$comment_author_url = ( isset($_POST['url']) ) ? trim($_POST['url']) : null;
-$comment_content = ( isset($_POST['comment']) ) ? trim($_POST['comment']) : null;
-
-// If the user is logged in
-$user = wp_get_current_user();
-if ( $user->exists() ) {
- if ( empty( $user->display_name ) )
- $user->display_name=$user->user_login;
- $comment_author = wp_slash( $user->display_name );
- $comment_author_email = wp_slash( $user->user_email );
- $comment_author_url = wp_slash( $user->user_url );
- if ( current_user_can( 'unfiltered_html' ) ) {
- if ( ! isset( $_POST['_wp_unfiltered_html_comment'] )
- || ! wp_verify_nonce( $_POST['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )
- ) {
- kses_remove_filters(); // start with a clean slate
- kses_init_filters(); // set up the filters
- }
- }
-} else {
- if ( get_option( 'comment_registration' ) || 'private' == $status ) {
- wp_die( __( 'Sorry, you must be logged in to post a comment.' ), 403 );
+$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
+if ( is_wp_error( $comment ) ) {
+ $data = intval( $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;
}
}
-$comment_type = '';
-
-if ( get_option('require_name_email') && !$user->exists() ) {
- if ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
- wp_die( __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
- } elseif ( ! is_email( $comment_author_email ) ) {
- wp_die( __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
- }
-}
-
-if ( '' == $comment_content ) {
- wp_die( __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
-}
-
-$comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
-
-$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
-
-$comment_id = wp_new_comment( $commentdata );
-if ( ! $comment_id ) {
- wp_die( __( "<strong>ERROR</strong>: The comment could not be saved. Please try again later." ) );
-}
-
-$comment = get_comment( $comment_id );
+$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 object $comment Comment object.
- * @param WP_User $user User object. The user may not exist.
+ * @param WP_Comment $comment Comment object.
+ * @param WP_User $user Comment author's user object. The user may not exist.
+ * @param boolean $cookies_consent Comment author's consent to store cookies.
*/
-do_action( 'set_comment_cookies', $comment, $user );
+do_action( 'set_comment_cookies', $comment, $user, $cookies_consent );
-$location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id;
+$location = empty( $_POST['redirect_to'] ) ? get_comment_link( $comment ) : $_POST['redirect_to'] . '#comment-' . $comment->comment_ID;
/**
- * Filter the location URI to send the commenter after posting.
+ * Filters the location URI to send the commenter after posting.
*
* @since 2.0.5
*
- * @param string $location The 'redirect_to' URI sent via $_POST.
- * @param object $comment Comment object.
+ * @param string $location The 'redirect_to' URI sent via $_POST.
+ * @param WP_Comment $comment Comment object.
*/
$location = apply_filters( 'comment_post_redirect', $location, $comment );