X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d954c87a1e3f0e671855614661da9e5825279134..refs/tags/wordpress-3.4:/wp-content/plugins/akismet/admin.php

diff --git a/wp-content/plugins/akismet/admin.php b/wp-content/plugins/akismet/admin.php
index a1954039..aa30cde7 100644
--- a/wp-content/plugins/akismet/admin.php
+++ b/wp-content/plugins/akismet/admin.php
@@ -1,17 +1,17 @@
 <?php
-add_action( 'admin_menu', 'akismet_config_page' );
-add_action( 'admin_menu', 'akismet_stats_page' );
+add_action( 'admin_menu', 'akismet_admin_menu' );
+	
 akismet_admin_warnings();
 
 function akismet_admin_init() {
     global $wp_version;
     
     // 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>
             ";
         }
         add_action('admin_notices', 'akismet_version_warning'); 
@@ -24,19 +24,46 @@ function akismet_admin_init() {
     else
         $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');
 }
 add_action('admin_init', 'akismet_admin_init');
 
+add_action( 'admin_enqueue_scripts', 'akismet_load_js_and_css' );
+function akismet_load_js_and_css() {
+	global $hook_suffix;
+
+	if (
+		$hook_suffix == 'index.php'	# dashboard
+		|| $hook_suffix == 'edit-comments.php' 
+		|| $hook_suffix == 'comment.php' 
+		|| $hook_suffix == 'post.php' 
+		|| $hook_suffix == 'plugins_page_akismet-key-config'
+	) {
+		wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.4.4' );
+		wp_enqueue_style( 'akismet.css');
+	
+		wp_register_script( 'akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'), '2.5.4.6' );
+		wp_enqueue_script( 'akismet.js' );
+		wp_localize_script( 'akismet.js', 'WPAkismet', array(
+			'comment_author_url_nonce' => wp_create_nonce( 'comment_author_url_nonce' )
+		) );
+	}
+}
+
+
 function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
 $akismet_nonce = 'akismet-update-key';
 
-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_plugin_action_links( $links, $file ) {
+	if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
+		$links[] = '<a href="admin.php?page=akismet-key-config">'.__('Settings').'</a>';
+	}
 
+	return $links;
 }
 
+add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 );
+
 function akismet_conf() {
 	global $akismet_nonce, $wpcom_api_key;
 
@@ -46,11 +73,15 @@ function akismet_conf() {
 
 		check_admin_referer( $akismet_nonce );
 		$key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+		$home_url = parse_url( get_bloginfo('url') );
 
 		if ( empty($key) ) {
 			$key_status = 'empty';
 			$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 );
 		}
@@ -68,6 +99,12 @@ function akismet_conf() {
 			update_option( 'akismet_discard_month', 'true' );
 		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);
 	}
@@ -88,8 +125,7 @@ function akismet_conf() {
 		if ( $key_status == 'valid' ) {
 			$ms[] = 'key_valid';
 		} else if ( $key_status == 'invalid' ) {
-			delete_option('wordpress_api_key');
-			$ms[] = 'key_empty';
+			$ms[] = 'key_invalid';
 		} else if ( !empty($key) && $key_status == 'failed' ) {
 			$ms[] = 'key_failed';
 		}
@@ -97,36 +133,43 @@ function akismet_conf() {
 
 	$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.')));
+		'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/?return=true')),
+		'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')),
+		'key_invalid' => array('color' => '888', 'text' => __('This key is invalid.')),
+		'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'] ) ) : ?>
 <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>
+<?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; ">
 <?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>
+	<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/?return=true', 'http://akismet.com/get/?return=true'); ?></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>
+<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/?return=true">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><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>
 
@@ -136,7 +179,7 @@ function akismet_conf() {
 <?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 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
 	} else {
@@ -150,18 +193,18 @@ function akismet_conf() {
 			<?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 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
 			}
 		} 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
 		}
@@ -175,11 +218,11 @@ function akismet_conf() {
 <?php
 		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
 		}
