Changeset 1879

Timestamp:

02/16/2011 10:27:00 AM (15 months ago)

Author:

Xiping.Wang

Message:

[trunk] upgrade wordpress plugin akismet to 2.5.3

Location:

trunk/blogs/wp-content/plugins/akismet

Files:

• admin.php (modified) (34 diffs)
• akismet.css (added)
• akismet.js (added)
• akismet.php (modified) (12 diffs)
• readme.txt (modified) (3 diffs)
• widget.php (added)

trunk/blogs/wp-content/plugins/akismet/admin.php

@@ -8 +8 @@
     
     // all admin functions are disabled in old versions
-    if ( version_compare( $wp_version, '3.0', '<' ) ) {
+    if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) {
         
         function akismet_version_warning() {
             echo "
-            <div id='akismet-warning' class='updated fade'><p><strong>".sprintf(__('Akismet %s required WordPress 3.0 or higher.'), AKISMET_VERSION) ."</strong> ".sprintf(__('Please <a href="%s">upgrade WordPress</a> to a current version, or <a href="%s">downgrade to version 2.4 of the Akismet plugin</a>.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "</p></div>
+            <div id='akismet-warning' class='updated fade'><p><strong>".sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) ."</strong> ".sprintf(__('Please <a href="%s">upgrade WordPress</a> to a current version, or <a href="%s">downgrade to version 2.4 of the Akismet plugin</a>.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "</p></div>
             ";
         }
@@ -25 +25 @@
         $hook = 'dashboard_page_akismet-stats-display';
     add_action('admin_head-'.$hook, 'akismet_stats_script');
-    add_meta_box('akismet-status', __('Akismet Status'), 'akismet_comment_status_meta_box', 'comment', 'normal');
+    add_meta_box('akismet-status', __('Comment History'), 'akismet_comment_status_meta_box', 'comment', 'normal');
+        wp_register_style('akismet.css', AKISMET_PLUGIN_URL . 'akismet.css');
+        wp_enqueue_style('akismet.css');
+        wp_register_script('akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'));
+        wp_enqueue_script('akismet.js');
 }
 add_action('admin_init', 'akismet_admin_init');
@@ -35 +39 @@
         if ( function_exists('add_submenu_page') )
                 add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
-
-}
+}
+
+function akismet_plugin_action_links( $links, $file ) {
+        if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
+                $links[] = '<a href="plugins.php?page=akismet-key-config">'.__('Settings').'</a>';
+        }
+
+        return $links;
+}
+
+add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 );
 
 function akismet_conf() {
@@ -47 +60 @@
                 check_admin_referer( $akismet_nonce );
                 $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+                $home_url = parse_url( get_bloginfo('url') );
 
                 if ( empty($key) ) {
@@ -52 +66 @@
                         $ms[] = 'new_key_empty';
                         delete_option('wordpress_api_key');
+                } elseif ( empty($home_url['host']) ) {
+                        $key_status = 'empty';
+                        $ms[] = 'bad_home_url';
                 } else {
                         $key_status = akismet_verify_key( $key );
@@ -69 +86 @@
                 else
                         update_option( 'akismet_discard_month', 'false' );
+
+                if ( isset( $_POST['akismet_show_user_comments_approved'] ) )
+                        update_option( 'akismet_show_user_comments_approved', 'true' );
+                else
+                        update_option( 'akismet_show_user_comments_approved', 'false' );
+
         } elseif ( isset($_POST['check']) ) {
                 akismet_get_server_connectivity(0);
@@ -98 +121 @@
         $messages = array(
                 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
-                'new_key_valid' => array('color' => '2d2', 'text' => __('Your key has been verified. Happy blogging!')),
-                'new_key_invalid' => array('color' => 'd22', 'text' => __('The key you entered is invalid. Please double-check it.')),
-                'new_key_failed' => array('color' => 'd22', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
-                'no_connection' => array('color' => 'd22', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
+                'new_key_valid' => array('color' => '4AB915', 'text' => __('Your key has been verified. Happy blogging!')),
+                'new_key_invalid' => array('color' => '888', 'text' => __('The key you entered is invalid. Please double-check it.')),
+                'new_key_failed' => array('color' => '888', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
+                'no_connection' => array('color' => '888', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
                 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (<a href="%s" style="color:#fff">Get your key.</a>)'), 'http://akismet.com/get/')),
-                'key_valid' => array('color' => '2d2', 'text' => __('This key is valid.')),
-                'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')));
+                'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')),
+                'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')),
+                'bad_home_url' => array('color' => '888', 'text' => sprintf( __('Your WordPress home URL %s is invalid.  Please fix the <a href="%s">home option</a>.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ),
+        );
 ?>
 <?php if ( !empty($_POST['submit'] ) ) : ?>
@@ -111 +136 @@
 <div class="wrap">
 <h2><?php _e('Akismet Configuration'); ?></h2>
+<?php if (isset($_GET['message']) && $_GET['message'] == 'success') { ?>
+        <div class="updated below-h2" id="message"><p><?php _e( '<strong>Sign up success!</strong> Please check your email for your Akismet API Key and enter it below.' ); ?></p></div>
+<?php } ?>
 <div class="narrow">
 <form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
@@ -127 +155 @@
 <?php } ?>
 <?php akismet_nonce_field($akismet_nonce) ?>
-<p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
+<p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Auto-delete spam submitted on posts more than a month old.'); ?></label></p>
+<p><label><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="true" type="checkbox" <?php if ( get_option('akismet_show_user_comments_approved') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Show the number of comments you\'ve approved beside each comment author.'); ?></label></p>
         <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options &raquo;'); ?>" /></p>
 </form>
@@ -137 +166 @@
         if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) {
                 ?>
-                        <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
+                        <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
                         <p><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions.  <strong>Akismet cannot work correctly until this is fixed.</strong>  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
                 <?php
@@ -151 +180 @@
                         // all connections fail
                         } elseif ( $fail_count > 0 ) { ?>
-                                <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
+                                <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
                                 <p><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com.  <strong>Akismet cannot work correctly until this is fixed.</strong>  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
                         <?php
                         // all connections work
                         } else { ?>
-                                <p style="padding: .5em; background-color: #2d2; color: #fff; font-weight:bold;"><?php  _e('All Akismet servers are available.'); ?></p>
+                                <p style="padding: .5em; background-color: #4AB915; color: #fff; font-weight:bold;"><?php  _e('All Akismet servers are available.'); ?></p>
                                 <p><?php _e('Akismet is working correctly.  All servers are accessible.'); ?></p>
                         <?php
@@ -162 +191 @@
                 } else {
                         ?>
-                                <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
+                                <p style="padding: .5em; background-color: #888; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
                                 <p><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com.  <strong>Akismet cannot work correctly until this is fixed.</strong>  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
                         <?php
@@ -176 +205 @@
                 asort($servers);
                 foreach ( $servers as $ip => $status ) {
-                        $color = ( $status ? '#2d2' : '#d22');
+                        $color = ( $status ? '#4AB915' : '#888');
         ?>
                 <tr>
                 <td><?php echo htmlspecialchars($ip); ?></td>
-                <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('No problems') : __('Obstructed') ); ?></td>
+                <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('Accessible') : __('Re-trying') ); ?></td>
                 
         <?php
@@ -190 +219 @@
         <p><?php if ( get_option('akismet_connectivity_time') ) echo sprintf( __('Last checked %s ago.'), human_time_diff( get_option('akismet_connectivity_time') ) ); ?></p>
         <p class="submit"><input type="submit" name="check" value="<?php _e('Check network status &raquo;'); ?>" /></p>
+        <p><?php printf( __('<a href="%s" target="_blank">Click here</a> to confirm that <a href="%s" target="_blank">Akismet.com is up</a>.'), 'http://status.automattic.com/9931/136079/Akismet-API', 'http://status.automattic.com/9931/136079/Akismet-API' ); ?></p>
 </form>
 
@@ -207 +237 @@
 <script type="text/javascript">
 function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= document.getElementById('akismet-stats-frame').offsetTop;
-    height += 100; // magic padding
-    
-    document.getElementById('akismet-stats-frame').style.height = height +"px";
+  
+    document.getElementById('akismet-stats-frame').style.height = "2500px";
     
 };
