Changeset 883488

Timestamp:

03/28/2014 11:05:12 AM (10 years ago)

Author:

eoigal

Message:

• Ignore discard header in ajax requests and where the user is logged in.
• Drop the use of static variables to ensure comment only increments counter once, compare comment to last comment instead

File:

• akismet/trunk/class.akismet.php (modified) (6 diffs)

akismet/trunk/class.akismet.php

@@ -123 +123 @@
         if ( 'true' == $response[1] ) {
             // akismet_spam_count will be incremented later by comment_is_spam()
-            add_filter('pre_comment_approved', array( 'Akismet',  'comment_is_spam' ) );
-
-            $discard = ( isset( $commentdata['akismet_pro_tip'] ) && $commentdata['akismet_pro_tip'] === 'discard' && get_option( 'akismet_strictness' ) === '1' );
+            add_filter('pre_comment_approved', array( 'Akismet',  'comment_is_spam' ) );
+
+            $discard = ( isset( $commentdata['akismet_pro_tip'] ) && $commentdata['akismet_pro_tip'] === 'discard' &&  );
 
             do_action( 'akismet_spam_caught', $discard );
@@ -148 +148 @@
         if ( 'true' != $response[1] && 'false' != $response[1] ) {
             if ( !current_user_can('moderate_comments') ) {
-                add_filter('pre_comment_approved', array( 'Akismet',  'comment_needs_moderation' ) );
+                add_filter('pre_comment_approved', array( 'Akismet',  'comment_needs_moderation' ) );
             }
             if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_single_event') ) {
@@ -187 +187 @@
         // as was checked by auto_check_comment
         if ( is_object( $comment ) && !empty( self::$last_comment ) && is_array( self::$last_comment ) ) {
-            if ( isset( self::$last_comment['comment_post_ID'] )
-                && intval( self::$last_comment['comment_post_ID'] ) == intval( $comment->comment_post_ID )
-                && self::$last_comment['comment_author'] == $comment->comment_author
-                && self::$last_comment['comment_author_email'] == $comment->comment_author_email ) {
+            if ( self::matches_last_comment( $comment ) ) {
                     
                     load_plugin_textdomain( 'akismet' );
@@ -443 +440 @@
         return defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE;
     }
+
+
+
+
+
+
+
+
+
 
     public static function get_ip_address() {
         return isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : null;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -482 +508 @@
 
     // filter handler used to return a spam result to pre_comment_approved
-    public static function comment_is_spam( $approved ) {
-        static $just_once = false;
-        if ( $just_once )
+    public static function comment_is_spam( $approved, $comment ) { 
+        // Only do this if it's the correct comment
+        if ( !self::matches_last_comment( $comment ) ) {
+            self::log( "comment_is_spam mismatched comment, returning unaltered $approved" );
             return $approved;
+
 
         // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
@@ -491 +519 @@
             update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
 
-        // this is a one-shot deal
-        $just_once = true;
         return 'spam';
     }
 
-    public static function comment_needs_moderation( $approved ) {
-        static $just_once = false;
-        if ( $just_once )
+    public static function comment_needs_moderation( $approved ) {
+        
+    
             return $approved;
-
-        // once only
-        $just_once = true;
-        return '0';
+        }    
+        return '0';
     }