[gentoo-commits] proj/blogs-gentoo:master commit in: plugins/akismet/, plugins/akismet/img/

[Theo Chatzimichos]

commit:     07405d17c3ed619db3d8af200546e157a81ad11b
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 20:00:33 2013 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 20:00:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/blogs-gentoo.git;a=commit;h=07405d17

Update akismet

---
 plugins/akismet/.htaccess       |  11 -------
 plugins/akismet/admin.php       |  62 ++++++++++++++++++++++++----------------
 plugins/akismet/akismet.php     |   4 +--
 plugins/akismet/img/logo.png    | Bin 0 -> 2710 bytes
 plugins/akismet/img/logo@××.png | Bin 0 -> 1467 bytes
 plugins/akismet/readme.txt      |   7 ++++-
 6 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/plugins/akismet/.htaccess b/plugins/akismet/.htaccess
deleted file mode 100644
index cfad468..0000000
--- a/plugins/akismet/.htaccess
+++ /dev/null
@@ -1,11 +0,0 @@
-Order Deny,Allow
-Deny from all
-
-<FilesMatch "^akismet\.(css|js)$">
-	Allow from all
-</FilesMatch>
-
-#allow access to any image
-<FilesMatch "^(.+)\.(png|gif)$">
-	Allow from all
-</FilesMatch>
\ No newline at end of file

diff --git a/plugins/akismet/admin.php b/plugins/akismet/admin.php
index 481b0f3..f807191 100644
--- a/plugins/akismet/admin.php
+++ b/plugins/akismet/admin.php
@@ -39,10 +39,10 @@ function akismet_load_js_and_css() {
 		'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_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' )
@@ -67,11 +67,14 @@ 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/';
-	$api_key       = akismet_get_key();
-	$show_key_form = $api_key;
-	$key_status    = 'empty';
-	$saved_ok      = false;
+	$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();
 
@@ -98,17 +101,17 @@ function akismet_conf() {
 				$ms[] = 'key_empty';
 		}  
 		else
-			$key_status = akismet_verify_key( $key );
-
+			$key_status = akismet_verify_key( $key );		
+		
 		if ( $key != $api_key && $key_status == 'valid' ) {
-			update_option('wordpress_api_key', $key);
 			$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'] ) )
@@ -130,6 +133,9 @@ function akismet_conf() {
 		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
@@ -154,7 +160,14 @@ function akismet_conf() {
 			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.' ) ),
@@ -174,7 +187,7 @@ function akismet_conf() {
 	<?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>' ), esc_url( add_query_arg( array( 'page' => 'akismet-stats-display' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'index.php' ) ) ) ); ?></h2>
+	<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>
@@ -182,10 +195,10 @@ function akismet_conf() {
 			<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 echo esc_attr( __('Create a new Akismet Key') ); ?>"/>
+			<input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Create a new Akismet Key' ); ?>"/>
 		</form>
 		<br/>
-		<a href="#" class="switch-have-key"><?php _e('I already have a key'); ?></a>
+		<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 ) : ?>
@@ -203,7 +216,7 @@ function akismet_conf() {
 					<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_html( 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 ucfirst( $key_status );?></div>
+							<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>
@@ -212,8 +225,8 @@ function akismet_conf() {
 						<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 echo esc_attr( __( '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 echo esc_attr( __( '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>
+							<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>
@@ -301,12 +314,13 @@ function akismet_conf() {
 function akismet_stats_display() {
 	global $akismet_api_host, $akismet_api_port;
 	
-	$blog    = urlencode( get_bloginfo('url') );
-	$api_key = akismet_get_key();?>
+	$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.' ), esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), admin_url( 'admin.php' ) ) ) );?></p></div><?php
+	<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;?>
@@ -368,7 +382,7 @@ function akismet_admin_warnings() {
 					<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="https://akismet.com/get/" method="POST"> 
+					<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 ).'"/>
@@ -376,10 +390,10 @@ function akismet_admin_warnings() {
 							<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 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 class="aa_description">'.__('<strong>Almost done</strong> - activate your account and say goodbye to comment spam').'</div>  
 						</div>  
 					</form>  
 				</div>  

diff --git a/plugins/akismet/akismet.php b/plugins/akismet/akismet.php
index 1e622f6..b0b258d 100644
--- a/plugins/akismet/akismet.php
+++ b/plugins/akismet/akismet.php
@@ -6,7 +6,7 @@
 Plugin Name: Akismet
 Plugin URI: http://akismet.com/?return=true
 Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your Akismet configuration page, and save your API key.
-Version: 2.5.8
+Version: 2.5.9
 Author: Automattic
 Author URI: http://automattic.com/wordpress-plugins/
 License: GPLv2 or later
@@ -34,7 +34,7 @@ if ( !function_exists( 'add_action' ) ) {
 	exit;
 }
 
-define('AKISMET_VERSION', '2.5.8');
+define('AKISMET_VERSION', '2.5.9');
 define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
 
 /** If you hardcode a WP.com API key here, all key config screens will be hidden */

diff --git a/plugins/akismet/img/logo.png b/plugins/akismet/img/logo.png
new file mode 100644
index 0000000..b5f5b9a
Binary files /dev/null and b/plugins/akismet/img/logo.png differ

diff --git a/plugins/akismet/img/logo@××.png b/plugins/akismet/img/logo@××.png
new file mode 100644
index 0000000..80c835b
Binary files /dev/null and b/plugins/akismet/img/logo@××.png differ

diff --git a/plugins/akismet/readme.txt b/plugins/akismet/readme.txt
index 597749e..d0094d2 100644
--- a/plugins/akismet/readme.txt
+++ b/plugins/akismet/readme.txt
@@ -3,7 +3,7 @@ Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eo
 Tags: akismet, comments, spam
 Requires at least: 3.0
 Tested up to: 3.6
-Stable tag: 2.5.8
+Stable tag: 2.5.9
 License: GPLv2 or later
 
 Akismet checks your comments against the Akismet web service to see if they look like spam or not.
@@ -31,6 +31,11 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
 
 == Changelog ==
 
+= 2.5.9 =
+* Update 'Already have a key' link to redirect page rather than depend on javascript
+* Fix some non-translatable strings to be translatable
+* Update Activation banner in plugins page to redirect user to Akismet config page
+
 = 2.5.8 =
 * Simplify the activation process for new users
 * Remove the reporter_ip parameter