@@ -225 +252 @@
 function akismet_stats_display() {
         global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
-        $blog = urlencode( get_option('home') );
+        $blog = urlencode( get_bloginfo('url') );
 
         $url = 'http://';
@@ -246 +273 @@
                 return;
         $path = plugin_basename(__FILE__);
-        echo '<h3>'.__('Spam').'</h3>';
+        echo '<h3>' . _x( 'Spam', 'comments' ) . '</h3>';
         global $submenu;
         if ( isset( $submenu['edit-comments.php'] ) )
@@ -252 +279 @@
         else
                 $link = 'edit.php';
-        echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
+        echo '<p>'.sprintf( _n( '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', $count ), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
 }
 add_action('activity_box_end', 'akismet_stats');
@@ -266 +293 @@
                 add_action('admin_notices', 'akismet_warning');
                 return;
-        } elseif ( get_option('akismet_connectivity_time') && empty($_POST) && is_admin() && !akismet_server_connectivity_ok() ) {
+        } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) &&  wp_next_scheduled('akismet_schedule_cron_recheck') ) {
                 function akismet_warning() {
-                        echo "
-                        <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(__('A server or network problem is preventing Akismet from working correctly.  <a href="%1$s">Click here for more information</a> about how to fix the problem.'), "plugins.php?page=akismet-key-config")."</p></div>
+                        global $wpdb;
+                                $waiting = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ) );
+                                $next_check = human_time_diff( wp_next_scheduled('akismet_schedule_cron_recheck') );
+                                if ( $waiting > 0 )
+                                        echo "
+                        <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(_n('A server or network problem prevented Akismet from checking %d comment. It has been temporarily held for moderation and will be automatically re-checked in %s.', 'A server or network problem prevented Akismet from checking %d comments. They have been temporarily held for moderation and will be automatically re-checked in %s.', $waiting), number_format_i18n( $waiting ), $next_check)."</p></div>
                         ";
                 }
@@ -280 +311 @@
 
 function akismet_comment_row_action( $a, $comment ) {
-        
-        
+
+        // failsafe for old WP versions
+        if ( !function_exists('add_comment_meta') )
+                return $a;
+
         $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
         $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
+        $comment_status = wp_get_comment_status( $comment->comment_ID );
         $desc = null;
         if ( !$user_result || $user_result == $akismet_result ) {
                 // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
-                if ( $akismet_result == 'true' )
-                        $desc = 'Flagged as spam by Akismet';
-                elseif ( $akismet_result == 'false' )
-                        $desc = 'Cleared by Akismet';
+                if ( $akismet_result == 'true' && $comment_status != 'spam' && $comment_status != 'trash' )
+                        $desc = __( 'Flagged as spam by Akismet' );
+                elseif ( $akismet_result == 'false' && $comment_status == 'spam' )
+                        $desc = __( 'Cleared by Akismet' );
         } else {
                 $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
@@ -298 +333 @@
                         $desc = sprintf( __('Un-spammed by %s'), $who );
         }
-        
+
+        // add a History item to the hover links, just after Edit
+        if ( $akismet_result ) {
+                $b = array();
+                foreach ( $a as $k => $item ) {
+                        $b[ $k ] = $item;
+                        if ( $k == 'edit' )
+                                $b['history'] = '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="'. esc_attr__( 'View comment history' ) . '"> '. __('History') . '</a>';
+                }
+                
+                $a = $b;
+        }
+                
         if ( $desc )
-                echo '<span style="background: #EEE; border: 1px solid #E4E4E4; margin-top: 3px; color: #999; padding: 1px 8px 2px 8px; -moz-border-radius:6px; border-radius:6px; -webkit-border-radius:6px; float: right; line-height: 1.2em;"><a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' ) . '">'.htmlspecialchars($desc).'</a></span>';
+                echo '<span class="akismet-status" commentid="'.$comment->comment_ID.'"><a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' ) . '">'.htmlspecialchars($desc).'</a></span>';
+                
+        if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) {
+                $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
+                $comment_count = intval( $comment_count );
+                echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'.sprintf( _n( '%s approved', '%s approved', $comment_count ), number_format_i18n( $comment_count ) ) . '</span></span>';
+        }
         
         return $a;
@@ -306 +359 @@
 
 add_filter( 'comment_row_actions', 'akismet_comment_row_action', 10, 2 );
