Changeset 888811

Timestamp:

04/07/2014 02:30:26 PM (12 years ago)

Author:

eoigal

Message:

• Add support for auto saving users api key when an akismet token is passed from done page
• Add warning notices for pro accounts that are using api key on too many sites
• Fix help text to match the text used on settings page

Location:

akismet/trunk

Files:

• class.akismet-admin.php (modified) (4 diffs)
• views/notice.php (modified) (1 diff)

akismet/trunk/class.akismet-admin.php

@@ -183 +183 @@
                             '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
                             '<p><strong>' . esc_html__( 'API Key' , 'akismet') . '</strong> - ' . esc_html__( 'Enter/remove an API key.' , 'akismet') . '</p>' .
-                            '<p><strong>' . esc_html__( 'Delete spam on posts more than a month old' , 'akismet') . '</strong> - ' . esc_html__( 'Automatically delete spam comments on posts that are older than a month old.' , 'akismet') . '</p>' .
+                            '<p><strong>' . esc_html__( 'Automatically delete spam from posts older than 30 days' , 'akismet') . '</strong> - ' . esc_html__( 'Automatically delete spam comments on posts that are older than 30 days old.' , 'akismet') . '</p>' .
                             '<p><strong>' . esc_html__( 'Show the number of approved comments beside each comment author' , 'akismet') . '</strong> - ' . esc_html__( 'Show the number of approved comments beside each comment author in the comments list page.' , 'akismet') . '</p>',
                     )
@@ -743 +743 @@
         return $akismet_user;
     }
+    
+    public static function verify_wpcom_key( $api_key, $user_id, $token = '' ) {
+        $akismet_account = Akismet::http_post( http_build_query( array(
+            'user_id'          => $user_id,
+            'api_key'          => $api_key,
+            'token'            => $token,
+            'get_account_type' => 'true'
+        ) ), 'verify-wpcom-key' );
+
+        if ( ! empty( $akismet_account[1] ) )
+            $akismet_account = json_decode( $akismet_account[1] );
+
+        Akismet::log( compact( 'akismet_account' ) );
+        
+        return $akismet_account;
+    }
 
     public static function display_alert() {
@@ -788 +804 @@
             return;
         }
-
+        
+        //the user can choose to auto connect their API key by clicking a button on the akismet done page
+        //if jetpack, get verified api key by using connected wpcom user id
+        //if no jetpack, get verified api key by using an akismet token 
+        
         $akismet_user = false;
-
-        if ( class_exists( 'Jetpack' ) ) {
-            if ( $jetpack_user = self::get_jetpack_user() ) {
-
-                $akismet_user = Akismet::http_post( http_build_query( array(
-                    'user_id'          => $jetpack_user['user_id'],
-                    'api_key'          => $jetpack_user['api_key'],
-                    'get_account_type' => 'true'
-                ) ), 'verify-wpcom-key' );
-
-                if ( ! empty( $akismet_user[1] ) )
-                    $akismet_user = json_decode( $akismet_user[1] );
-
-                Akismet::log( compact( 'akismet_user' ) );
-            }
-
-            if ( isset( $_GET['action'] ) ) {
-                if ( $_GET['action'] == 'save-key' ) {
-                    //auto save jetpack user if the correct wp user id is passed back from akismet done page
-                    if ( isset( $_GET['id'] ) && (int) $_GET['id'] == $akismet_user->ID ) {
-                        self::save_key( $akismet_user->api_key );
-                        self::display_notice();
-                        self::display_configuration_page();
-                        return;
-                    }
+        
+        if ( isset( $_GET['token'] ) && preg_match('/^(\d+)-[0-9a-f]{20}$/', $_GET['token'] ) )
+            $akismet_user = self::verify_wpcom_key( '', '', $_GET['token'] );
+        elseif ( $jetpack_user = self::get_jetpack_user() )
+            $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'] );
+            
+        if ( isset( $_GET['action'] ) ) {
+            if ( $_GET['action'] == 'save-key' ) {
+                if ( is_object( $akismet_user ) ) {
+                    self::save_key( $akismet_user->api_key );
+                    self::display_notice();
+                    self::display_configuration_page();
+                    return;             
                 }
             }
@@ -866 +874 @@
                 Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
             }
+            
+            if ( !empty( $akismet_user->limit_reached ) && in_array( $akismet_user->limit_reached, array( 'yellow', 'red' ) ) ) {
+                Akismet::view( 'notice', array( 'type' => 'limit-reached', 'level' => $akismet_user->limit_reached ) );
+            }
         }
         
-        if ( !isset( self::$notices['status'] ) && in_array( $akismet_user->status, array( 'cancelled', 'suspended', 'missing' ) ) )                
+        if ( !isset( self::$notices['status'] ) && in_array( $akismet_user->status, array( 'cancelled', 'suspended', 'missing' ) ) )    
             Akismet::view( 'notice', array( 'type' => $akismet_user->status ) );
 

akismet/trunk/views/notice.php

@@ -79 +79 @@
     <h3 class="key-status"><?php esc_html_e( 'The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' , 'akismet'); ?></h3>
 </div>
+<?php elseif ( $type == 'limit-reached' && in_array( $level, array( 'yellow', 'red' ) ) ) :?>
+<div class="wrap alert critical">
+    <?php if ( $level == 'yellow' ): ?>
+    <h3 class="key-status failed"><?php esc_html_e("You're using your Akismet key on more sites than your Pro subscription allows.", 'akismet'); ?></h3>
+    <p class="description"><?php printf( __('If you would like to use Akismet on more than 10 sites, you will need to <a href="%s" target="_blank">upgrade to an Enterprise subscription</a>. If you have any questions, please <a href="%s" target="_blank">get in touch with our support team</a>', 'akismet'), 'https://akismet.com/account/', 'https://akismet.com/contact/'); ?></p>
+    <?php elseif ( $level == 'red' ): ?>
+    <h3 class="key-status failed"><?php esc_html_e("You're using Akismet on far too many sites for your Pro subscription.", 'akismet'); ?></h3>
+    <p class="description"><?php printf( __('To continue your service, <a href="%s" target="_blank">upgrade to an Enterprise subscription</a>, which covers an unlimited number of sites. Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet'), 'https://akismet.com/account/', 'https://akismet.com/contact/'); ?></p>
+    <?php endif; ?>
+</div>
 <?php endif;?>