@@ -189,6 +232,7 @@ function akismet_conf() {
 </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>
+	<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>
 
 </div>
@@ -196,21 +240,12 @@ function akismet_conf() {
 <?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";
+  
+    document.getElementById('akismet-stats-frame').style.height = "2500px";
     
 };
 function resizeIframeInit() {
@@ -224,7 +259,7 @@ addLoadEvent(resizeIframeInit);
 
 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://';
 	if ( is_ssl() )
@@ -245,30 +280,60 @@ function akismet_stats() {
 	if ( !$count = get_option('akismet_spam_count') )
 		return;
 	$path = plugin_basename(__FILE__);
-	echo '<h3>'.__('Spam').'</h3>';
+	echo '<h3>' . _x( 'Spam', 'comments' ) . '</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>';
+	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/?return=true', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
 }
 add_action('activity_box_end', 'akismet_stats');
 
 function akismet_admin_warnings() {
-	global $wpcom_api_key;
+	global $wpcom_api_key, $pagenow;
+
+	if (
+		$pagenow == 'edit-comments.php'
+		|| ( !empty( $_GET['page'] ) && $_GET['page'] == 'akismet-key-config' )
+		|| ( !empty( $_GET['page'] ) && $_GET['page'] == 'akismet-stats-display' )
+	) {
+		if ( get_option( 'akismet_alert_code' ) ) {
+			function akismet_alert() {
+				$alert = array(
+					'code' => (int) get_option( 'akismet_alert_code' ),
+					'msg' => get_option( 'akismet_alert_msg' )
+				);
+			?>
+				<div class='error'>
+					<p><strong>Akismet Error Code: <?php echo $alert['code']; ?></strong></p>
+					<p><?php esc_html_e( $alert['msg'] ); ?></p>
+					<p>More information is available at <a href="https://akismet.com/errors/<?php echo $alert['code']; ?>">https://akismet.com/errors/<?php echo $alert['code']; ?></a></p>
+				</div>
+			<?php
+			}
+
+			add_action( 'admin_notices', 'akismet_alert' );
+		}
+	}
+
 	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>
+			<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.'), "admin.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() ) {
+	} 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;
+				akismet_fix_scheduled_recheck();
+				$waiting = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ) );
+				$next_check = wp_next_scheduled('akismet_schedule_cron_recheck');
+				if ( $waiting > 0 && $next_check > time() )
+					echo "
+			<div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet has detected a problem.')."</strong> ".sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your <a href="%s">Akismet configuration</a> and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config')."</p></div>
 			";
 		}
 		add_action('admin_notices', 'akismet_warning');
@@ -279,17 +344,24 @@ function akismet_admin_warnings() {
 // FIXME placeholder
 
 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 );
+	$akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', 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 ) {
+	if ( $akismet_error ) {
+		$desc = __( 'Awaiting spam check' );
+	} elseif ( !$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 );
 		if ( $user_result == 'true' )
@@ -297,16 +369,37 @@ function akismet_comment_row_action( $a, $comment ) {
 		else
 			$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'
+				|| ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
+			) {
+				$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;
 }
 
 add_filter( 'comment_row_actions', 'akismet_comment_row_action', 10, 2 );
 
-
 function akismet_comment_status_meta_box($comment) {
 	$history = akismet_get_comment_history( $comment->comment_ID );
 
@@ -354,19 +447,28 @@ function akismet_comment_column_row( $column, $comment_id ) {
 
 // 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
-	$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'] ) )
@@ -375,31 +477,27 @@ function akismet_rightnow() {
 		$link = 'edit.php?page=akismet-admin';
 
 	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 ) );
+		), 'http://akismet.com/?return=true', 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/?return=true' );
 	}
 
+	$link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
 	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) );
+		), number_format_i18n( $queue_count ), $link );
 	} else {
-		$queue_text = sprintf( __( " but there's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $esc_url($link) );
+		$queue_text = sprintf( __( "There's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $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 );
-
+	$text = $intro . '<br />' . $queue_text;
 	echo "<p class='akismet-right-now'>$text</p>\n";
 }
 	
@@ -425,10 +523,18 @@ function akismet_submit_nonspam_comment ( $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');
+		
+	// 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;
 	}
@@ -440,17 +546,21 @@ function akismet_submit_nonspam_comment ( $comment_id ) {
 	if ( isset( $comment->user_ID ) )
 		$comment->user_role = akismet_get_user_roles($comment->user_ID);
 
+	if ( akismet_test_mode() )
+		$comment->is_test = 'true';
+
+	$post = get_post( $comment->comment_post_ID );
+	$comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
 	$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);
 	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' );
 	}
 	
 	do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
@@ -465,10 +575,18 @@ function akismet_submit_spam_comment ( $comment_id ) {
 		return;
 	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;
 	}
@@ -477,20 +595,25 @@ function akismet_submit_spam_comment ( $comment_id ) {
 	}
 
 	$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';
+
+	$post = get_post( $comment->comment_post_ID );
+	$comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
 	$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);
 	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]);
 }
 