-
 
 function akismet_comment_status_meta_box($comment) {
@@ -355 +407 @@
 // END FIXME
 
+// call out URLS in comments
+function akismet_text_add_link_callback( $m ) {
+        
+                // bare link?
+        if ( $m[4] == $m[2] )
+                return '<a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a>';
+        else
+                return '<span title="'.$m[2].'" class="comment-link"><a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a></span>';
+}
+
+function akismet_text_add_link_class( $comment_text ) {
+
+        return preg_replace_callback( '#<a ([^>]*)href="([^"]+)"([^>]*)>(.*?)</a>#i', 'akismet_text_add_link_callback', $comment_text );
+}
+
+add_filter('comment_text', 'akismet_text_add_link_class');
+
+
 // WP 2.5+
 function akismet_rightnow() {
         global $submenu, $wp_db_version;
-
-        $plural_func = '__ngettext';
-        if ( function_exists( '_n' ) )
-                $plural_func = '_n';
 
         // clean_url was deprecated in WP 3.0
@@ -376 +442 @@
 
         if ( $count = get_option('akismet_spam_count') ) {
-                $intro = sprintf( $plural_func(
-                        '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already,',
-                        '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already,',
+                $intro = sprintf( _n(
+                        '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already. ',
+                        '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already. ',
                         $count
                 ), 'http://akismet.com/', number_format_i18n( $count ) );
         } else {
-                $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog,'), 'http://akismet.com/' );
+                $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog. '), 'http://akismet.com/' );
         }
 
         if ( $queue_count = akismet_spam_count() ) {
-                $queue_text = sprintf( $plural_func(
-                        'and there\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
-                        'and there are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
+                $queue_text = sprintf( _n(
+                        'There\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
+                        'There are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
                         $queue_count
                 ), number_format_i18n( $queue_count ), $esc_url($link) );
         } else {
-                $queue_text = sprintf( __( " but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
-        }
-
-        // _c was deprecated in WP 2.9.0
-        if ( function_exists( '_x' ) )
-                $text = sprintf( _x( '%1$s%2$s', 'akismet_rightnow' ), $intro, $queue_text );
-        else 
-                $text = sprintf( _c( '%1$s%2$s|akismet_rightnow' ), $intro, $queue_text );
-
+                $queue_text = sprintf( __( "There's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
+        }
+
+        $text = $intro . '<br />' . $queue_text;
         echo "<p class='akismet-right-now'>$text</p>\n";
 }
@@ -426 +487 @@
         if ( !$comment ) // it was deleted
                 return;
-        $comment->blog = get_option('home');
+                
+        // use the original version stored in comment_meta if available 
+        $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+        if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
+                $comment = (object) array_merge( (array)$comment, $as_submitted );
+        }
+        
+        $comment->blog = get_bloginfo('url');
         $comment->blog_lang = get_locale();
         $comment->blog_charset = get_option('blog_charset');
         $comment->permalink = get_permalink($comment->comment_post_ID);
+        $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
         if ( is_object($current_user) ) {
             $comment->reporter = $current_user->user_login;
@@ -441 +510 @@
                 $comment->user_role = akismet_get_user_roles($comment->user_ID);
 
+        if ( akismet_test_mode() )
+                $comment->is_test = 'true';
+
         $query_string = '';
         foreach ( $comment as $key => $data )
@@ -447 +519 @@
         $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
         if ( $comment->reporter ) {
-                akismet_update_comment_history( $comment_id, sprintf( __('%s un-spammed this comment'), $comment->reporter ), 'report-ham' );
+                akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam'), $comment->reporter ), 'report-ham' );
                 update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
                 update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
-        } else {
-                akismet_update_comment_history( $comment_id, 'A plugin un-spammed this comment', 'report-ham' );
         }
         
@@ -466 +536 @@
         if ( 'spam' != $comment->comment_approved )
                 return;
-        $comment->blog = get_option('home');
+        
+        // use the original version stored in comment_meta if available 
+        $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+        if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
+                $comment = (object) array_merge( (array)$comment, $as_submitted );
+        }
+        
+        $comment->blog = get_bloginfo('url');
         $comment->blog_lang = get_locale();
         $comment->blog_charset = get_option('blog_charset');
         $comment->permalink = get_permalink($comment->comment_post_ID);
+        $comment->reporter_ip = $_SERVER['REMOTE_ADDR'];
         if ( is_object($current_user) ) {
             $comment->reporter = $current_user->user_login;
@@ -478 +556 @@
 
         $comment->user_role = '';
-        if ( !isset( $comment->user_id ) )
+        if ( isset( $comment->user_ID ) )
                 $comment->user_role = akismet_get_user_roles($comment->user_ID);
+
+        if ( akismet_test_mode() )
+                $comment->is_test = 'true';
 
         $query_string = '';
@@ -487 +568 @@
         $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
         if ( $comment->reporter ) {
-                akismet_update_comment_history( $comment_id, sprintf( __('%s spammed this comment'), $comment->reporter ), 'report-spam' );
+                akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam'), $comment->reporter ), 'report-spam' );
                 update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
                 update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
-        } else
-                akismet_update_comment_history( $comment_id, 'A plugin spammed this comment', 'report-ham' );
+        }
         do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
 }
@@ -499 +579 @@
         if ( $new_status == $old_status )
                 return;
-                
-        if ( $new_status == 'spam' ) {
-                akismet_submit_spam_comment( $comment->comment_ID );
-        } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
-                akismet_submit_nonspam_comment( $comment->comment_ID );
-        }
+
+        # we don't need to record a history item for deleted comments
+        if ( $new_status == 'delete' )
+                return;
+                
+        if ( !is_admin() )
+                return;
+                
+        if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+                return;
+
+        if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+                return;
+                
+        global $current_user;
+        $reporter = '';
+        if ( is_object( $current_user ) )
+                $reporter = $current_user->user_login;
+        
+        // Assumption alert:
+        // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
+        // is changed automatically by another plugin.  Unfortunately WordPress doesn't provide an unambiguous way to
+        // determine why the transition_comment_status action was triggered.  And there are several different ways by which
+        // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
+        // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
+        if ( isset($_POST['action']) || isset($_GET['action']) ) {
+                if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
+                                return akismet_submit_spam_comment( $comment->comment_ID );
+                } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+                                return akismet_submit_nonspam_comment( $comment->comment_ID );
+                }
+        }
+        
+        if ( !get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+                akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
 }
 
@@ -547 +656 @@
                 $c['user_agent'] = $c['comment_agent'];
                 $c['referrer']   = '';
-                $c['blog']       = get_option('home');
+                $c['blog']       = get_bloginfo('url');
                 $c['blog_lang']  = get_locale();
                 $c['blog_charset'] = get_option('blog_charset');
@@ -555 +664 @@
                 if ( isset( $c['user_ID'] ) )
                         $c['user_role']  = akismet_get_user_roles($c['user_ID']);
+
+                if ( akismet_test_mode() )
+                        $c['is_test'] = 'true';
 
                 $id = (int) $c['comment_ID'];
@@ -583 +695 @@
 
 add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
+
+// Check connectivity between the WordPress blog and Akismet's servers.
+// Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
+function akismet_check_server_connectivity() {
+        global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
+        
+        $test_host = 'rest.akismet.com';
+        
+        // Some web hosts may disable one or both functions
+        if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
+                return array();
+        
+        $ips = gethostbynamel($test_host);
+        if ( !$ips || !is_array($ips) || !count($ips) )
+                return array();
+                
+        $servers = array();
+        foreach ( $ips as $ip ) {
+                $response = akismet_verify_key( akismet_get_key(), $ip );
+                // even if the key is invalid, at least we know we have connectivity
+                if ( $response == 'valid' || $response == 'invalid' )
+                        $servers[$ip] = true;
+                else
+                        $servers[$ip] = false;
+        }
+
+        return $servers;
+}
+
+// Check the server connectivity and store the results in an option.
+// Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
+// Returns the same associative array as akismet_check_server_connectivity()
+function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
+        $servers = get_option('akismet_available_servers');
+        if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
+                return $servers;
+        
+        // There's a race condition here but the effect is harmless.
+        $servers = akismet_check_server_connectivity();
+        update_option('akismet_available_servers', $servers);
+        update_option('akismet_connectivity_time', time());
+        return $servers;
+}
+
+// Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
+function akismet_server_connectivity_ok() {
+        // skip the check on WPMU because the status page is hidden
+        global $wpcom_api_key;
+        if ( $wpcom_api_key )
+                return true;
+        $servers = akismet_get_server_connectivity();
+        return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
+}
+

trunk/blogs/wp-content/plugins/akismet/akismet.php

@@ -6 +6 @@
 Plugin Name: Akismet
 Plugin URI: http://akismet.com/
-Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need an <a href="http://akismet.com/get/">API key</a> to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <code>&lt;?php akismet_counter(); ?&gt;</code> in your template. See also: <a href="http://wordpress.org/extend/plugins/stats/">WP Stats plugin</a>.
-Version: 2.4.0
+Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your <a href="plugins.php?page=akismet-key-config">Akismet configuration</a> page, and save your API key.
+Version: 2.5.3
 Author: Automattic
 Author URI: http://automattic.com/wordpress-plugins/
-License: GPLv2
+License: GPLv2 or later
 */
 
 /*
-This program is free software; you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-GNU General Public License for more details. 
-
-You should have received a copy of the GNU General Public License 
-along with this program; if not, write to the Free Software 
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-define('AKISMET_VERSION', '2.4.0');
+define('AKISMET_VERSION', '2.5.3');
+define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
 
 /** If you hardcode a WP.com API key here, all key config screens will be hidden */
@@ -42 +44 @@
 }
 
-if ( $wp_db_version <= 9872 )
-        include_once( dirname(__FILE__) . '/legacy.php' );
+if ( isset($wp_db_version) && $wp_db_version <= 9872 )
+        include_once dirname( __FILE__ ) . '/legacy.php';
+
+include_once dirname( __FILE__ ) . '/widget.php';
+
+if ( is_admin() )
+        require_once dirname( __FILE__ ) . '/admin.php';
 
 function akismet_init() {
@@ -54 +61 @@
 
         $akismet_api_port = 80;
-        add_action('admin_menu', 'akismet_config_page');
-        add_action('admin_menu', 'akismet_stats_page');
-        akismet_admin_warnings();
 }
 add_action('init', 'akismet_init');
-
-function akismet_admin_init() {
-        if ( function_exists( 'get_plugin_page_hook' ) )
-                $hook = get_plugin_page_hook( 'akismet-stats-display', 'index.php' );
-        else
-                $hook = 'dashboard_page_akismet-stats-display';
-        add_action('admin_head-'.$hook, 'akismet_stats_script');
-}
-add_action('admin_init', 'akismet_admin_init');
-
-if ( !function_exists('wp_nonce_field') ) {
-        function akismet_nonce_field($action = -1) { return; }
-        $akismet_nonce = -1;
-} else {
-        function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
-        $akismet_nonce = 'akismet-update-key';
-}
-
-if ( !function_exists('number_format_i18n') ) {
-        function number_format_i18n( $number, $decimals = null ) { return number_format( $number, $decimals ); }
-}
-
-function akismet_config_page() {
-        if ( function_exists('add_submenu_page') )
-                add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
-
-}
-
-function akismet_conf() {
-        global $akismet_nonce, $wpcom_api_key;
-
-        if ( isset($_POST['submit']) ) {
-                if ( function_exists('current_user_can') && !current_user_can('manage_options') )
-                        die(__('Cheatin&#8217; uh?'));
-
-                check_admin_referer( $akismet_nonce );
-                $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
-
-                if ( empty($key) ) {
-                        $key_status = 'empty';
-                        $ms[] = 'new_key_empty';
-                        delete_option('wordpress_api_key');
-                } else {
-                        $key_status = akismet_verify_key( $key );
-                }
-
-                if ( $key_status == 'valid' ) {
-                        update_option('wordpress_api_key', $key);
-                        $ms[] = 'new_key_valid';
-                } else if ( $key_status == 'invalid' ) {
-                        $ms[] = 'new_key_invalid';
-                } else if ( $key_status == 'failed' ) {
-                        $ms[] = 'new_key_failed';
-                }
-
-                if ( isset( $_POST['akismet_discard_month'] ) )
-                        update_option( 'akismet_discard_month', 'true' );
-                else
-                        update_option( 'akismet_discard_month', 'false' );
-        } elseif ( isset($_POST['check']) ) {
-                akismet_get_server_connectivity(0);
-        }
-
-        if ( empty( $key_status) ||  $key_status != 'valid' ) {
-                $key = get_option('wordpress_api_key');
-                if ( empty( $key ) ) {
-                        if ( empty( $key_status ) || $key_status != 'failed' ) {
-                                if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
-                                        $ms[] = 'no_connection';
-                                else
-                                        $ms[] = 'key_empty';
-                        }
-                        $key_status = 'empty';
-                } else {
-                        $key_status = akismet_verify_key( $key );
-                }
-                if ( $key_status == 'valid' ) {
-                        $ms[] = 'key_valid';
-                } else if ( $key_status == 'invalid' ) {
-                        delete_option('wordpress_api_key');
-                        $ms[] = 'key_empty';
-                } else if ( !empty($key) && $key_status == 'failed' ) {
-                        $ms[] = 'key_failed';
-                }
-        }
-
-        $messages = array(
-                'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
-                'new_key_valid' => array('color' => '2d2', 'text' => __('Your key has been verified. Happy blogging!')),
-                'new_key_invalid' => array('color' => 'd22', 'text' => __('The key you entered is invalid. Please double-check it.')),
-                'new_key_failed' => array('color' => 'd22', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')),
-                'no_connection' => array('color' => 'd22', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')),
-                'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (<a href="%s" style="color:#fff">Get your key.</a>)'), 'http://akismet.com/get/')),
-                'key_valid' => array('color' => '2d2', 'text' => __('This key is valid.')),
-                'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')));
-?>
-<?php if ( !empty($_POST['submit'] ) ) : ?>
-<div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
-<?php endif; ?>
-<div class="wrap">
-<h2><?php _e('Akismet Configuration'); ?></h2>
-<div class="narrow">
-<form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
-<?php if ( !$wpcom_api_key ) { ?>
-        <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at <a href="%2$s">Akismet.com</a>.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?></p>
-
-<h3><label for="key"><?php _e('Akismet API Key'); ?></label></h3>
-<?php foreach ( $ms as $m ) : ?>
-        <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
-<?php endforeach; ?>
-<p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://akismet.com/get/">What is this?</a>'); ?>)</p>
-<?php if ( isset( $invalid_key) && $invalid_key ) { ?>
-<h3><?php _e('Why might my key be invalid?'); ?></h3>
-<p><?php _e('This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar.'); ?></p>
-<?php } ?>
-<?php } ?>
-<?php akismet_nonce_field($akismet_nonce) ?>
-<p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
-        <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options &raquo;'); ?>" /></p>
-</form>
-
-<form action="" method="post" id="akismet-connectivity" style="margin: auto; width: 400px; ">
-
-<h3><?php _e('Server Connectivity'); ?></h3>
-<?php
-        if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) {
-                ?>
-                        <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Network functions are disabled.'); ?></p>
-                        <p><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions.  <strong>Akismet cannot work correctly until this is fixed.</strong>  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
-                <?php
-        } else {
-                $servers = akismet_get_server_connectivity();
-                $fail_count = count($servers) - count( array_filter($servers) );
-                if ( is_array($servers) && count($servers) > 0 ) {
-                        // some connections work, some fail
-                        if ( $fail_count > 0 && $fail_count < count($servers) ) { ?>
-                                <p style="padding: .5em; background-color: #aa0; color: #fff; font-weight:bold;"><?php _e('Unable to reach some Akismet servers.'); ?></p>
-                                <p><?php echo sprintf( __('A network problem or firewall is blocking some connections from your web server to Akismet.com.  Akismet is working but this may cause problems during times of network congestion.  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
-                        <?php
-                        // all connections fail
-                        } elseif ( $fail_count > 0 ) { ?>
-                                <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to reach any Akismet servers.'); ?></p>
-                                <p><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com.  <strong>Akismet cannot work correctly until this is fixed.</strong>  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
-                        <?php
-                        // all connections work
-                        } else { ?>
-                                <p style="padding: .5em; background-color: #2d2; color: #fff; font-weight:bold;"><?php  _e('All Akismet servers are available.'); ?></p>
-                                <p><?php _e('Akismet is working correctly.  All servers are accessible.'); ?></p>
-                        <?php
-                        }
-                } else {
-                        ?>
-                                <p style="padding: .5em; background-color: #d22; color: #fff; font-weight:bold;"><?php _e('Unable to find Akismet servers.'); ?></p>
-                                <p><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com.  <strong>Akismet cannot work correctly until this is fixed.</strong>  Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
-                        <?php
-                }
-        }
-        
-        if ( !empty($servers) ) {
-?>
-<table style="width: 100%;">
-<thead><th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th></thead>
-<tbody>
-<?php
-                asort($servers);
-                foreach ( $servers as $ip => $status ) {
-                        $color = ( $status ? '#2d2' : '#d22');
-        ?>
-                <tr>
-                <td><?php echo htmlspecialchars($ip); ?></td>
-                <td style="padding: 0 .5em; font-weight:bold; color: #fff; background-color: <?php echo $color; ?>"><?php echo ($status ? __('No problems') : __('Obstructed') ); ?></td>
-                
-        <?php
-                }
-        }
-?>
-</tbody>
-</table>
-        <p><?php if ( get_option('akismet_connectivity_time') ) echo sprintf( __('Last checked %s ago.'), human_time_diff( get_option('akismet_connectivity_time') ) ); ?></p>
-        <p class="submit"><input type="submit" name="check" value="<?php _e('Check network status &raquo;'); ?>" /></p>
-</form>
-
-</div>
-</div>
-<?php
-}
-
-function akismet_stats_page() {
-        if ( function_exists('add_submenu_page') )
-                add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
-
-}
-
-function akismet_stats_script() {
-        ?>
-<script type="text/javascript">
-function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= document.getElementById('akismet-stats-frame').offsetTop;
-    height += 100; // magic padding
-    
-    document.getElementById('akismet-stats-frame').style.height = height +"px";
-    
-};
-function resizeIframeInit() {
-        document.getElementById('akismet-stats-frame').onload = resizeIframe;
-        window.onresize = resizeIframe;
-}
-addLoadEvent(resizeIframeInit);
-</script><?php
-}
-
-
-function akismet_stats_display() {
-        global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
-        $blog = urlencode( get_option('home') );
-        $url = "http://".akismet_get_key().".web.akismet.com/1.0/user-stats.php?blog={$blog}";
-        ?>
-        <div class="wrap">
-        <iframe src="<?php echo $url; ?>" width="100%" height="100%" frameborder="0" id="akismet-stats-frame"></iframe>
-        </div>
-        <?php
-}
-
-function akismet_stats() {
-        if ( !function_exists('did_action') || did_action( 'rightnow_end' ) ) // We already displayed this info in the "Right Now" section
-                return;
-        if ( !$count = get_option('akismet_spam_count') )
-                return;
-        $path = plugin_basename(__FILE__);
-        echo '<h3>'.__('Spam').'</h3>';
-        global $submenu;
-        if ( isset( $submenu['edit-comments.php'] ) )
-                $link = 'edit-comments.php';
-        else
-                $link = 'edit.php';
-        echo '<p>'.sprintf(__('<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.'), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
-}
-add_action('activity_box_end', 'akismet_stats');
 
 function akismet_get_key() {
@@ -317 +82 @@
 }
 
-// Check connectivity between the WordPress blog and Akismet's servers.
-// Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
-function akismet_check_server_connectivity() {
-        global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
-        
-        $test_host = 'rest.akismet.com';
-        
-        // Some web hosts may disable one or both functions
-        if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
-                return array();
-        
-        $ips = gethostbynamel($test_host);
-        if ( !$ips || !is_array($ips) || !count($ips) )
-                return array();
-                
-        $servers = array();
-        foreach ( $ips as $ip ) {
-                $response = akismet_verify_key( akismet_get_key(), $ip );
-                // even if the key is invalid, at least we know we have connectivity
-                if ( $response == 'valid' || $response == 'invalid' )
-                        $servers[$ip] = true;
-                else
-                        $servers[$ip] = false;
-        }
-
-        return $servers;
-}
-
-// Check the server connectivity and store the results in an option.
-// Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
-// Returns the same associative array as akismet_check_server_connectivity()
-function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
-        $servers = get_option('akismet_available_servers');
-        if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
-                return $servers;
-        
-        // There's a race condition here but the effect is harmless.
-        $servers = akismet_check_server_connectivity();
-        update_option('akismet_available_servers', $servers);
-        update_option('akismet_connectivity_time', time());
-        return $servers;
-}
-
-// Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
-function akismet_server_connectivity_ok() {
-        // skip the check on WPMU because the status page is hidden
-        global $wpcom_api_key;
-        if ( $wpcom_api_key )
+// if we're in debug or test modes, use a reduced service level so as not to polute training or stats data
+function akismet_test_mode() {
+        if ( defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE )
                 return true;
-        $servers = akismet_get_server_connectivity();
-        return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
-}
-
-function akismet_admin_warnings() {
-        global $wpcom_api_key;
-        if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
-                function akismet_warning() {
-                        echo "
-                        <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet is almost ready.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your Akismet API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
-                        ";
-                }
-                add_action('admin_notices', 'akismet_warning');
-                return;
-        } elseif ( get_option('akismet_connectivity_time') && empty($_POST) && is_admin() && !akismet_server_connectivity_ok() ) {
-                function akismet_warning() {
-                        echo "
-                        <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(__('A server or network problem is preventing Akismet from working correctly.  <a href="%1$s">Click here for more information</a> about how to fix the problem.'), "plugins.php?page=akismet-key-config")."</p></div>
-                        ";
-                }
-                add_action('admin_notices', 'akismet_warning');
-                return;
-        }
-}
-
-function akismet_get_host($host) {
-        // if all servers are accessible, just return the host name.
-        // if not, return an IP that was known to be accessible at the last check.
-        if ( akismet_server_connectivity_ok() ) {
-                return $host;
-        } else {
-                $ips = akismet_get_server_connectivity();
-                // a firewall may be blocking access to some Akismet IPs
-                if ( count($ips) > 0 && count(array_filter($ips)) < count($ips) ) {
-                        // use DNS to get current IPs, but exclude any known to be unreachable
-                        $dns = (array)gethostbynamel( rtrim($host, '.') . '.' );
-                        $dns = array_filter($dns);
-                        foreach ( $dns as $ip ) {
-                                if ( array_key_exists( $ip, $ips ) && empty( $ips[$ip] ) )
-                                        unset($dns[$ip]);
-                        }
-                        // return a random IP from those available
-                        if ( count($dns) )
-                                return $dns[ array_rand($dns) ];
-                        
-                }
-        }
-        // if all else fails try the host name
-        return $host;
+        return false;
 }
 
