".sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) ." ".sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "
- ";
+ echo '
+
'.sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) .' '.sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). '
+ ';
}
add_action('admin_notices', 'akismet_version_warning');
@@ -23,26 +23,40 @@ function akismet_admin_init() {
$hook = get_plugin_page_hook( 'akismet-stats-display', 'index.php' );
else
$hook = 'dashboard_page_akismet-stats-display';
- add_action('admin_head-'.$hook, 'akismet_stats_script');
add_meta_box('akismet-status', __('Comment History'), 'akismet_comment_status_meta_box', 'comment', 'normal');
- wp_register_style('akismet.css', AKISMET_PLUGIN_URL . 'akismet.css');
- wp_enqueue_style('akismet.css');
- wp_register_script('akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'));
- wp_enqueue_script('akismet.js');
}
add_action('admin_init', 'akismet_admin_init');
+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.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[] = ''.__('Settings').'';
+ $links[] = ''.__( 'Settings' ).'';
}
return $links;
@@ -51,35 +65,51 @@ function akismet_plugin_action_links( $links, $file ) {
add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 );
function akismet_conf() {
- global $akismet_nonce, $wpcom_api_key;
+ global $akismet_nonce, $current_user;
+
+ $new_key_link = 'https://akismet.com/get/';
+ $api_key = akismet_get_key();
+ $show_key_form = $api_key;
+ $key_status = 'empty';
+ $saved_ok = false;
+
+ $ms = array();
- if ( isset($_POST['submit']) ) {
+ if ( isset( $_POST['submit'] ) ) {
if ( function_exists('current_user_can') && !current_user_can('manage_options') )
die(__('Cheatin’ uh?'));
+
+ $show_key_form = true;
check_admin_referer( $akismet_nonce );
- $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+ $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';
+
+ if ( empty( $home_url['host'] ) )
$ms[] = 'bad_home_url';
- } else {
+
+ 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_status == 'valid' ) {
+ if ( $key != $api_key && $key_status == 'valid' ) {
update_option('wordpress_api_key', $key);
$ms[] = 'new_key_valid';
- } else if ( $key_status == 'invalid' ) {
+ }
+ elseif ( $key_status == 'invalid' )
$ms[] = 'new_key_invalid';
- } else if ( $key_status == 'failed' ) {
+ 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' );
@@ -90,180 +120,197 @@ function akismet_conf() {
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']) ) {
+ }
+ elseif ( isset( $_POST['check'] ) ) {
+ $show_key_form = true;
+ check_admin_referer( $akismet_nonce );
akismet_get_server_connectivity(0);
}
-
- if ( empty( $key_status) || $key_status != 'valid' ) {
- $key = get_option('wordpress_api_key');
- if ( empty( $key ) ) {
- if ( empty( $key_status ) || $key_status != 'failed' ) {
- if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
- $ms[] = 'no_connection';
- else
- $ms[] = 'key_empty';
- }
- $key_status = 'empty';
- } else {
- $key_status = akismet_verify_key( $key );
+
+ if ( $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 ( $key_status == 'valid' ) {
- $ms[] = 'key_valid';
- } else if ( $key_status == 'invalid' ) {
- delete_option('wordpress_api_key');
- $ms[] = 'key_empty';
- } else if ( !empty($key) && $key_status == 'failed' ) {
- $ms[] = 'key_failed';
+
+ if ( !isset( $_POST['submit'] ) ) {
+ if ( $key_status == 'invalid' )
+ $ms[] = 'key_invalid';
+ elseif ( !empty( $key ) && $key_status == 'failed' )
+ $ms[] = 'key_failed';
}
}
$messages = array(
- 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')),
- 'new_key_valid' => array('color' => '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. (Get your key.)'), 'http://akismet.com/get/')),
- 'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')),
- 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')),
- 'bad_home_url' => array('color' => '888', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the home option.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ),
+ '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 home option.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) )
);
?>
-
-
-
+
+
-
-
-
Sign up success! Please check your email for your Akismet API Key and enter it below.' ); ?>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>
+ 0 ) {
+ if ( $fail_count > 0 && $fail_count < count( $servers ) ) { // some connections work, some fail ?>
+
+
this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>
+ 0 ) { // all connections fail ?>
+
+
Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>
+
+
+
+
+
+
Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>
enter your Akismet API key for it to work.' ), esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), admin_url( 'admin.php' ) ) ) );?>
+
+
'.sprintf( _n( 'Akismet has protected your site from %3$s spam comments.', 'Akismet has protected your site from %3$s spam comments.', $count ), 'http://akismet.com/', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'';
+ echo '
'.sprintf( _n( 'Akismet has protected your site from %3$s spam comments.', 'Akismet has protected your site from %3$s spam comments.', $count ), 'http://akismet.com/?return=true', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'
".__('Akismet has detected a problem.')." ".sprintf(_n('A server or network problem prevented Akismet from checking %d comment. It has been temporarily held for moderation and will be automatically re-checked in %s.', 'A server or network problem prevented Akismet from checking %d comments. They have been temporarily held for moderation and will be automatically re-checked in %s.', $waiting), number_format_i18n( $waiting ), $next_check)."
'.__('Akismet has detected a problem.').' '.sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config').'
+ ';
}
add_action('admin_notices', 'akismet_warning');
return;
@@ -316,10 +414,13 @@ function akismet_comment_row_action( $a, $comment ) {
return $a;
$akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
- $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
+ $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' && $comment_status != 'spam' && $comment_status != 'trash' )
$desc = __( 'Flagged as spam by Akismet' );
@@ -338,15 +439,19 @@ function akismet_comment_row_action( $a, $comment ) {
$b = array();
foreach ( $a as $k => $item ) {
$b[ $k ] = $item;
- if ( $k == 'edit' )
+ if (
+ $k == 'edit'
+ || ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
+ ) {
$b['history'] = ' '. __('History') . '';
+ }
}
$a = $b;
}
if ( $desc )
- echo ''.htmlspecialchars($desc).'';
+ echo ''.esc_html( $desc ).'';
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 );
@@ -367,7 +472,7 @@ function akismet_comment_status_meta_box($comment) {
foreach ( $history as $row ) {
$time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
echo '