X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/022dfbbbe3215917d84708eb09acca93b21ae9e0..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-comments-post.php?ds=sidebyside
diff --git a/wp-comments-post.php b/wp-comments-post.php
index 47926c12..7b4a5e9d 100644
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -1,34 +1,65 @@
get_row("SELECT post_status, comment_status FROM $wpdb->posts WHERE ID = '$comment_post_ID'");
+$post = get_post($comment_post_ID);
-if ( empty($status->comment_status) ) {
+if ( empty($post->comment_status) ) {
do_action('comment_id_not_found', $comment_post_ID);
exit;
-} elseif ( 'closed' == $status->comment_status ) {
+}
+
+// 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) ) {
do_action('comment_closed', $comment_post_ID);
- die( __('Sorry, comments are closed for this item.') );
-} elseif ( 'draft' == $status->post_status ) {
+ wp_die( __('Sorry, comments are closed for this item.') );
+} elseif ( 'trash' == $status ) {
+ do_action('comment_on_trash', $comment_post_ID);
+ exit;
+} elseif ( !$status_obj->public && !$status_obj->private ) {
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);
+ exit;
+} else {
+ do_action('pre_comment_on_post', $comment_post_ID);
}
-$comment_author = trim($_POST['author']);
-$comment_author_email = trim($_POST['email']);
-$comment_author_url = trim($_POST['url']);
-$comment_content = trim($_POST['comment']);
+$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->ID ) {
- $comment_author = $wpdb->escape($user->display_name);
- $comment_author_email = $wpdb->escape($user->user_email);
- $comment_author_url = $wpdb->escape($user->user_url);
+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 ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) {
kses_remove_filters(); // start with a clean slate
@@ -36,36 +67,33 @@ if ( $user->ID ) {
}
}
} else {
- if ( get_option('comment_registration') )
- die( __('Sorry, you must be logged in to post a comment.') );
+ if ( get_option('comment_registration') || 'private' == $status )
+ wp_die( __('Sorry, you must be logged in to post a comment.') );
}
$comment_type = '';
-if ( get_settings('require_name_email') && !$user->ID ) {
+if ( get_option('require_name_email') && !$user->exists() ) {
if ( 6 > strlen($comment_author_email) || '' == $comment_author )
- 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))
- die( __('Error: please enter a valid email address.') );
+ wp_die( __('ERROR: please enter a valid email address.') );
}
if ( '' == $comment_content )
- 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', 'user_ID');
+$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 ( !$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;
+$comment = get_comment($comment_id);
+do_action('set_comment_cookies', $comment, $user);
-$location = ( empty($_POST['redirect_to']) ? get_permalink($comment_post_ID) : $_POST['redirect_to'] ) . '#comment-' . $comment_id;
+$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);
-
-?>
+wp_safe_redirect( $location );
+exit;