Changeset 2556

Timestamp:

04/20/2005 03:37:23 AM (21 years ago)

Author:

matt

Message:

Line ending fixes and commenting cleanups from Scott Reilly

Location:

trunk

Files:

• wp-comments-post.php (modified) (1 diff)
• wp-includes/functions-post.php (modified) (2 diffs)
• wp-includes/pluggable-functions.php (modified) (1 prop)
• wp-trackback.php (modified) (3 diffs)

trunk/wp-comments-post.php

@@ -33 +33 @@
 
 if ( get_settings('require_name_email') && !$user_ID ) {
-        if ('' == $comment_author_email || '' == $comment_author)
+        if ( 7 > strlen($comment_author_email) || '' == $comment_author )
                 die( __('Error: please fill the required fields (name, email).') );
         elseif ( !is_email($comment_author_email))

trunk/wp-includes/functions-post.php

@@ -481 +481 @@
         $now_gmt = current_time('mysql', 1);
 
+        if ( $user_id ) {
+                $userdata = get_userdata($user_id);
+                $post_author = $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = '$comment_post_ID' LIMIT 1");
+        }
+
         // Simple flood-protection
         if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$user_ip' OR comment_author_email = '$email' ORDER BY comment_date DESC LIMIT 1") ) {
@@ -497 +502 @@
         if ( wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) )
                 $approved = 'spam';
-        
+        if ( $userdata && ( $user_id == $post_author || $userdata['user_level'] >= 9 ) )
+                $approved = 1;
+
         $approved = apply_filters('pre_comment_approved', $approved);
 

trunk/wp-trackback.php

@@ -28 +28 @@
 $request_array = 'HTTP_POST_VARS';
 
-if ( empty($_GET['tb_id']) ) {
+if ( !$_GET['tb_id'] ) {
         $tb_id = explode('/', $_SERVER['REQUEST_URI']);
-        $tb_id = intval($tb_id[count($tb_id)-1]);
-} else {
-        $tb_id = intval($_GET['tb_id']);
+        $tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
 }
 
@@ -55 +53 @@
     $tb_id = $posts[0]->ID;
 
-if ( !$tb_id )
+if ( !intval( $tb_id ) )
         trackback_response(1, 'I really need an ID for this to work.');
 
@@ -69 +67 @@
         $pingstatus = $wpdb->get_var("SELECT ping_status FROM $wpdb->posts WHERE ID = $tb_id");
 
-        if ('open' != $pingstatus)
+        if ( 'open' != $pingstatus )
                 trackback_response(1, 'Sorry, trackbacks are closed for this item.');