@@ -429 +101 @@
                         $roles = join(',', $comment_user->roles);
         }
-        
+
+        if ( is_multisite() && is_super_admin( $user_id ) ) {
+                if ( empty( $roles ) ) {
+                        $roles = 'super_admin';
+                } else {
+                        $comment_user->roles[] = 'super_admin';
+                        $roles = join( ',', $comment_user->roles );
+                }
+        }
+
         return $roles;
 }
@@ -436 +117 @@
 function akismet_http_post($request, $host, $path, $port = 80, $ip=null) {
         global $wp_version;
-        
-        $akismet_version = constant('AKISMET_VERSION');
-
-        $http_request  = "POST $path HTTP/1.0\r\n";
-        $http_request .= "Host: $host\r\n";
-        $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=" . get_option('blog_charset') . "\r\n";
-        $http_request .= "Content-Length: " . strlen($request) . "\r\n";
-        $http_request .= "User-Agent: WordPress/$wp_version | Akismet/$akismet_version\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $request;
-        
+
+        $akismet_ua = "WordPress/{$wp_version} | ";
+        $akismet_ua .= 'Akismet/' . constant( 'AKISMET_VERSION' );
+
+        $content_length = strlen( $request );
+
         $http_host = $host;
-        // use a specific IP if provided - needed by akismet_check_server_connectivity()
-        if ( $ip && long2ip(ip2long($ip)) ) {
+        // use a specific IP if provided
+        // needed by akismet_check_server_connectivity()
+        if ( $ip && long2ip( ip2long( $ip ) ) ) {
                 $http_host = $ip;
         } else {
-                $http_host = akismet_get_host($host);
-        }
-
-        $response = '';
-        if( false != ( $fs = @fsockopen($http_host, $port, $errno, $errstr, 10) ) ) {
-                fwrite($fs, $http_request);
-
-                while ( !feof($fs) )
-                        $response .= fgets($fs, 1160); // One TCP-IP packet
-                fclose($fs);
-                $response = explode("\r\n\r\n", $response, 2);
-        }
-        return $response;
+                $http_host = $host;
+        }
+        
+        // use the WP HTTP class if it is available
+        if ( function_exists( 'wp_remote_post' ) ) {
+                $http_args = array(
+                        'body'                  => $request,
+                        'headers'               => array(
+                                'Content-Type'  => 'application/x-www-form-urlencoded; ' .
+                                                                        'charset=' . get_option( 'blog_charset' ),
+                                'Host'                  => $host,
+                                'User-Agent'    => $akismet_ua
+                        ),
+                        'httpversion'   => '1.0',
+                        'timeout'               => 15
+                );
+                $akismet_url = "http://{$http_host}{$path}";
+                $response = wp_remote_post( $akismet_url, $http_args );
+                if ( is_wp_error( $response ) )
+                        return '';
+
+                return array( $response['headers'], $response['body'] );
+        } else {
+                $http_request  = "POST $path HTTP/1.0\r\n";
+                $http_request .= "Host: $host\r\n";
+                $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . get_option('blog_charset') . "\r\n";
+                $http_request .= "Content-Length: {$content_length}\r\n";
+                $http_request .= "User-Agent: {$akismet_ua}\r\n";
+                $http_request .= "\r\n";
+                $http_request .= $request;
+                
+                $response = '';
+                if( false != ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
+                        fwrite( $fs, $http_request );
+
+                        while ( !feof( $fs ) )
+                                $response .= fgets( $fs, 1160 ); // One TCP-IP packet
+                        fclose( $fs );
+                        $response = explode( "\r\n\r\n", $response, 2 );
+                }
+                return $response;
+        }
 }
 