@@ -498,12 +621,44 @@ function akismet_submit_spam_comment ( $comment_id ) {
 function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
 	if ( $new_status == $old_status )
 		return;
+
+	# we don't need to record a history item for deleted comments
+	if ( $new_status == 'delete' )
+		return;
+		
+	if ( !is_admin() )
+		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 );
+	if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+		return;
+
+	if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+		return;
+
+	// if this is present, it means the status has been changed by a re-check, not an explicit user action
+	if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+		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 );
+		}
 	}
+	
+	akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
 }
 
 add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
@@ -538,6 +693,8 @@ function akismet_spam_count( $type = false ) {
 function akismet_recheck_queue() {
 	global $wpdb, $akismet_api_host, $akismet_api_port;
 
+	akismet_fix_scheduled_recheck();
+
 	if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
 		return;
 		
@@ -546,7 +703,7 @@ function akismet_recheck_queue() {
 		$c['user_ip']    = $c['comment_author_IP'];
 		$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');
 		$c['permalink']  = get_permalink($c['comment_post_ID']);
@@ -555,30 +712,139 @@ function akismet_recheck_queue() {
 		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'];
 
 		$query_string = '';
 		foreach ( $c as $key => $data )
 		$query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
 
+		add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
 		$response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
 		if ( 'true' == $response[1] ) {
 			wp_set_comment_status($c['comment_ID'], 'spam');
 			update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
+			delete_comment_meta( $c['comment_ID'], 'akismet_error' );
 			akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam'), 'check-spam' );
 		
 		} elseif ( 'false' == $response[1] ) {
 			update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
+			delete_comment_meta( $c['comment_ID'], 'akismet_error' );
 			akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment'), 'check-ham' );
 		// abnormal result: error
 		} else {
 			update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
-			akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), $response[1]), 'check-error' );
+			akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), substr($response[1], 0, 50)), 'check-error' );
 		}
 
+		delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
 	}
-	wp_redirect( $_SERVER['HTTP_REFERER'] );
+	wp_safe_redirect( $_SERVER['HTTP_REFERER'] );
 	exit;
 }
 
 add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
+
+// Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
+function akismet_remove_comment_author_url() {
+    if ( !empty($_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+        global $wpdb;
+        $comment = get_comment( intval($_POST['id']), ARRAY_A );
+        if (current_user_can('edit_comment', $comment['comment_ID'])) {
+            $comment['comment_author_url'] = '';
+            do_action( 'comment_remove_author_url' );
+            print(wp_update_comment( $comment ));
+            die();
+        }
+    }
+}
+
+add_action('wp_ajax_comment_author_deurl', 'akismet_remove_comment_author_url');
+
+function akismet_add_comment_author_url() {
+    if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+        global $wpdb;
+        $comment = get_comment( intval($_POST['id']), ARRAY_A );
+        if (current_user_can('edit_comment', $comment['comment_ID'])) {
+            $comment['comment_author_url'] = esc_url($_POST['url']);
+            do_action( 'comment_add_author_url' );
+            print(wp_update_comment( $comment ));
+            die();
+        }
+    }
+}
+
+add_action('wp_ajax_comment_author_reurl', 'akismet_add_comment_author_url');
+
+// 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) );
+}
+
+function akismet_admin_menu() {
+	if ( class_exists( 'Jetpack' ) ) {
+		add_action( 'jetpack_admin_menu', 'akismet_load_menu' );
+	} else {
+		akismet_load_menu();
+	}
+}
+
+function akismet_load_menu() {
+	if ( class_exists( 'Jetpack' ) ) {
+		add_submenu_page( 'jetpack', __( 'Akismet Configuration' ), __( 'Akismet Configuration' ), 'manage_options', 'akismet-key-config', 'akismet_conf' );
+		add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' );
+	} else {
+		add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+		add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
+	}
+}