Wordpress 2.3.3

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

diff --git a/wp-comments-post.php b/wp-comments-post.php
index 47926c12b873721b3c890d7a69a67a167742563b..563745954ec88c839cc9267635a5411145607349 100644 (file)
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -1,4 +1,10 @@
 <?php
+if ( 'POST' != $_SERVER['REQUEST_METHOD'] ) {
+       header('Allow: POST');
+       header('HTTP/1.1 405 Method Not Allowed');
+       header('Content-Type: text/plain');
+       exit;
+}
 require( dirname(__FILE__) . '/wp-config.php' );
 
 nocache_headers();
@@ -12,13 +18,13 @@ if ( empty($status->comment_status) ) {
        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 ) {
+       wp_die( __('Sorry, comments are closed for this item.') );
+} elseif ( in_array($status->post_status, array('draft', 'pending') ) ) {
        do_action('comment_on_draft', $comment_post_ID);
        exit;
 }
 
-$comment_author       = trim($_POST['author']);
+$comment_author       = trim(strip_tags($_POST['author']));
 $comment_author_email = trim($_POST['email']);
 $comment_author_url   = trim($_POST['url']);
 $comment_content      = trim($_POST['comment']);
@@ -37,31 +43,31 @@ if ( $user->ID ) {
        }
 } else {
        if ( get_option('comment_registration') )
-               die( __('Sorry, you must be logged in to post a comment.') );
+               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->ID ) {
        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.') );
 
 $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);
+$comment = get_comment($comment_id);
+if ( !$user->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'] ) . '#comment-' . $comment_id;
 $location = apply_filters('comment_post_redirect', $location, $comment);