@@ -472 +178 @@
         if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
                 update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+        // this is a one-shot deal
+        remove_filter( 'pre_comment_approved', 'akismet_result_spam' );
         return 'spam';
 }
 
+function akismet_result_hold( $approved ) {
+        // once only
+        remove_filter( 'pre_comment_approved', 'akismet_result_hold' );
+        return '0';
+}
+
+// how many approved comments does this author have?
+function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
+        global $wpdb;
+        
+        if ( !empty($user_id) )
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE user_id = %d AND comment_approved = 1", $user_id ) );
+                
+        if ( !empty($comment_author_email) )
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_author_email = %s AND comment_author = %s AND comment_author_url = %s AND comment_approved = 1", $comment_author_email, $comment_author, $comment_author_url ) );
+                
+        return 0;
+}
+
+function akismet_microtime() {
+        $mtime = explode( ' ', microtime() );
+        return $mtime[1] + $mtime[0];
+}
+
+// log an event for a given comment, storing it in comment_meta
+function akismet_update_comment_history( $comment_id, $message, $event=null ) {
+        global $current_user;
+
+        // failsafe for old WP versions
+        if ( !function_exists('add_comment_meta') )
+                return false;
+        
+        $user = '';
+        if ( is_object($current_user) && isset($current_user->user_login) )
+                $user = $current_user->user_login;
+
+        $event = array(
+                'time' => akismet_microtime(),
+                'message' => $message,
+                'event' => $event,
+                'user' => $user,
+        );
+
+        // $unique = false so as to allow multiple values per comment
+        $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
+}
+
+// get the full comment history for a given comment, as an array in reverse chronological order
+function akismet_get_comment_history( $comment_id ) {
+        
+        // failsafe for old WP versions
+        if ( !function_exists('add_comment_meta') )
+                return false;
+
+        $history = get_comment_meta( $comment_id, 'akismet_history', false );
+        usort( $history, 'akismet_cmp_time' );
+        return $history;
+}
+
+function akismet_cmp_time( $a, $b ) {
+        return $a['time'] > $b['time'] ? -1 : 1;
+}
+
+// this fires on wp_insert_comment.  we can't update comment_meta when akismet_auto_check_comment() runs
+// because we don't know the comment ID at that point.
+function akismet_auto_check_update_meta( $id, $comment ) {
+        global $akismet_last_comment;
+
+        // failsafe for old WP versions
+        if ( !function_exists('add_comment_meta') )
+                return false;
+
+        // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
+        // as was checked by akismet_auto_check_comment
+        if ( is_object($comment) && !empty($akismet_last_comment) && is_array($akismet_last_comment) ) {
+                if ( intval($akismet_last_comment['comment_post_ID']) == intval($comment->comment_post_ID)
+                        && $akismet_last_comment['comment_author'] == $comment->comment_author
+                        && $akismet_last_comment['comment_author_email'] == $comment->comment_author_email ) {
+                                // normal result: true or false
+                                if ( $akismet_last_comment['akismet_result'] == 'true' ) {
+                                        update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
+                                        akismet_update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam'), 'check-spam' );
+                                        if ( $comment->comment_approved != 'spam' )
+                                                akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
+                                } elseif ( $akismet_last_comment['akismet_result'] == 'false' ) {
+                                        update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
+                                        akismet_update_comment_history( $comment->comment_ID, __('Akismet cleared this comment'), 'check-ham' );
+                                        if ( $comment->comment_approved == 'spam' ) {
+                                                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) )
+                                                        akismet_update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check'), 'wp-blacklisted' );
+                                                else
+                                                        akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
+                                        }
+                                // abnormal result: error
+                                } else {
+                                        update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
+                                        akismet_update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.'), $akismet_last_comment['akismet_result']), 'check-error' );
+                                }
+                                
+                                // record the complete original data as submitted for checking
+                                if ( isset($akismet_last_comment['comment_as_submitted']) )
+                                        update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', $akismet_last_comment['comment_as_submitted'] );
+                }
+        }
+}
+
+add_action( 'wp_insert_comment', 'akismet_auto_check_update_meta', 10, 2 );
+
+
 function akismet_auto_check_comment( $commentdata ) {
-        global $akismet_api_host, $akismet_api_port;
+        global $akismet_api_host, $akismet_api_port, $akismet_last_comment;
 
         $comment = $commentdata;
@@ -489 +306 @@
         $comment['user_role'] = akismet_get_user_roles($comment['user_ID']);
 
+        $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+        $comment['akismet_comment_nonce'] = 'inactive';
+        if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
+                $comment['akismet_comment_nonce'] = 'failed';
+                if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
+                        $comment['akismet_comment_nonce'] = 'passed';
+
+                // comment reply in wp-admin
+                if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
+                        $comment['akismet_comment_nonce'] = 'passed';
+
+        }
+
+        if ( akismet_test_mode() )
+                $comment['is_test'] = 'true';
+                
+        foreach ($_POST as $key => $value ) {
+                if ( is_string($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"] = '';
+        }
 
         $query_string = '';
         foreach ( $comment as $key => $data )
                 $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+                
+        $commentdata['comment_as_submitted'] = $comment;
 
         $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
@@ -518 +359 @@
                         if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
                                 update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
-                        die;
-                }
+                        wp_redirect( $_SERVER['HTTP_REFERER'] );
+                        die();
+                }
+        }
+        
+        // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
+        if ( 'true' != $response[1] && 'false' != $response[1] ) {
+                add_filter('pre_comment_approved', 'akismet_result_hold');
+                wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
         }
         
