Changeset 883068

Timestamp:

03/27/2014 05:55:35 PM (10 years ago)

Author:

eoigal

Message:

update to check key subscription exists before saving key. Add new notices for missing subscription.

Location:

akismet/trunk

Files:

• class.akismet-admin.php (modified) (5 diffs)
• views/notice.php (modified) (2 diffs)

akismet/trunk/class.akismet-admin.php

@@ -93 +93 @@
                 'strings' => array(
                     'Remove this URL' => __( 'Remove this URL' , 'akismet'),
-                    'Removing...' => __( 'Removing...' , 'akismet'),
-                    'URL removed' => __( 'URL removed' , 'akismet'),
-                    '(undo)' => __( '(undo)' , 'akismet'),
-                    'Re-adding...' => __( 'Re-adding...' , 'akismet'),
+                    'Removing...' => __( 'Removing...' , 'akismet'),
+                    'URL removed' => __( 'URL removed' , 'akismet'),
+                    '(undo)' => __( '(undo)' , 'akismet'),
+                    'Re-adding...' => __( 'Re-adding...' , 'akismet'),
                 )
             ) );
@@ -243 +243 @@
 
         if ( $key_status == 'valid' ) {
-            update_option( 'wordpress_api_key', $api_key );
-            self::$notices[] = 'new-key-valid';
+            $akismet_user = self::get_akismet_user( $api_key );
+            
+            if ( $akismet_user ) {
+                if ( $akismet_user->status != 'missing' )
+                    update_option( 'wordpress_api_key', $api_key );
+                
+                if ( $akismet_user->status == 'active' )
+                    self::$notices['status'] = 'new-key-valid';
+                else
+                    self::$notices['status'] = $akismet_user->status;
+            }
+            else
+                self::$notices['status'] = 'new-key-invalid';
         }
         elseif ( in_array( $key_status, array( 'invalid', 'failed' ) ) )
-            self::$notices[] = 'new-key-'.$key_status;
+            self::$notices[] = 'new-key-'.$key_status;
     }
 
@@ -719 +730 @@
         return $url;
     }
+
+
+
+
+
+
+
+
+
+
+
 
     public static function display_alert() {
@@ -808 +830 @@
     public static function display_configuration_page() {
         $api_key      = Akismet::get_api_key();
-        $akismet_user = Akismet::http_post( http_build_query( array( 'key' => $api_key ) ), 'get-subscription' );
-
-        if ( count( $akismet_user ) > 1 )
-            $akismet_user = json_decode( $akismet_user[1] );
-        else
-            $akismet_user = false;
+        $akismet_user = self::get_akismet_user( $api_key );
 
         $blog = parse_url( get_option('home'), PHP_URL_HOST );
@@ -846 +863 @@
                 Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
             }
-            elseif ( in_array( $akismet_user->status, array( 'cancelled', 'suspended' ) ) )
-                Akismet::view( 'notice', array( 'type' => $akismet_user->status ) );
-        }
+        }
+        
+        if ( !isset( self::$notices['status'] ) && in_array( $akismet_user->status, array( 'cancelled', 'suspended', 'missing' ) ) )                
+            Akismet::view( 'notice', array( 'type' => $akismet_user->status ) );
 
         Akismet::log( compact( 'stat_totals', 'akismet_user' ) );

akismet/trunk/views/notice.php

@@ -42 +42 @@
     <p class="description"><?php printf( __('Your firewall may be blocking us. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'https://blog.akismet.com/akismet-hosting-faq/'); ?></p>
 </div>
-<?php elseif ( $type == 'overdue' ) :?>
+<?php elseif ( $type == '' ) :?>
 <div class="wrap alert critical">
     <h3 class="key-status"><?php esc_html_e("Please update your payment details.", 'akismet'); ?></h3>
@@ -62 +62 @@
     <p class="description"><?php printf( __('You can help us fight spam and upgrade your account by <a href="%s" target="_blank">contributing a token amount</a>.', 'akismet'), 'https://akismet.com/account/upgrade/'); ?></p>
 </div>
+
+
+
+
+
 <?php elseif ( $type == 'new-key-valid' ) :?>
 <div class="wrap alert active">