' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '
' .
- '' . esc_html__( 'On this page, you are able to setup the Akismet plugin.' , 'akismet') . '
',
+ '' . esc_html__( 'Akismet filters out spam, so you can focus on more important things.' , 'akismet') . '
' .
+ '' . esc_html__( 'On this page, you are able to set up the Akismet plugin.' , 'akismet') . '
',
)
);
@@ -139,7 +159,7 @@ class Akismet_Admin {
'content' =>
'' . esc_html__( 'You need to enter an API key to activate the Akismet service on your site.' , 'akismet') . '
' .
- '' . sprintf( __( 'Signup for an account on %s to get an API Key.' , 'akismet'), 'Akismet.com' ) . '
',
+ '' . sprintf( __( 'Sign up for an account on %s to get an API Key.' , 'akismet'), 'Akismet.com' ) . '
',
)
);
@@ -165,7 +185,7 @@ class Akismet_Admin {
'title' => __( 'Overview' , 'akismet'),
'content' =>
'' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet filters out spam, so you can focus on more important things.' , 'akismet') . '
' .
'' . esc_html__( 'On this page, you are able to view stats on spam filtered on your site.' , 'akismet') . '
',
)
);
@@ -178,7 +198,7 @@ class Akismet_Admin {
'title' => __( 'Overview' , 'akismet'),
'content' =>
'' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '
' .
+ '' . esc_html__( 'Akismet filters out spam, so you can focus on more important things.' , 'akismet') . '
' .
'' . esc_html__( 'On this page, you are able to enter/remove an API key, view account information and view spam stats.' , 'akismet') . '
',
)
);
@@ -230,7 +250,7 @@ class Akismet_Admin {
if ( defined( 'WPCOM_API_KEY' ) )
return false; //shouldn't have option to save key if already defined
- $new_key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+ $new_key = preg_replace( '/[^a-f0-9]/i', '', $_POST['key'] );
$old_key = Akismet::get_api_key();
if ( empty( $new_key ) ) {
@@ -256,8 +276,10 @@ class Akismet_Admin {
if ( in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) ) )
update_option( 'wordpress_api_key', $api_key );
- if ( $akismet_user->status == 'active' )
+ if ( $akismet_user->status == 'active' )
self::$notices['status'] = 'new-key-valid';
+ elseif ( $akismet_user->status == 'notice' )
+ self::$notices['status'] = $akismet_user;
else
self::$notices['status'] = $akismet_user->status;
}
@@ -288,15 +310,6 @@ class Akismet_Admin {
// WP 2.5+
public static function rightnow_stats() {
- global $submenu, $wp_db_version;
-
- if ( 8645 < $wp_db_version ) // 2.7
- $link = add_query_arg( array( 'comment_status' => 'spam' ), admin_url( 'edit-comments.php' ) );
- elseif ( isset( $submenu['edit-comments.php'] ) )
- $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit-comments.php' ) );
- else
- $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit.php' ) );
-
if ( $count = get_option('akismet_spam_count') ) {
$intro = sprintf( _n(
'' . esc_html__('Check for Spam', 'akismet') . '';
}
public static function recheck_queue() {
@@ -392,6 +366,12 @@ class Akismet_Admin {
}
$moderation = $wpdb->get_results( "SELECT * FROM {$wpdb->comments} WHERE comment_approved = '0'{$paginate}", ARRAY_A );
+ $result_counts = array(
+ 'spam' => 0,
+ 'ham' => 0,
+ 'error' => 0,
+ );
+
foreach ( (array) $moderation as $c ) {
$c['user_ip'] = $c['comment_author_IP'];
$c['user_agent'] = $c['comment_agent'];
@@ -410,23 +390,31 @@ class Akismet_Admin {
add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
- $response = Akismet::http_post( http_build_query( $c ), 'comment-check' );
+ $response = Akismet::http_post( Akismet::build_query( $c ), 'comment-check' );
+
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' );
delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
- Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam', 'akismet'), 'check-spam' );
-
+ Akismet::update_comment_history( $c['comment_ID'], '', 'recheck-spam' );
+ ++$result_counts['spam'];
} elseif ( 'false' == $response[1] ) {
update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
delete_comment_meta( $c['comment_ID'], 'akismet_error' );
delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
- Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment', 'akismet'), 'check-ham' );
- // abnormal result: error
+ Akismet::update_comment_history( $c['comment_ID'], '', 'recheck-ham' );
+ ++$result_counts['ham'];
} else {
+ // abnormal result: error
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)', 'akismet'), substr($response[1], 0, 50)), 'check-error' );
+ Akismet::update_comment_history(
+ $c['comment_ID'],
+ '',
+ 'recheck-error',
+ array( 'response' => substr( $response[1], 0, 50 ) )
+ );
+ ++$result_counts['error'];
}
delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
@@ -434,6 +422,7 @@ class Akismet_Admin {
if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
wp_send_json( array(
'processed' => count((array) $moderation),
+ 'counts' => $result_counts,
));
}
else {
@@ -514,7 +503,10 @@ class Akismet_Admin {
if ( $desc )
echo '
'.esc_html( $desc ).'';
- if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) ) {
+ $show_user_comments = apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') );
+ $show_user_comments = $show_user_comments === 'false' ? false : $show_user_comments; //option used to be saved as 'false' / 'true'
+
+ if ( $show_user_comments ) {
$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 '';
@@ -528,131 +520,107 @@ class Akismet_Admin {
if ( $history ) {
echo '
';
+
foreach ( $history as $row ) {
$time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
- echo '
' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . ' - ';
- echo esc_html( $row['message'] ) . '
';
+
+ $message = '';
+
+ if ( ! empty( $row['message'] ) ) {
+ // Old versions of Akismet stored the message as a literal string in the commentmeta.
+ // New versions don't do that for two reasons:
+ // 1) Save space.
+ // 2) The message can be translated into the current language of the blog, not stuck
+ // in the language of the blog when the comment was made.
+ $message = $row['message'];
+ }
+
+ // If possible, use a current translation.
+ switch ( $row['event'] ) {
+ case 'recheck-spam';
+ $message = __( 'Akismet re-checked and caught this comment as spam.', 'akismet' );
+ break;
+ case 'check-spam':
+ $message = __( 'Akismet caught this comment as spam.', 'akismet' );
+ break;
+ case 'recheck-ham':
+ $message = __( 'Akismet re-checked and cleared this comment.', 'akismet' );
+ break;
+ case 'check-ham':
+ $message = __( 'Akismet cleared this comment.', 'akismet' );
+ break;
+ case 'wp-blacklisted':
+ $message = __( 'Comment was caught by wp_blacklist_check.', 'akismet' );
+ break;
+ case 'report-spam':
+ if ( isset( $row['user'] ) ) {
+ $message = sprintf( __( '%s reported this comment as spam.', 'akismet' ), $row['user'] );
+ }
+ else if ( ! $message ) {
+ $message = __( 'This comment was reported as spam.', 'akismet' );
+ }
+ break;
+ case 'report-ham':
+ if ( isset( $row['user'] ) ) {
+ $message = sprintf( __( '%s reported this comment as not spam.', 'akismet' ), $row['user'] );
+ }
+ else if ( ! $message ) {
+ $message = __( 'This comment was reported as not spam.', 'akismet' );
+ }
+ break;
+ case 'cron-retry-spam':
+ $message = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet');
+ break;
+ case 'cron-retry-ham':
+ $message = __( 'Akismet cleared this comment during an automatic retry.', 'akismet');
+ break;
+ case 'check-error':
+ if ( isset( $row['meta'], $row['meta']['response'] ) ) {
+ $message = sprintf( __( 'Akismet was unable to check this comment (response: %s) but will automatically retry later.', 'akismet'), $row['meta']['response'] );
+ }
+ break;
+ case 'recheck-error':
+ if ( isset( $row['meta'], $row['meta']['response'] ) ) {
+ $message = sprintf( __( 'Akismet was unable to recheck this comment (response: %s).', 'akismet'), $row['meta']['response'] );
+ }
+ break;
+ default:
+ if ( preg_match( '/^status-changed/', $row['event'] ) ) {
+ // Half of these used to be saved without the dash after 'status-changed'.
+ // See https://plugins.trac.wordpress.org/changeset/1150658/akismet/trunk
+ $new_status = preg_replace( '/^status-changed-?/', '', $row['event'] );
+ $message = sprintf( __( 'Comment status was changed to %s', 'akismet' ), $new_status );
+ }
+ else if ( preg_match( '/^status-/', $row['event'] ) ) {
+ $new_status = preg_replace( '/^status-/', '', $row['event'] );
+
+ if ( isset( $row['user'] ) ) {
+ $message = sprintf( __( '%1$s changed the comment status to %2$s.', 'akismet' ), $row['user'], $new_status );
+ }
+ }
+ break;
+
+ }
+
+ echo '
';
+ echo '' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . '';
+ echo ' - ';
+ echo esc_html( $message );
+ echo '
';
}
+
echo '
';
}
}
public static function plugin_action_links( $links, $file ) {
- if ( $file == plugin_basename( AKISMET__PLUGIN_URL . '/akismet.php' ) ) {
+ if ( $file == plugin_basename( plugin_dir_url( __FILE__ ) . '/akismet.php' ) ) {
$links[] = '
'.esc_html__( 'Settings' , 'akismet').'';
}
return $links;
}
- public static function text_add_link_callback( $m ) {
- // bare link?
- if ( $m[4] == $m[2] )
- return '';
- else
- return '';
- }
-
- public static function text_add_link_class( $comment_text ) {
- return preg_replace_callback( '#
]*)href="([^"]+)"([^>]*)>(.*?)#i', array( 'Akismet_Admin', 'text_add_link_callback' ), $comment_text );
- }
-
- public static function submit_spam_comment( $comment_id ) {
- global $wpdb, $current_user, $current_site;
-
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $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::is_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $response = Akismet::http_post( http_build_query( $comment ), 'submit-spam' );
- if ( $comment->reporter ) {
- Akismet::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $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]);
- }
-
- public static function submit_nonspam_comment( $comment_id ) {
- global $wpdb, $current_user, $current_site;
-
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $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 );
- $comment->user_role = '';
-
- if ( is_object($current_user) )
- $comment->reporter = $current_user->user_login;
-
- if ( is_object($current_site) )
- $comment->site_domain = $current_site->domain;
-
- if ( isset( $comment->user_ID ) )
- $comment->user_role = Akismet::get_user_roles($comment->user_ID);
-
- if ( Akismet::is_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $response = Akismet::http_post( http_build_query( $comment ), 'submit-ham' );
- if ( $comment->reporter ) {
- Akismet::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $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]);
- }
-
// Total spam in queue
// get_option( 'akismet_spam_count' ) is the total caught ever
public static function get_spam_count( $type = false ) {
@@ -672,53 +640,73 @@ class Akismet_Admin {
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'");
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam' AND comment_type = %s", $type ) );
}
// 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).
- public static function check_server_connectivity() {
- $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();
-
- $api_key = Akismet::get_api_key();
+ public static function check_server_ip_connectivity() {
+
+ $servers = $ips = array();
- $servers = array();
- foreach ( $ips as $ip ) {
- $response = Akismet::verify_key( $api_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;
+ // Some web hosts may disable this function
+ if ( function_exists('gethostbynamel') ) {
+
+ $ips = gethostbynamel( 'rest.akismet.com' );
+ if ( $ips && is_array($ips) && count($ips) ) {
+ $api_key = Akismet::get_api_key();
+
+ foreach ( $ips as $ip ) {
+ $response = Akismet::verify_key( $api_key, $ip );
+ // even if the key is invalid, at least we know we have connectivity
+ if ( $response == 'valid' || $response == 'invalid' )
+ $servers[$ip] = 'connected';
+ else
+ $servers[$ip] = $response ? $response : 'unable to connect';
+ }
+ }
}
+
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 check_server_connectivity()
- public static function get_server_connectivity( $cache_timeout = 86400 ) {
+
+ // Simpler connectivity check
+ public static function check_server_connectivity($cache_timeout = 86400) {
+
+ $debug = array();
+ $debug[ 'PHP_VERSION' ] = PHP_VERSION;
+ $debug[ 'WORDPRESS_VERSION' ] = $GLOBALS['wp_version'];
+ $debug[ 'AKISMET_VERSION' ] = AKISMET_VERSION;
+ $debug[ 'AKISMET__PLUGIN_DIR' ] = AKISMET__PLUGIN_DIR;
+ $debug[ 'SITE_URL' ] = site_url();
+ $debug[ 'HOME_URL' ] = home_url();
+
$servers = get_option('akismet_available_servers');
- if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
- return $servers;
+ if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false ) {
+ $servers = self::check_server_ip_connectivity();
+ update_option('akismet_available_servers', $servers);
+ update_option('akismet_connectivity_time', time());
+ }
+
+ $response = wp_remote_get( 'http://rest.akismet.com/1.1/test' );
+
+ $debug[ 'gethostbynamel' ] = function_exists('gethostbynamel') ? 'exists' : 'not here';
+ $debug[ 'Servers' ] = $servers;
+ $debug[ 'Test Connection' ] = $response;
+
+ Akismet::log( $debug );
+
+ if ( $response && 'connected' == wp_remote_retrieve_body( $response ) )
+ return true;
+
+ return false;
+ }
- // There's a race condition here but the effect is harmless.
- $servers = self::check_server_connectivity();
- update_option('akismet_available_servers', $servers);
- update_option('akismet_connectivity_time', time());
- return $servers;
+ // Check the server connectivity and store the available servers in an option.
+ public static function get_server_connectivity($cache_timeout = 86400) {
+ return self::check_server_connectivity( $cache_timeout );
}
public static function get_number_spam_waiting() {
@@ -741,13 +729,16 @@ class Akismet_Admin {
}
public static function get_akismet_user( $api_key ) {
- $akismet_user = Akismet::http_post( http_build_query( array( 'key' => $api_key ) ), 'get-subscription' );
+ $akismet_user = false;
+
+ $subscription_verification = Akismet::http_post( Akismet::build_query( array( 'key' => $api_key, 'blog' => get_bloginfo( 'url' ) ) ), 'get-subscription' );
+
+ if ( ! empty( $subscription_verification[1] ) ) {
+ if ( 'invalid' !== $subscription_verification[1] ) {
+ $akismet_user = json_decode( $subscription_verification[1] );
+ }
+ }
- if ( ! empty( $akismet_user[1] ) )
- $akismet_user = json_decode( $akismet_user[1] );
- else
- $akismet_user = false;
-
return $akismet_user;
}
@@ -755,22 +746,22 @@ class Akismet_Admin {
$stat_totals = array();
foreach( array( '6-months', 'all' ) as $interval ) {
- $response = Akismet::http_post( http_build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
+ $response = Akismet::http_post( Akismet::build_query( array( 'blog' => get_bloginfo( 'url' ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
if ( ! empty( $response[1] ) ) {
$stat_totals[$interval] = json_decode( $response[1] );
}
}
+
return $stat_totals;
}
- public static function verify_wpcom_key( $api_key, $user_id, $token = '' ) {
- $akismet_account = Akismet::http_post( http_build_query( array(
+ public static function verify_wpcom_key( $api_key, $user_id, $extra = array() ) {
+ $akismet_account = Akismet::http_post( Akismet::build_query( array_merge( array(
'user_id' => $user_id,
'api_key' => $api_key,
- 'token' => $token,
'get_account_type' => 'true'
- ) ), 'verify-wpcom-key' );
+ ), $extra ) ), 'verify-wpcom-key' );
if ( ! empty( $akismet_account[1] ) )
$akismet_account = json_decode( $akismet_account[1] );
@@ -779,6 +770,22 @@ class Akismet_Admin {
return $akismet_account;
}
+
+ public static function connect_jetpack_user() {
+
+ if ( $jetpack_user = self::get_jetpack_user() ) {
+ if ( isset( $jetpack_user['user_id'] ) && isset( $jetpack_user['api_key'] ) ) {
+ $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'], array( 'action' => 'connect_jetpack_user' ) );
+
+ if ( is_object( $akismet_user ) ) {
+ self::save_key( $akismet_user->api_key );
+ return in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) );
+ }
+ }
+ }
+
+ return false;
+ }
public static function display_alert() {
Akismet::view( 'notice', array(
@@ -791,8 +798,10 @@ class Akismet_Admin {
public static function display_spam_check_warning() {
Akismet::fix_scheduled_recheck();
- if ( self::get_number_spam_waiting() > 0 && wp_next_scheduled('akismet_schedule_cron_recheck') > time() )
- Akismet::view( 'notice', array( 'type' => 'spam-check' ) );
+ if ( wp_next_scheduled('akismet_schedule_cron_recheck') > time() && self::get_number_spam_waiting() > 0 ) {
+ $link_text = apply_filters( 'akismet_spam_check_warning_link_text', sprintf( __( 'Please check your
Akismet configuration and contact your web host if problems persist.', 'akismet'), esc_url( self::get_page_url() ) ) );
+ Akismet::view( 'notice', array( 'type' => 'spam-check', 'link_text' => $link_text ) );
+ }
}
public static function display_invalid_version() {
@@ -820,7 +829,7 @@ class Akismet_Admin {
}
}
- if ( $api_key = Akismet::get_api_key() ) {
+ if ( $api_key = Akismet::get_api_key() && ( empty( self::$notices['status'] ) || 'existing-key-invalid' != self::$notices['status'] ) ) {
self::display_configuration_page();
return;
}
@@ -832,7 +841,7 @@ class Akismet_Admin {
$akismet_user = false;
if ( isset( $_GET['token'] ) && preg_match('/^(\d+)-[0-9a-f]{20}$/', $_GET['token'] ) )
- $akismet_user = self::verify_wpcom_key( '', '', $_GET['token'] );
+ $akismet_user = self::verify_wpcom_key( '', '', array( 'token' => $_GET['token'] ) );
elseif ( $jetpack_user = self::get_jetpack_user() )
$akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'] );
@@ -861,15 +870,23 @@ class Akismet_Admin {
public static function display_configuration_page() {
$api_key = Akismet::get_api_key();
$akismet_user = self::get_akismet_user( $api_key );
- $stat_totals = self::get_stats( $api_key );
+ if ( ! $akismet_user ) {
+ // This could happen if the user's key became invalid after it was previously valid and successfully set up.
+ self::$notices['status'] = 'existing-key-invalid';
+ self::display_start_page();
+ return;
+ }
+
+ $stat_totals = self::get_stats( $api_key );
+
// If unset, create the new strictness option using the old discard option to determine its default
if ( get_option( 'akismet_strictness' ) === false )
add_option( 'akismet_strictness', (get_option('akismet_discard_month') === 'true' ? '1' : '0') );
if ( empty( self::$notices ) ) {
//show status
- if ( $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
+ if ( ! empty( $stat_totals['all'] ) && isset( $stat_totals['all']->time_saved ) && $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
$time_saved = false;
@@ -880,11 +897,11 @@ class Akismet_Admin {
$cleaning_up = __( 'Cleaning up spam takes time.' , 'akismet');
if ( $total_in_days > 1 )
- $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %s days!' , 'akismet'), number_format_i18n( $total_in_days ) );
+ $time_saved = $cleaning_up . ' ' . sprintf( _n( 'Akismet has saved you %s day!', 'Akismet has saved you %s days!', $total_in_days, 'akismet' ), number_format_i18n( $total_in_days ) );
elseif ( $total_in_hours > 1 )
- $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d hours!' , 'akismet'), $total_in_hours );
+ $time_saved = $cleaning_up . ' ' . sprintf( _n( 'Akismet has saved you %d hour!', 'Akismet has saved you %d hours!', $total_in_hours, 'akismet' ), $total_in_hours );
elseif ( $total_in_minutes >= 30 )
- $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d minutes!' , 'akismet'), $total_in_minutes );
+ $time_saved = $cleaning_up . ' ' . sprintf( _n( 'Akismet has saved you %d minute!', 'Akismet has saved you %d minutes!', $total_in_minutes, 'akismet' ), $total_in_minutes );
}
Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
@@ -906,7 +923,10 @@ class Akismet_Admin {
global $hook_suffix;
if ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config', 'edit-comments.php' ) ) && (int) get_option( 'akismet_alert_code' ) > 0 ) {
- self::display_alert();
+ Akismet::verify_key( Akismet::get_api_key() ); //verify that the key is still in alert state
+
+ if ( get_option( 'akismet_alert_code' ) > 0 )
+ self::display_alert();
}
elseif ( $hook_suffix == 'plugins.php' && !Akismet::get_api_key() ) {
self::display_api_key_warning();
@@ -920,21 +940,32 @@ class Akismet_Admin {
}
public static function display_status() {
- $servers = self::get_server_connectivity();
- $fail_count = count( $servers ) - count( array_filter( $servers ) );
- $type = '';
+ $type = '';
- if ( empty( $servers ) || $fail_count > 0 )
+ if ( !self::get_server_connectivity() )
$type = 'servers-be-down';
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
- $type = 'missing-functions';
-
if ( !empty( $type ) )
Akismet::view( 'notice', compact( 'type' ) );
elseif ( !empty( self::$notices ) ) {
- foreach ( self::$notices as $type )
- Akismet::view( 'notice', compact( 'type' ) );
+ foreach ( self::$notices as $type ) {
+ if ( is_object( $type ) ) {
+ $notice_header = $notice_text = '';
+
+ if ( property_exists( $type, 'notice_header' ) )
+ $notice_header = wp_kses( $type->notice_header, self::$allowed );
+
+ if ( property_exists( $type, 'notice_text' ) )
+ $notice_text = wp_kses( $type->notice_text, self::$allowed );
+
+ if ( property_exists( $type, 'status' ) ) {
+ $type = wp_kses( $type->status, self::$allowed );
+ Akismet::view( 'notice', compact( 'type', 'notice_header', 'notice_text' ) );
+ }
+ }
+ else
+ Akismet::view( 'notice', compact( 'type' ) );
+ }
}
}
@@ -961,4 +992,20 @@ class Akismet_Admin {
}
return false;
}
+
+ /**
+ * Some commentmeta isn't useful in an export file. Suppress it (when supported).
+ *
+ * @param bool $exclude
+ * @param string $key The meta key
+ * @param object $meta The meta object
+ * @return bool Whether to exclude this meta entry from the export.
+ */
+ public static function exclude_commentmeta_from_export( $exclude, $key, $meta ) {
+ if ( in_array( $key, array( 'akismet_as_submitted', 'akismet_rechecking', 'akismet_delayed_moderation_email' ) ) ) {
+ return true;
+ }
+
+ return $exclude;
+ }
}
\ No newline at end of file
 ) . ')
';
- }
-
- public static function 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 self::submit_spam_comment( $comment->comment_ID );
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
- return self::submit_nonspam_comment( $comment->comment_ID );
- }
- }
-
- Akismet::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ echo '