@@ -530 +378 @@
                 akismet_delete_old();
         }
+        $akismet_last_comment = $commentdata;
         return $commentdata;
 }
+
+add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
 
 function akismet_delete_old() {
@@ -539 +390 @@
         if ( empty( $comment_ids ) )
                 return;
+                
+        $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
 
         do_action( 'delete_comment', $comment_ids );
-        $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
+        $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( $comma_comment_ids )");
+        $wpdb->query("DELETE FROM $wpdb->commentmeta WHERE comment_id IN ( $comma_comment_ids )");
+        clean_comment_cache( $comment_ids );
         $n = mt_rand(1, 5000);
         if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number
@@ -550 +405 @@
 add_action('akismet_scheduled_delete', 'akismet_delete_old');
 
-function akismet_submit_nonspam_comment ( $comment_id ) {
-        global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
-        $comment_id = (int) $comment_id;
-
-        $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
-        if ( !$comment ) // it was deleted
-                return;
-        $comment->blog = get_option('home');
-        $comment->blog_lang = get_locale();
-        $comment->blog_charset = get_option('blog_charset');
-        $comment->permalink = get_permalink($comment->comment_post_ID);
-        if ( is_object($current_user) ) {
-            $comment->reporter = $current_user->user_login;
-        }
-        if ( is_object($current_site) ) {
-                $comment->site_domain = $current_site->domain;
-        }
-
-        $comment->user_role = '';
-        if ( isset( $comment->user_ID ) )
-                $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
-        $query_string = '';
-        foreach ( $comment as $key => $data )
-                $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
-        $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
-        do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
-}
-
-function akismet_submit_spam_comment ( $comment_id ) {
-        global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
-        $comment_id = (int) $comment_id;
-
-        $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
-        if ( !$comment ) // it was deleted
-                return;
-        if ( 'spam' != $comment->comment_approved )
-                return;
-        $comment->blog = get_option('home');
-        $comment->blog_lang = get_locale();
-        $comment->blog_charset = get_option('blog_charset');
-        $comment->permalink = get_permalink($comment->comment_post_ID);
-        if ( is_object($current_user) ) {
-            $comment->reporter = $current_user->user_login;
-        }
-        if ( is_object($current_site) ) {
-                $comment->site_domain = $current_site->domain;
-        }
-
-        $comment->user_role = '';
-        if ( !isset( $comment->user_id ) )
-                $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
-        $query_string = '';
-        foreach ( $comment as $key => $data )
-                $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
-        $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
-        do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
-}
-
-add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
-
-// For old versions of WP only
-function akismet_set_comment_status( $comment_id, $status ) {
-        if ( $status == 'spam' ) {
-                akismet_submit_spam_comment( $comment_id );
-        } elseif ( $status == 'approve' ) {
-                akismet_submit_nonspam_comment( $comment_id );
-        }
-}
-
-// For WP 2.7+
-function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
-        if ( $new_status == $old_status )
-                return;
-
-        if ( $new_status == 'spam' ) {
-                akismet_submit_spam_comment( $comment->comment_ID );
-        } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
-                akismet_submit_nonspam_comment( $comment->comment_ID );
-        }
-}
-
-function akismet_spamtoham( $comment ) { akismet_submit_nonspam_comment( $comment->comment_ID ); }
-
-if ( function_exists( 'wp_transition_comment_status' ) ) {
-        add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
-} else {
-        add_action('wp_set_comment_status', 'akismet_set_comment_status', 10, 2);
-        add_action('edit_comment', 'akismet_submit_spam_comment');
-        add_filter( 'comment_spam_to_approved', 'akismet_spamtoham' );
-        add_filter( 'comment_spam_to_unapproved', 'akismet_spamtoham' );
-}
-// Total spam in queue
-// get_option( 'akismet_spam_count' ) is the total caught ever
-function akismet_spam_count( $type = false ) {
+function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
+    global $wpdb, $akismet_api_host, $akismet_api_port;
+
+    $id = (int) $id;
+    $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
+    if ( !$c )
+        return;
+
+    $c['user_ip']    = $c['comment_author_IP'];
+    $c['user_agent'] = $c['comment_agent'];
+    $c['referrer']   = '';
+    $c['blog']       = get_option('home');
+    $c['blog_lang']  = get_locale();
+    $c['blog_charset'] = get_option('blog_charset');
+    $c['permalink']  = get_permalink($c['comment_post_ID']);
+    $id = $c['comment_ID'];
+        if ( akismet_test_mode() )
+                $c['is_test'] = 'true';
+        $c['recheck_reason'] = $recheck_reason;
+
+    $query_string = '';
+    foreach ( $c as $key => $data )
+    $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
+
+    $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
+    return $response[1];
+}
+
+function akismet_cron_recheck() {
         global $wpdb;
 
-        if ( !$type ) { // total
-                $count = wp_cache_get( 'akismet_spam_count', 'widget' );
-                if ( false === $count ) {
-                        if ( function_exists('wp_count_comments') ) {
-                                $count = wp_count_comments();
-                                $count = $count->spam;
-                        } else {
-                                $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'");
+        delete_option('akismet_available_servers');
+
+        $comment_errors = $wpdb->get_col( "
+                SELECT comment_id
+                FROM {$wpdb->prefix}commentmeta
+                WHERE meta_key = 'akismet_error'
+                LIMIT 100
+        " );
+        
+        foreach ( (array) $comment_errors as $comment_id ) {
+                // if the comment no longer exists, remove the meta entry from the queue to avoid getting stuck
+                if ( !get_comment( $comment_id ) ) {
+                        delete_comment_meta( $comment_id, 'akismet_error' );
+                        continue;
+                }
+                
+                add_comment_meta( $comment_id, 'akismet_rechecking', true );
+                $status = akismet_check_db_comment( $comment_id, 'retry' );
+
+                $msg = '';
+                if ( $status == 'true' ) {
+                        $msg = __( 'Akismet caught this comment as spam during an automatic retry.' );
+                } elseif ( $status == 'false' ) {
+                        $msg = __( 'Akismet cleared this comment during an automatic retry.' );
+                }
+                
+                // If we got back a legit response then update the comment history
+                // other wise just bail now and try again later.  No point in
+                // re-trying all the comments once we hit one failure.
+                if ( !empty( $msg ) ) {
+                        delete_comment_meta( $comment_id, 'akismet_error' );
+                        akismet_update_comment_history( $comment_id, $msg, 'cron-retry' );
+                        update_comment_meta( $comment_id, 'akismet_result', $status );
+                        // make sure the comment status is still pending.  if it isn't, that means the user has already moved it elsewhere.
+                        $comment = get_comment( $comment_id );
+                        if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
+                                if ( $status == 'true' ) {
+                                        wp_spam_comment( $comment_id );
+                                } elseif ( $status == 'false' ) {
+                                        // comment is good, but it's still in the pending queue.  depending on the moderation settings
+                                        // we may need to change it to approved.
+                                        if ( check_comment($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent, $comment->comment_type) )
+                                                wp_set_comment_status( $comment_id, 1 );
+                                }
                         }
-                        wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
-                }
-                return $count;
-        } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
-                $type = '';
-        } else { // pingback, trackback, ...
-                $type  = $wpdb->escape( $type );
-        }
-
-        return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
-}
-
-
-// WP 2.5+
-function akismet_rightnow() {
-        global $submenu, $wp_db_version;
-
-        // clean_url was deprecated in WP 3.0
-        $esc_url = 'clean_url';
-        if ( function_exists( 'esc_url' ) )
-                $esc_url = 'esc_url';
-
-        if ( 8645 < $wp_db_version  ) // 2.7
-                $link = 'edit-comments.php?comment_status=spam';
-        elseif ( isset( $submenu['edit-comments.php'] ) )
-                $link = 'edit-comments.php?page=akismet-admin';
-        else
-                $link = 'edit.php?page=akismet-admin';
-
-        if ( $count = get_option('akismet_spam_count') ) {
-                $intro = sprintf( __ngettext(
-                        '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already,',
-                        '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already,',
-                        $count
-                ), 'http://akismet.com/', number_format_i18n( $count ) );
-        } else {
-                $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog,'), 'http://akismet.com/' );
-        }
-
-        if ( $queue_count = akismet_spam_count() ) {
-                $queue_text = sprintf( __ngettext(
-                        'and there\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
-                        'and there are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
-                        $queue_count
-                ), number_format_i18n( $queue_count ), clean_url($link) );
-        } else {
-                $queue_text = sprintf( __( "but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
-        }
-
-        // _c was deprecated in WP 2.9.0
-        if ( function_exists( '_x' ) )
-                $text = sprintf( _x( '%1$s %2$s', 'akismet_rightnow' ), $intro, $queue_text );
-        else 
-                $text = sprintf( _c( '%1$s %2$s|akismet_rightnow' ), $intro, $queue_text );
-
-        echo "<p class='akismet-right-now'>$text</p>\n";
-}
-        
-add_action('rightnow_end', 'akismet_rightnow');
-
-
-// For WP >= 2.5
-function akismet_check_for_spam_button($comment_status) {
-        if ( 'approved' == $comment_status )
-                return;
-        if ( function_exists('plugins_url') )
-                $link = 'admin.php?action=akismet_recheck_queue';
-        else
-                $link = 'edit-comments.php?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true';
-        echo "</div><div class='alignleft'><a class='button-secondary checkforspam' href='$link'>" . __('Check for Spam') . "</a>";
-}
-add_action('manage_comments_nav', 'akismet_check_for_spam_button');
-
-function akismet_recheck_queue() {
-        global $wpdb, $akismet_api_host, $akismet_api_port;
-
-        if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
-                return;
-
-        $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
-        foreach ( (array) $moderation as $c ) {
-                $c['user_ip']    = $c['comment_author_IP'];
-                $c['user_agent'] = $c['comment_agent'];
-                $c['referrer']   = '';
-                $c['blog']       = get_option('home');
-                $c['blog_lang']  = get_locale();
-                $c['blog_charset'] = get_option('blog_charset');
-                $c['permalink']  = get_permalink($c['comment_post_ID']);
-
-                $c['user_role'] = '';
-                if ( isset( $c['user_ID'] ) )
-                        $c['user_role']  = akismet_get_user_roles($c['user_ID']);
-
-                $id = (int) $c['comment_ID'];
-
-                $query_string = '';
-                foreach ( $c as $key => $data )
-                $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
-                $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
-                if ( 'true' == $response[1] ) {
-                        if ( function_exists('wp_set_comment_status') )
-                                wp_set_comment_status($id, 'spam');
-                        else
-                                $wpdb->query("UPDATE $wpdb->comments SET comment_approved = 'spam' WHERE comment_ID = $id");
-
-                }
-        }
-        wp_redirect( $_SERVER['HTTP_REFERER'] );
-        exit;
-}
-
-add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
-
-function akismet_check_db_comment( $id ) {
-        global $wpdb, $akismet_api_host, $akismet_api_port;
-
-        $id = (int) $id;
-        $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
-        if ( !$c )
-                return;
-
-        $c['user_ip']    = $c['comment_author_IP'];
-        $c['user_agent'] = $c['comment_agent'];
-        $c['referrer']   = '';
-        $c['blog']       = get_option('home');
-        $c['blog_lang']  = get_locale();
-        $c['blog_charset'] = get_option('blog_charset');
-        $c['permalink']  = get_permalink($c['comment_post_ID']);
-        $id = $c['comment_ID'];
-
-        $query_string = '';
-        foreach ( $c as $key => $data )
-        $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
-        $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
-        return $response[1];
-}
-
-// Widget stuff
-function widget_akismet_register() {
-        if ( function_exists('register_sidebar_widget') ) :
-        function widget_akismet($args) {
-                extract($args);
-                $options = get_option('widget_akismet');
-                $count = number_format_i18n(get_option('akismet_spam_count'));
-                ?>
-                        <?php echo $before_widget; ?>
-                                <?php echo $before_title . $options['title'] . $after_title; ?>
-                                <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><?php printf( __( '%1$s %2$sspam comments%3$s %4$sblocked by%5$s<br />%6$sAkismet%7$s' ), '<span id="akismet1"><span id="akismetcount">' . $count . '</span>', '<span id="akismetsc">', '</span></span>', '<span id="akismet2"><span id="akismetbb">', '</span>', '<span id="akismeta">', '</span></span>' ); ?></a></div></div>
-                        <?php echo $after_widget; ?>
-        <?php
-        }
-
-        function widget_akismet_style() {
-                $plugin_dir = '/wp-content/plugins';
-                if ( defined( 'PLUGINDIR' ) )
-                        $plugin_dir = '/' . PLUGINDIR;
-
-                ?>
-<style type="text/css">
-#aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
-#aka:hover{border:none;text-decoration:none}
-#aka:hover #akismet1{display:none}
-#aka:hover #akismet2,#akismet1{display:block}
-#akismet2{display:none;padding-top:2px}
-#akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
-#akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
-#akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'), $plugin_dir; ?>/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
-</style>
-                <?php
-        }
-
-        function widget_akismet_control() {
-                $options = $newoptions = get_option('widget_akismet');
-                if ( isset( $_POST['akismet-submit'] ) && $_POST["akismet-submit"] ) {
-                        $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
-                        if ( empty($newoptions['title']) ) $newoptions['title'] = __('Spam Blocked');
-                }
-                if ( $options != $newoptions ) {
-                        $options = $newoptions;
-                        update_option('widget_akismet', $options);
-                }
-                $title = htmlspecialchars($options['title'], ENT_QUOTES);
-        ?>
-                                <p><label for="akismet-title"><?php _e('Title:'); ?> <input style="width: 250px;" id="akismet-title" name="akismet-title" type="text" value="<?php echo $title; ?>" /></label></p>
-                                <input type="hidden" id="akismet-submit" name="akismet-submit" value="1" />
-        <?php
-        }
-
-        if ( function_exists( 'wp_register_sidebar_widget' ) ) {
-                wp_register_sidebar_widget( 'akismet', 'Akismet', 'widget_akismet', null, 'akismet');
-                wp_register_widget_control( 'akismet', 'Akismet', 'widget_akismet_control', null, 75, 'akismet');
-        } else {
-                register_sidebar_widget('Akismet', 'widget_akismet', null, 'akismet');
-                register_widget_control('Akismet', 'widget_akismet_control', null, 75, 'akismet');
-        }
-        if ( is_active_widget('widget_akismet') )
-                add_action('wp_head', 'widget_akismet_style');
-        endif;
-}
-
-add_action('init', 'widget_akismet_register');
-
-// Counter for non-widget users
-function akismet_counter() {
-        $plugin_dir = '/wp-content/plugins';
-        if ( defined( 'PLUGINDIR' ) )
-                $plugin_dir = '/' . PLUGINDIR;
-
-?>
-<style type="text/css">
-#akismetwrap #aka,#aka:link,#aka:hover,#aka:visited,#aka:active{color:#fff;text-decoration:none}
-#aka:hover{border:none;text-decoration:none}
-#aka:hover #akismet1{display:none}
-#aka:hover #akismet2,#akismet1{display:block}
-#akismet2{display:none;padding-top:2px}
-#akismeta{font-size:16px;font-weight:bold;line-height:18px;text-decoration:none}
-#akismetcount{display:block;font:15px Verdana,Arial,Sans-Serif;font-weight:bold;text-decoration:none}
-#akismetwrap #akismetstats{background:url(<?php echo get_option('siteurl'), $plugin_dir; ?>/akismet/akismet.gif) no-repeat top left;border:none;color:#fff;font:11px 'Trebuchet MS','Myriad Pro',sans-serif;height:40px;line-height:100%;overflow:hidden;padding:8px 0 0;text-align:center;width:120px}
-</style>
-<?php
-$count = number_format_i18n(get_option('akismet_spam_count'));
-?>
-<div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><div id="akismet1"><span id="akismetcount"><?php echo $count; ?></span> <span id="akismetsc"><?php _e('spam comments') ?></span></div> <div id="akismet2"><span id="akismetbb"><?php _e('blocked by') ?></span><br /><span id="akismeta">Akismet</span></div></a></div></div>
-<?php
-}
-
-?>
+                } else {
+                        delete_comment_meta( $comment_id, 'akismet_rechecking' );
+                        wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+                        return;
+                }
+        }
+        
+        $remaining = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ) );
+        if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
+                wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+        }
+}
+add_action( 'akismet_schedule_cron_recheck', 'akismet_cron_recheck' );
+
+function akismet_add_comment_nonce( $post_id ) {
+        echo '<p style="display: none;">';
+        wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
+        echo '</p>';
+}
+
+$akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+
+if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
+        add_action( 'comment_form', 'akismet_add_comment_nonce' );
+
+if ( '3.0.5' == $wp_version ) { 
+        remove_filter( 'comment_text', 'wp_kses_data' ); 
+        if ( is_admin() ) 
+                add_filter( 'comment_text', 'wp_kses_post' ); 
+}

