X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..6d3aa5fe58b2f91735fe04e94a2c12b7dd9adb09:/wp-comments-post.php
diff --git a/wp-comments-post.php b/wp-comments-post.php
index e2e12f76..859ccb46 100644
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -21,8 +21,14 @@ $comment_post_ID = isset($_POST['comment_post_ID']) ? (int) $_POST['comment_post
$post = get_post($comment_post_ID);
-if ( empty($post->comment_status) ) {
- do_action('comment_id_not_found', $comment_post_ID);
+if ( empty( $post->comment_status ) ) {
+ /**
+ * Fires when a comment is attempted on a post that does not exist.
+ *
+ * @since unknown
+ * @param int $comment_post_ID Post ID.
+ */
+ do_action( 'comment_id_not_found', $comment_post_ID );
exit;
}
@@ -31,20 +37,50 @@ $status = get_post_status($post);
$status_obj = get_post_status_object($status);
-if ( !comments_open($comment_post_ID) ) {
- do_action('comment_closed', $comment_post_ID);
+if ( ! comments_open( $comment_post_ID ) ) {
+ /**
+ * Fires when a comment is attempted on a post that has comments closed.
+ *
+ * @since unknown
+ * @param int $comment_post_ID Post ID.
+ */
+ do_action( 'comment_closed', $comment_post_ID );
wp_die( __('Sorry, comments are closed for this item.') );
} elseif ( 'trash' == $status ) {
- do_action('comment_on_trash', $comment_post_ID);
+ /**
+ * 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 ) {
- do_action('comment_on_draft', $comment_post_ID);
+} elseif ( ! $status_obj->public && ! $status_obj->private ) {
+ /**
+ * Fires when a comment is attempted on a post in draft mode.
+ *
+ * @since unknown
+ * @param int $comment_post_ID Post ID.
+ */
+ do_action( 'comment_on_draft', $comment_post_ID );
exit;
-} elseif ( post_password_required($comment_post_ID) ) {
- do_action('comment_on_password_protected', $comment_post_ID);
+} elseif ( post_password_required( $comment_post_ID ) ) {
+ /**
+ * Fires when a comment is attempted on a password-protected post.
+ *
+ * @since unknown
+ * @param int $comment_post_ID Post ID.
+ */
+ do_action( 'comment_on_password_protected', $comment_post_ID );
exit;
} else {
- do_action('pre_comment_on_post', $comment_post_ID);
+ /**
+ * Fires before a comment is posted.
+ *
+ * @since unknown
+ * @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;
@@ -54,14 +90,16 @@ $comment_content = ( isset($_POST['comment']) ) ? trim($_POST['comment']) :
// If the user is logged in
$user = wp_get_current_user();
-if ( $user->ID ) {
+if ( $user->exists() ) {
if ( empty( $user->display_name ) )
$user->display_name=$user->user_login;
- $comment_author = $wpdb->escape($user->display_name);
- $comment_author_email = $wpdb->escape($user->user_email);
- $comment_author_url = $wpdb->escape($user->user_url);
- if ( current_user_can('unfiltered_html') ) {
- if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
+ $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
}
@@ -73,33 +111,44 @@ if ( $user->ID ) {
$comment_type = '';
-if ( get_option('require_name_email') && !$user->ID ) {
+if ( get_option('require_name_email') && !$user->exists() ) {
if ( 6 > strlen($comment_author_email) || '' == $comment_author )
- wp_die( __('Error: please fill the required fields (name, email).') );
+ wp_die( __('ERROR: please fill the required fields (name, email).') );
elseif ( !is_email($comment_author_email))
- wp_die( __('Error: please enter a valid email address.') );
+ wp_die( __('ERROR: please enter a valid email address.') );
}
if ( '' == $comment_content )
- wp_die( __('Error: please type a comment.') );
+ wp_die( __('ERROR: please type a comment.') );
$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 );
-
$comment = get_comment($comment_id);
-if ( !$user->ID ) {
- $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
- setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
- setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
- setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-}
+
+/**
+ * Perform other actions when comment cookies are set.
+ *
+ * @since 3.4.0
+ *
+ * @param object $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_id) : $_POST['redirect_to'] . '#comment-' . $comment_id;
-$location = apply_filters('comment_post_redirect', $location, $comment);
-wp_redirect($location);
+/**
+ * The location URI to send commenter after posting.
+ *
+ * @since unknown
+ *
+ * @param string $location The 'redirect_to' URI sent via $_POST.
+ * @param object $comment Comment object.
+ */
+$location = apply_filters( 'comment_post_redirect', $location, $comment );
-?>
+wp_safe_redirect( $location );
+exit;