X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/00dbffaf1593b0ac719d98f00839221a9ca52133..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-content/plugins/akismet/admin.php
diff --git a/wp-content/plugins/akismet/admin.php b/wp-content/plugins/akismet/admin.php
index 9d7673f5..f8071916 100644
--- a/wp-content/plugins/akismet/admin.php
+++ b/wp-content/plugins/akismet/admin.php
@@ -10,9 +10,9 @@ function akismet_admin_init() {
if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) {
function akismet_version_warning() {
- echo "
-
- ";
+ echo '
+
+ ';
}
add_action('admin_notices', 'akismet_version_warning');
@@ -31,17 +31,18 @@ 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' );
+ 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.4.6' );
+ 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' )
@@ -64,35 +65,54 @@ 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/';
+ $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 ( 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 {
- $key_status = akismet_verify_key( $key );
- }
- if ( $key_status == 'valid' ) {
- update_option('wordpress_api_key', $key);
+ 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';
- } else if ( $key_status == 'invalid' ) {
+ update_option('wordpress_api_key', $key);
+ }
+ 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' );
@@ -103,157 +123,208 @@ 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 );
+ 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 ( $key_status == 'valid' ) {
- $ms[] = 'key_valid';
- } else if ( $key_status == 'invalid' ) {
- $ms[] = 'key_invalid';
- } 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';
}
- }
+ }
+
+ $key_status_strings = array(
+ 'empty' => __( 'Empty' ),
+ 'valid' => __( 'Valid' ),
+ 'invalid' => __( 'Invalid' ),
+ 'failed' => __( '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/?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 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.' ); ?>
-
-
+
+
+
+
+
-
-
- 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );?>
+
+
+
enter your Akismet API key for it to work.' ), $config_link );?>
+
+
-
Akismet Error Code:
+
:
-
More information is available at https://akismet.com/errors/
+
%s' , 'https://akismet.com/errors/'.$alert['code'], 'https://akismet.com/errors/'.$alert['code'] );?>
+
".__('Akismet is almost ready.')." ".sprintf(__('You must enter your Akismet API key for it to work.'), "admin.php?page=akismet-key-config")."
- ";
+ global $hook_suffix, $current_user;
+
+ if ( $hook_suffix == 'plugins.php' ) {
+ echo '
+
+ ';
+ }
}
+
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') ) {
@@ -314,9 +410,9 @@ function akismet_admin_warnings() {
$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 "
- ".__('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')."
'.__('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').'
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . ' - ';
- echo htmlspecialchars( $row['message'] ) . '
';
+ echo esc_html( $row['message'] ) . '';
}
echo '';
@@ -418,7 +514,7 @@ function akismet_comment_column_row( $column, $comment_id ) {
echo '';
foreach ( $history as $row ) {
echo '- ' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '
';
- echo '- ' . htmlspecialchars( $row['message'] ) . '
';
+ echo '- ' . esc_html( $row['message'] ) . '
';
}
echo '
';
@@ -430,18 +526,16 @@ 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 '';
- else
- return '';
+function akismet_text_add_link_callback( $m ) {
+ // bare link?
+ if ( $m[4] == $m[2] )
+ return '';
+ else
+ return '';
}
function akismet_text_add_link_class( $comment_text ) {
-
- return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', 'akismet_text_add_link_callback', $comment_text );
+ return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', 'akismet_text_add_link_callback', $comment_text );
}
add_filter('comment_text', 'akismet_text_add_link_class');
@@ -516,7 +610,6 @@ function akismet_submit_nonspam_comment ( $comment_id ) {
$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;
}
@@ -568,7 +661,6 @@ function akismet_submit_spam_comment ( $comment_id ) {
$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;
}
@@ -822,12 +914,12 @@ function akismet_admin_menu() {
}
}
-function 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' ), __( '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 Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+ 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');
}
}