trunk/blogs/wp-content/plugins/akismet/readme.txt

@@ -1 +1 @@
 === Akismet ===
-Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic
+Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, automattic
 Tags: akismet, comments, spam
-Requires at least: 2.0
-Tested up to: 3.0
-Stable tag: 2.4.0
-License: GPLv2
+Requires at least: 3.0
+Tested up to: 3.1
+Stable tag: 2.5.3
+License: GPLv2 or later
 
 Akismet checks your comments against the Akismet web service to see if they look like spam or not.
@@ -14 +14 @@
 review the spam it catches under your blog's "Comments" admin screen.
 
-Want to show off how much spam Akismet has caught for you? Just put `<?php akismet_counter(); ?>` in your template.
+Major new features in Akismet 2.5 include:
 
-See also: [WP Stats plugin](http://wordpress.org/extend/plugins/stats/).
+* A comment status history, so you can easily see which comments were caught or cleared by Akismet, and which were spammed or unspammed by a moderator
+* Links are highlighted in the comment body, to reveal hidden or misleading links
+* If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
+* Moderators can see the number of approved comments for each user
+* Spam and Unspam reports now include more information, to help improve accuracy
 
-PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it.
+PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it.  Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
 
 == Installation ==
@@ -27 +31 @@
 
 == Changelog ==
+
+= 2.5.3 = 
+* Specify the license is GPL v2 or later
+* Fix a bug that could result in orphaned commentmeta entries
+* Include hotfix for WordPress 3.0.5 filter issue
+
+= 2.5.2 =
+
+* Properly format the comment count for author counts
+* Look for super admins on multisite installs when looking up user roles
+* Increase the HTTP request timeout
+* Removed padding for author approved count
+* Fix typo in function name
+* Set Akismet stats iframe height to fixed 2500px.  Better to have one tall scroll bar than two side by side.
+
+= 2.5.1 =
+
+* Fix a bug that caused the "Auto delete" option to fail to discard comments correctly
+* Remove the comment nonce form field from the 'Akismet Configuration' page in favor of using a filter, akismet_comment_nonce
+* Fixed padding bug in "author" column of posts screen
+* Added margin-top to "cleared by ..." badges on dashboard
+* Fix possible error when calling akismet_cron_recheck()
+* Fix more PHP warnings
+* Clean up XHTML warnings for comment nonce
+* Fix for possible condition where scheduled comment re-checks could get stuck
+* Clean up the comment meta details after deleting a comment
+* Only show the status badge if the comment status has been changed by someone/something other than Akismet
+* Show a 'History' link in the row-actions
+* Translation fixes
+* Reduced font-size on author name
+* Moved "flagged by..." notification to top right corner of comment container and removed heavy styling
+* Hid "flagged by..." notification while on dashboard
+
+= 2.5.0 =
+
+* Track comment actions under 'Akismet Status' on the edit comment screen
+* Fix a few remaining deprecated function calls ( props Mike Glendinning ) 
+* Use HTTPS for the stats IFRAME when wp-admin is using HTTPS
+* Use the WordPress HTTP class if available
+* Move the admin UI code to a separate file, only loaded when needed
+* Add cron retry feature, to replace the old connectivity check
+* Display Akismet status badge beside each comment
+* Record history for each comment, and display it on the edit page
+* Record the complete comment as originally submitted in comment_meta, to use when reporting spam and ham
+* Highlight links in comment content
+* New option, "Show the number of comments you've approved beside each comment author."
+* New option, "Use a nonce on the comment form."
 
 = 2.4.0 =