WordPress 4.5
[autoinstalls/wordpress.git] / wp-content / plugins / akismet / class.akismet.php
index e47c8a8f186db42e228cf06a1e2d244f9895d5a7..c81d70d06a716cc24527ee07abc85e771d6c5ac2 100644 (file)
@@ -53,6 +53,10 @@ class Akismet {
 
                // Run this early in the pingback call, before doing a remote fetch of the source uri
                add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ) );
 
                // Run this early in the pingback call, before doing a remote fetch of the source uri
                add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ) );
+               
+               // Jetpack compatibility
+               add_filter( 'jetpack_options_whitelist', array( 'Akismet', 'add_to_jetpack_options_whitelist' ) );
+               add_action( 'update_option_wordpress_api_key', array( 'Akismet', 'updated_option' ), 10, 2 );
        }
 
        public static function get_api_key() {
        }
 
        public static function get_api_key() {
@@ -81,6 +85,37 @@ class Akismet {
                return $response[1];
        }
 
                return $response[1];
        }
 
+       /**
+        * Add the akismet option to the Jetpack options management whitelist.
+        *
+        * @param array $options The list of whitelisted option names.
+        * @return array The updated whitelist
+        */
+       public static function add_to_jetpack_options_whitelist( $options ) {
+               $options[] = 'wordpress_api_key';
+               return $options;
+       }
+
+       /**
+        * When the akismet option is updated, run the registration call.
+        *
+        * This should only be run when the option is updated from the Jetpack/WP.com
+        * API call, and only if the new key is different than the old key.
+        *
+        * @param mixed  $old_value   The old option value.
+        * @param mixed  $value       The new option value.
+        */
+       public static function updated_option( $old_value, $value ) {
+               // Not an API call
+               if ( ! class_exists( 'WPCOM_JSON_API_Update_Option_Endpoint' ) ) {
+                       return;
+               }
+               // Only run the registration if the old key is different.
+               if ( $old_value !== $value ) {
+                       self::verify_key( $value );
+               }
+       }
+
        public static function auto_check_comment( $commentdata ) {
                self::$last_comment_result = null;
 
        public static function auto_check_comment( $commentdata ) {
                self::$last_comment_result = null;
 
@@ -119,13 +154,19 @@ class Akismet {
                                $comment["POST_{$key}"] = $value;
                }
 
                                $comment["POST_{$key}"] = $value;
                }
 
-               $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
-
                foreach ( $_SERVER as $key => $value ) {
                foreach ( $_SERVER as $key => $value ) {
-                       if ( !in_array( $key, $ignore ) && is_string($value) )
-                               $comment["$key"] = $value;
-                       else
-                               $comment["$key"] = '';
+                       if ( ! is_string( $value ) ) {
+                               continue;
+                       }
+
+                       if ( preg_match( "/^HTTP_COOKIE/", $key ) ) {
+                               continue;
+                       }
+
+                       // Send any potentially useful $_SERVER vars, but avoid sending junk we don't need.
+                       if ( preg_match( "/^(HTTP_|REMOTE_ADDR|REQUEST_URI|DOCUMENT_URI)/", $key ) ) {
+                               $comment[ "$key" ] = $value;
+                       }
                }
 
                $post = get_post( $comment['comment_post_ID'] );
                }
 
                $post = get_post( $comment['comment_post_ID'] );
@@ -248,7 +289,9 @@ class Akismet {
                                        elseif ( self::$last_comment['akismet_result'] == 'false' ) {
                                                update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
                                                self::update_comment_history( $comment->comment_ID, '', 'check-ham' );
                                        elseif ( self::$last_comment['akismet_result'] == 'false' ) {
                                                update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
                                                self::update_comment_history( $comment->comment_ID, '', 'check-ham' );
-                                               if ( $comment->comment_approved == 'spam' ) {
+                                               // Status could be spam or trash, depending on the WP version and whether this change applies:
+                                               // https://core.trac.wordpress.org/changeset/34726
+                                               if ( $comment->comment_approved == 'spam' || $comment->comment_approved == 'trash' ) {
                                                        if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
                                                                self::update_comment_history( $comment->comment_ID, '', 'wp-blacklisted' );
                                                        else
                                                        if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
                                                                self::update_comment_history( $comment->comment_ID, '', 'wp-blacklisted' );
                                                        else
@@ -707,25 +750,35 @@ class Akismet {
                $comment1 = (array) $comment1;
                $comment2 = (array) $comment2;
                
                $comment1 = (array) $comment1;
                $comment2 = (array) $comment2;
                
-               return (
+               $comments_match = (
                           isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
                        && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
                        && (
                                // The comment author length max is 255 characters, limited by the TINYTEXT column type.
                           isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
                        && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
                        && (
                                // The comment author length max is 255 characters, limited by the TINYTEXT column type.
-                               substr( $comment1['comment_author'], 0, 255 ) == substr( $comment2['comment_author'], 0, 255 )
-                               || substr( stripslashes( $comment1['comment_author'] ), 0, 255 ) == substr( $comment2['comment_author'], 0, 255 )
-                               || substr( $comment1['comment_author'], 0, 255 ) == substr( stripslashes( $comment2['comment_author'] ), 0, 255 )
+                               // If the comment author includes multibyte characters right around the 255-byte mark, they
+                               // may be stripped when the author is saved in the DB, so a 300+ char author may turn into
+                               // a 253-char author when it's saved, not 255 exactly.  The longest possible character is
+                               // theoretically 6 bytes, so we'll only look at the first 248 bytes to be safe.
+                               substr( $comment1['comment_author'], 0, 248 ) == substr( $comment2['comment_author'], 0, 248 )
+                               || substr( stripslashes( $comment1['comment_author'] ), 0, 248 ) == substr( $comment2['comment_author'], 0, 248 )
+                               || substr( $comment1['comment_author'], 0, 248 ) == substr( stripslashes( $comment2['comment_author'] ), 0, 248 )
+                               // Certain long comment author names will be truncated to nothing, depending on their encoding.
+                               || ( ! $comment1['comment_author'] && strlen( $comment2['comment_author'] ) > 248 )
+                               || ( ! $comment2['comment_author'] && strlen( $comment1['comment_author'] ) > 248 )
                                )
                        && (
                                // The email max length is 100 characters, limited by the VARCHAR(100) column type.
                                )
                        && (
                                // The email max length is 100 characters, limited by the VARCHAR(100) column type.
-                               substr( $comment1['comment_author_email'], 0, 100 ) == substr( $comment2['comment_author_email'], 0, 100 )
-                               || substr( stripslashes( $comment1['comment_author_email'] ), 0, 100 ) == substr( $comment2['comment_author_email'], 0, 100 )
-                               || substr( $comment1['comment_author_email'], 0, 100 ) == substr( stripslashes( $comment2['comment_author_email'] ), 0, 100 )
+                               // Same argument as above for only looking at the first 93 characters.
+                               substr( $comment1['comment_author_email'], 0, 93 ) == substr( $comment2['comment_author_email'], 0, 93 )
+                               || substr( stripslashes( $comment1['comment_author_email'] ), 0, 93 ) == substr( $comment2['comment_author_email'], 0, 93 )
+                               || substr( $comment1['comment_author_email'], 0, 93 ) == substr( stripslashes( $comment2['comment_author_email'] ), 0, 93 )
                                // Very long emails can be truncated and then stripped if the [0:100] substring isn't a valid address.
                                || ( ! $comment1['comment_author_email'] && strlen( $comment2['comment_author_email'] ) > 100 )
                                || ( ! $comment2['comment_author_email'] && strlen( $comment1['comment_author_email'] ) > 100 )
                        )
                );
                                // Very long emails can be truncated and then stripped if the [0:100] substring isn't a valid address.
                                || ( ! $comment1['comment_author_email'] && strlen( $comment2['comment_author_email'] ) > 100 )
                                || ( ! $comment2['comment_author_email'] && strlen( $comment1['comment_author_email'] ) > 100 )
                        )
                );
+
+               return $comments_match;
        }
        
        // Does the supplied comment match the details of the one most recently stored in self::$last_comment?
        }
        
        // Does the supplied comment match the details of the one most recently stored in self::$last_comment?
@@ -956,7 +1009,7 @@ class Akismet {
        public static function load_form_js() {
                // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
                // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
        public static function load_form_js() {
                // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
                // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
-               wp_register_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array(), AKISMET_VERSION, true );
+               wp_register_script( 'akismet-form', plugin_dir_url( __FILE__ ) . '_inc/form.js', array(), AKISMET_VERSION, true );
                add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
                add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
        }
                add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
                add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
        }
@@ -1153,4 +1206,4 @@ p {
 
                return $meta_value;
        }
 
                return $meta_value;
        }
-}
\ No newline at end of file
+}