diff -r 490d5cc509ed -r cf61fcea0001 wp/wp-content/plugins/akismet/admin.php
--- a/wp/wp-content/plugins/akismet/admin.php	Tue Jun 09 11:14:17 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,925 +0,0 @@
-<?php
-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 ( !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 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'); 
-        
-        return; 
-    }
-
-    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_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 ( in_array( $hook_suffix, array( 
-		'index.php', # dashboard
-		'edit-comments.php',
-		'comment.php',
-		'post.php',
-		'plugins_page_akismet-key-config', 
-		'jetpack_page_akismet-key-config',
-	) ) ) {
-		wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.9' );
-		wp_enqueue_style( 'akismet.css');
-	
-		wp_register_script( 'akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'), '2.5.9' );
-		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_plugin_action_links( $links, $file ) {
-	if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
-		$links[] = '<a href="' . admin_url( '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, $current_user;
-	
-	$new_key_link    = 'https://akismet.com/get/';
-	$config_link     = esc_url( add_query_arg( array( 'page' => 'akismet-key-config', 'show' => 'enter-api-key' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );
-	$stats_link      = esc_url( add_query_arg( array( 'page' => 'akismet-stats-display' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'index.php' ) ) );
-	$api_key         = akismet_get_key();
-	$show_key_form   = $api_key;
-	$key_status      = 'empty';
-	$saved_ok        = false;
-	$key_status_text = '';
-	
-	$ms = array();
-
-	if ( isset( $_POST['submit'] ) ) {
-		if ( function_exists('current_user_can') && !current_user_can('manage_options') )
-			die(__('Cheatin&#8217; uh?'));
-			
-		$show_key_form = true;
-
-		check_admin_referer( $akismet_nonce );
-		$key      = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
-		$home_url = parse_url( get_bloginfo('url') );
-		
-		if ( empty( $home_url['host'] ) )
-			$ms[] = 'bad_home_url';
-
-		if ( empty( $key ) ) {
-			if ( $api_key ) {
-				delete_option('wordpress_api_key');
-				$saved_ok = true;			
-				$ms[] = 'new_key_empty';
-			}
-			else
-				$ms[] = 'key_empty';
-		}  
-		else
-			$key_status = akismet_verify_key( $key );		
-		
-		if ( $key != $api_key && $key_status == 'valid' ) {
-			$ms[] = 'new_key_valid';
-			update_option('wordpress_api_key', $key);
-		}
-		elseif ( $key_status == 'invalid' )
-			$ms[] = 'new_key_invalid';
-		elseif ( $key_status == 'failed' )
-			$ms[] = 'new_key_failed';
-
-		$api_key = $key_status == 'valid' ? $key : false;
-
-		if ( isset( $_POST['akismet_discard_month'] ) )
-			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' );
-			
-		if ( empty( $ms ) )
-			$saved_ok = true;
-
-	} 
-	elseif ( isset( $_POST['check'] ) ) {
-		$show_key_form = true;
-		check_admin_referer( $akismet_nonce );
-		akismet_get_server_connectivity(0);
-	}
-	elseif ( isset( $_GET['show'] ) && $_GET['show'] == 'enter-api-key' ) {
-		$show_key_form = true;
-	}
-	
-	if ( $show_key_form ) {
-		//check current key status
-		//only get this if showing the key form otherwise takes longer for page to load for new user
-		//no need to get it if we already know it and its valid
-		if ( in_array( $key_status, array( 'invalid', 'failed', 'empty' ) ) ) {
-			$key = get_option('wordpress_api_key');
-			if ( empty( $key ) ) {
-				//no key saved yet - maybe connection to Akismet down?
-				if ( in_array( $key_status, array( 'invalid', 'empty' ) ) ) {
-					if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
-						$ms[] = 'no_connection';
-				}
-			} 
-			else
-				$key_status = akismet_verify_key( $key );			
-		}
-		
-		if ( !isset( $_POST['submit'] ) ) {
-			if ( $key_status == 'invalid' )
-				$ms[] = 'key_invalid';
-			elseif ( !empty( $key ) && $key_status == 'failed' )
-				$ms[] = 'key_failed';
-		}
-	}	
-		
-	$key_status_strings = array( 
-	 	'empty'   => __( 'Empty' ), 
-		'valid'   => __( 'Valid' ), 
-		'invalid' => __( 'Invalid' ), 
-		'failed'  => __( 'Failed' ), 
- 	);
-
-	$messages = array(
-		'new_key_empty'   => array( 'class' => 'updated fade', 'text' => __('Your key has been cleared.' ) ),
-		'new_key_valid'   => array( 'class' => 'updated fade', 'text' => __('Your Akismet account has been successfully set up and activated. Happy blogging!' ) ),
-		'new_key_invalid' => array( 'class' => 'error',        'text' => __('The key you entered is invalid. Please double-check it.' ) ),
-		'new_key_failed'  => array( 'class' => 'error',        '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( 'class' => 'error',        'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.' ) ),
-		'key_empty'       => array( 'class' => 'updated fade', 'text' => __('Please enter an API key' ) ),
-		'key_invalid'     => array( 'class' => 'error',        'text' => __('This key is invalid.' ) ),
-		'key_failed'      => array( 'class' => 'error',        '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( 'class' => 'error',        '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') ) )
-	);
-?>
-
-
-<div class="wrap">
-	<?php if ( !$api_key ) : ?>
-	<h2 class="ak-header"><?php _e('Akismet'); ?></h2>
-	<?php else: ?>
-	<h2 class="ak-header"><?php printf( __( 'Akismet <a href="%s" class="add-new-h2">Stats</a>' ), $stats_link ); ?></h2>
-	<?php endif; ?>
-	<div class="no-key <?php echo $show_key_form ? 'hidden' : '';?>">
-		<p><?php _e('Akismet eliminates the comment and trackback spam you get on your site. To use Akismet you may need to sign up for an API key. Click the button below to get started.'); ?></p>
-		<form name="akismet_activate" action="https://akismet.com/get/" method="POST"> 
-			<input type="hidden" name="return" value="1"/> 
-			<input type="hidden" name="jetpack" value="<?php echo (string) class_exists( 'Jetpack' );?>"/>
-			<input type="hidden" name="user" value="<?php echo esc_attr( $current_user->user_login );?>"/>
-			<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Create a new Akismet Key' ); ?>"/>
-		</form>
-		<br/>
-		<a href="<?php echo $config_link;?>"><?php _e('I already have a key'); ?></a>
-	</div>
-	<div class="have-key <?php echo $show_key_form ? '' : 'hidden';?>">
-		<?php if ( !empty($_POST['submit'] ) && $saved_ok ) : ?>
-		<div id="message" class="updated fade"><p><strong><?php _e('Settings saved.') ?></strong></p></div>
-		<?php endif; ?>
-		<?php if ( isset($_GET['message']) && $_GET['message'] == 'success' ) : ?>
-		<div id="message" class="updated fade"><p><?php _e('<strong>Sign up success!</strong> Please check your email for your Akismet API Key and enter it below.') ?></p></div>
-		<?php endif; ?>
-		<?php foreach( $ms as $m ) : ?>
-		<div class="<?php echo $messages[$m]['class']; ?>"><p><strong><?php echo $messages[$m]['text']; ?></strong></p></div>
-		<?php endforeach; ?>		
-		<form action="" method="post" id="akismet-conf">
-			<table class="form-table">
-				<tbody>
-					<tr>
-						<th><label for="key"><?php _e('Akismet API Key');?></label></th>
-						<td>
-							<input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $key_status;?>"><div class="under-input key-status <?php echo $key_status;?>"><?php echo isset( $key_status_strings[ $key_status ] ) ? $key_status_strings[ $key_status ] : '';?></div>
-							<p class="need-key description"><?php printf( __('You must enter a valid Akismet API key here. If you need an API key, you can <a href="%s">create one here</a>'), '#' );?></p>
-						</td>
-					</tr>
-					<?php if ( $api_key ):?>
-					<tr valign="top">
-						<th scope="row"><?php _e('Settings');?></th>
-						<td>
-							<fieldset><legend class="screen-reader-text"><span><?php _e('Settings');?></span></legend>
-							<label for="akismet_discard_month" title="<?php esc_attr_e( 'Auto-detete old spam' ); ?>"><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php echo get_option('akismet_discard_month') == 'true' ? 'checked="checked"':''; ?>> <span><?php _e('Auto-delete spam submitted on posts more than a month old.'); ?></span></label><br>
-							<label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' ); ?>"><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="true" type="checkbox" <?php echo get_option('akismet_show_user_comments_approved') == 'true' ? 'checked="checked"':''; ?>> <span><?php _e('Show the number of comments you\'ve approved beside each comment author.'); ?></span></label>
-							</fieldset>
-						</td>
-					</tr>
-					<?php endif; ?>
-				</tbody>
-			</table>
-			<?php akismet_nonce_field($akismet_nonce) ?>
-			<p class="submit">
-				<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes');?>">
-			</p>
-		</form>	
-		
-		<?php if ( $api_key ) : ?>
-		<h3><?php _e('Server Connectivity'); ?></h3>
-		<form action="" method="post" id="akismet-connectivity">
-			<table class="form-table">
-				<tbody>
-					<tr>
-						<th><label for="key"><?php _e('Server Status');?></label></th>
-						<td>
-						<?php if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) : ?>
-							<p class="key-status failed"><?php _e('Network functions are disabled.'); ?></p>
-							<p class="description"><?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 ) { 
-										if ( $fail_count > 0 && $fail_count < count( $servers ) ) { // some connections work, some fail ?>
-							<p class="key-status some"><?php _e('Unable to reach some Akismet servers.'); ?></p>
-							<p class="description"><?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 } elseif ( $fail_count > 0 ) { // all connections fail ?>
-							<p class="key-status failed"><?php _e('Unable to reach any Akismet servers.'); ?></p>
-							<p class="description"><?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 } else { // all connections work ?>
-							<p class="key-status valid"><?php  _e('All Akismet servers are available.'); ?></p>
-							<p class="description"><?php _e('Akismet is working correctly.  All servers are accessible.'); ?></p>
-									<?php }
-									} else { //can't connect to any server ?>
-							<p class="key-status failed"><?php _e('Unable to find Akismet servers.'); ?></p>
-							<p class="description"><?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 }
-							endif; ?>							
-						</td>
-					</tr>
-					<?php if ( !empty( $servers ) ) : ?>
-					<tr valign="top">
-						<th scope="row"><?php _e('Network Status');?></th>
-						<td>
-							<table class="network-status">
-								<thead>
-										<th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th>
-								</thead>
-								<tbody>
-								<?php
-										asort($servers);
-										foreach ( $servers as $ip => $status ) : ?>
-										<tr>
-											<td align="center"><?php echo esc_html( $ip ); ?></td>
-											<td class="key-status <?php echo $status ? 'valid' : 'failed'; ?>"><?php echo $status ? __('Accessible') : __('Re-trying'); ?></td>
-										</tr>										
-									<?php endforeach; ?>
-								</tbody>
-							</table>
-							<br/>
-							<input type="submit" name="check" id="submit" class="button" style="margin-left: 13.3em;" value="<?php _e('Check Network Status');?>">
-						</td>
-					</tr>
-					<?php endif; ?>
-					<tr valign="top">
-						<th scope="row"><?php _e('Last Checked');?></th>
-						<td>
-							<p><strong><?php echo get_option('akismet_connectivity_time') ? sprintf( __('%s Ago'), ucwords( human_time_diff( get_option('akismet_connectivity_time') ) ) ) : __( 'Not yet' ); ?></strong></p>
-							<p class="description"><?php printf( __('You can confirm that Akismet.com is up by <a href="%s" target="_blank">clicking here</a>.'), 'http://status.automattic.com/9931/136079/Akismet-API' ); ?></p>
-						</td>
-				</tbody>
-			</table>
-			<?php akismet_nonce_field($akismet_nonce) ?>
-		</form>
-		<?php endif;?>
-	</div>
-</div>
-<?php
-}
-
-function akismet_stats_display() {
-	global $akismet_api_host, $akismet_api_port;
-	
-	$blog        = urlencode( get_bloginfo('url') );
-	$api_key     = akismet_get_key();
-	$config_link = esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );?>
-	
-<div class="wrap"><?php	
-	if ( !$api_key ) :?>
-	<div id="akismet-warning" class="updated fade"><p><strong><?php _e('Akismet is almost ready.');?></strong> <?php printf( __( 'You must <a href="%1$s">enter your Akismet API key</a> for it to work.' ), $config_link );?></p></div><?php
-	else :?>
-	<iframe src="<?php echo esc_url( sprintf( '%s://akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s', is_ssl()?'https':'http', $blog, $api_key ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe><?php
-	endif;?>
-</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>' . _x( 'Spam', 'comments' ) . '</h3>';
-	global $submenu;
-	if ( isset( $submenu['edit-comments.php'] ) )
-		$link = 'edit-comments.php';
-	else
-		$link = 'edit.php';
-	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, $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><?php _e( 'Akismet Error Code');?>: <?php echo $alert['code']; ?></strong></p>
-					<p><?php esc_html_e( $alert['msg'] ); ?></p>
-					<p><?php //FIXME: need to revert this to using __() in next version
-						printf( translate( 'For more information:' ) . ' <a href="%s">%s</a>' , 'https://akismet.com/errors/'.$alert['code'], 'https://akismet.com/errors/'.$alert['code'] );?>
-					</p>
-				</div>
-			<?php
-			}
-
-			add_action( 'admin_notices', 'akismet_alert' );
-		}
-	}
-
-	if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
-		function akismet_warning() {
-			global $hook_suffix, $current_user;
-				
-			if ( $hook_suffix == 'plugins.php' ) {              
-               	echo '  
-				<div class="updated" style="padding: 0; margin: 0; border: none; background: none;">  
-					<style type="text/css">  
-.akismet_activate{min-width:825px;border:1px solid #4F800D;padding:5px;margin:15px 0;background:#83AF24;background-image:-webkit-gradient(linear,0% 0,80% 100%,from(#83AF24),to(#4F800D));background-image:-moz-linear-gradient(80% 100% 120deg,#4F800D,#83AF24);-moz-border-radius:3px;border-radius:3px;-webkit-border-radius:3px;position:relative;overflow:hidden}.akismet_activate .aa_a{position:absolute;top:-5px;right:10px;font-size:140px;color:#769F33;font-family:Georgia, "Times New Roman", Times, serif;z-index:1}.akismet_activate .aa_button{font-weight:bold;border:1px solid #029DD6;border-top:1px solid #06B9FD;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#FFF;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button:hover{text-decoration:none !important;border:1px solid #029DD6;border-bottom:1px solid #00A8EF;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#F0F8FB;background:#0079B1;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#0079B1),to(#0092BF));background-image:-moz-linear-gradient(0% 100% 90deg,#0092BF,#0079B1);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button_border{border:1px solid #006699;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6)}.akismet_activate .aa_button_container{cursor:pointer;display:inline-block;background:#DEF1B8;padding:5px;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;width:266px}.akismet_activate .aa_description{position:absolute;top:22px;left:285px;margin-left:25px;color:#E5F2B1;font-size:15px;z-index:1000}.akismet_activate .aa_description strong{color:#FFF;font-weight:normal}
-					</style>                       
-					<form name="akismet_activate" action="'.esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) ).'" method="POST"> 
-						<input type="hidden" name="return" value="1"/>
-						<input type="hidden" name="jetpack" value="'.(string) class_exists( 'Jetpack' ).'"/>
-						<input type="hidden" name="user" value="'.esc_attr( $current_user->user_login ).'"/>
-						<div class="akismet_activate">  
-							<div class="aa_a">A</div>     
-							<div class="aa_button_container" onclick="document.akismet_activate.submit();">  
-								<div class="aa_button_border">          
-									<div class="aa_button">'.__('Activate your Akismet account').'</div>  
-								</div>  
-							</div>  
-							<div class="aa_description">'.__('<strong>Almost done</strong> - activate your account and say goodbye to comment spam').'</div>  
-						</div>  
-					</form>  
-				</div>  
-               ';      
-   			}
-		}
-
-		add_action('admin_notices', 'akismet_warning');
-		return;
-	} elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) &&  wp_next_scheduled('akismet_schedule_cron_recheck') ) {
-		function akismet_warning() {
-			global $wpdb;
-				akismet_fix_scheduled_recheck();
-				$waiting = $wpdb->get_var( "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');
-		return;
-	}
-}
-
-// 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 ( $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' && $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' )
-			$desc = sprintf( __('Flagged as spam by %s'), $who );
-		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 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' ) . '">'.esc_html( $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 );
-
-	if ( $history ) {
-		echo '<div class="akismet-history" style="margin: 13px;">';
-		foreach ( $history as $row ) {
-			$time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
-			echo '<div style="margin-bottom: 13px;"><span style="color: #999;" alt="' . $time . '" title="' . $time . '">' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</span> - ';
-			echo esc_html( $row['message'] ) . '</div>';
-		}
-		
-		echo '</div>';
-
-	}
-}
-
-
-// add an extra column header to the comments screen
-function akismet_comments_columns( $columns ) {
-	$columns[ 'akismet' ] = __( 'Akismet' );
-	return $columns;
-}
-
-#add_filter( 'manage_edit-comments_columns', 'akismet_comments_columns' );
-
-// Show stuff in the extra column
-function akismet_comment_column_row( $column, $comment_id ) {
-	if ( $column != 'akismet' )
-		return;
-		
-	$history = akismet_get_comment_history( $comment_id );
-	
-	if ( $history ) {
-		echo '<dl class="akismet-history">';
-		foreach ( $history as $row ) {
-			echo '<dt>' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</dt>';
-			echo '<dd>' . esc_html( $row['message'] ) . '</dd>';
-		}
-		
-		echo '</dl>';
-	}
-}
-
-#add_action( 'manage_comments_custom_column', 'akismet_comment_column_row', 10, 2 );
-
-// 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;
-
-	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( _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/?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/?return=true' );
-	}
-
-	$link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
-	if ( $queue_count = akismet_spam_count() ) {
-		$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 ), $link );
-	} else {
-		$queue_text = sprintf( __( "There's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $link );
-	}
-
-	$text = $intro . '<br />' . $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_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;
-		
-	// 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);
-	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);
-
-	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 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 );
-	}
-	
-	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;
-	
-	// 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);
-	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);
-
-	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 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 );
-	}
-	do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
-}
-
-// For WP 2.7+
-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 ( !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 );
-
-// Total spam in queue
-// get_option( 'akismet_spam_count' ) is the total caught ever
-function akismet_spam_count( $type = false ) {
-	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'");
-			}
-			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'");
-}
-
-
-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;
-		
-	$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_bloginfo('url');
-		$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']);
-
-		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)'), substr($response[1], 0, 50)), 'check-error' );
-		}
-
-		delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
-	}
-	$redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
-	wp_safe_redirect( $redirect_to );
-	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' ), __( 'Akismet' ), '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'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf');
-		add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
-	}
-}