WordPress 4.4

[autoinstalls/wordpress.git] / wp-comments-post.php

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 953de6848b6381c3a30bce539547b7d8c0fe8364..2fb148a8dca418ddd9f050e0dc9574b5d25717ad 100644 (file)
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -1,64 +1,55 @@
 <?php
 <?php

-require( dirname(__FILE__) . '/wp-config.php' );
-
-nocache_headers();
-
-$comment_post_ID = (int) $_POST['comment_post_ID'];
-
-$status = $wpdb->get_row("SELECT post_status, comment_status FROM $wpdb->posts WHERE ID = '$comment_post_ID'");
-
-if ( empty($status->comment_status) ) {
-       do_action('comment_id_not_found', $comment_post_ID);
-       exit;
-} elseif ( 'closed' ==  $status->comment_status ) {
-       do_action('comment_closed', $comment_post_ID);
-       die( __('Sorry, comments are closed for this item.') );
-} elseif ( 'draft' == $status->post_status ) {
-       do_action('comment_on_draft', $comment_post_ID);
+/**
+ * Handles Comment Post to WordPress and prevents duplicate comment posting.
+ *
+ * @package WordPress
+ */
+
+if ( 'POST' != $_SERVER['REQUEST_METHOD'] ) {
+       header('Allow: POST');
+       header('HTTP/1.1 405 Method Not Allowed');
+       header('Content-Type: text/plain');

        exit;
 }
 
        exit;
 }
 

-$comment_author       = trim($_POST['author']);
-$comment_author_email = trim($_POST['email']);
-$comment_author_url   = trim($_POST['url']);
-$comment_content      = trim($_POST['comment']);
-
-// If the user is logged in
-get_currentuserinfo();
-if ( $user_ID ) :
-       $comment_author       = $wpdb->escape($user_identity);
-       $comment_author_email = $wpdb->escape($user_email);
-       $comment_author_url   = $wpdb->escape($user_url);
-else :
-       if ( get_option('comment_registration') )
-               die( __('Sorry, you must be logged in to post a comment.') );
-endif;
+/** Sets up the WordPress Environment. */
+require( dirname(__FILE__) . '/wp-load.php' );

 
 

-$comment_type = '';
+nocache_headers();

 
 

-if ( get_settings('require_name_email') && !$user_ID ) {
-       if ( 6 > strlen($comment_author_email) || '' == $comment_author )
-               die( __('Error: please fill the required fields (name, email).') );
-       elseif ( !is_email($comment_author_email))
-               die( __('Error: please enter a valid email address.') );
+$comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
+if ( is_wp_error( $comment ) ) {
+       $data = $comment->get_error_data();
+       if ( ! empty( $data ) ) {
+               wp_die( $comment->get_error_message(), $data );
+       } else {
+               exit;
+       }

 }
 
 }
 

-if ( '' == $comment_content )
-       die( __('Error: please type a comment.') );
-
-$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'user_ID');
-
-$comment_id = wp_new_comment( $commentdata );
-
-if ( !$user_ID ) :
-       $comment = get_comment($comment_id);
-       setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-       setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-       setcookie('comment_author_url_' . COOKIEHASH, clean_url($comment->comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN);
-endif;
-
-$location = ( empty( $_POST['redirect_to'] ) ) ? get_permalink( $comment_post_ID ) : $_POST['redirect_to']; 
-
-wp_redirect( $location );
-
-?>
+$user = wp_get_current_user();
+
+/**
+ * Perform other actions when comment cookies are set.
+ *
+ * @since 3.4.0
+ *
+ * @param WP_Comment $comment Comment object.
+ * @param WP_User    $user    User object. The user may not exist.
+ */
+do_action( 'set_comment_cookies', $comment, $user );
+
+$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.
+ *
+ * @since 2.0.5
+ *
+ * @param string     $location The 'redirect_to' URI sent via $_POST.
+ * @param WP_Comment $comment  Comment object.
+ */
+$location = apply_filters( 'comment_post_redirect', $location, $comment );
+
+wp_safe_redirect( $location );
+exit;