Changeset 891556

Timestamp:

04/11/2014 09:04:22 PM (10 years ago)

Author:

eoigal

Message:

• Add 'Settings' link to the plugins page
• Update the iframe urls to be protocol relative to avoid using is_ssl
• Tidy up no subscription notice to be less confusing
• Allow key to be saved if the key active, has no sub or if the sub is in dunning
• Change active alert color to akismet green
• Localize the subscription status text

Location:

akismet/trunk

Files:

• _inc/akismet.css (modified) (1 diff)
• class.akismet-admin.php (modified) (6 diffs)
• views/config.php (modified) (3 diffs)
• views/notice.php (modified) (2 diffs)
• views/stats.php (modified) (1 diff)

akismet/trunk/_inc/akismet.css

@@ -212 +212 @@
 
 .alert.active {
-    background-color: #3db238;
+    background-color: #;
 }
 

akismet/trunk/class.akismet-admin.php

@@ -43 +43 @@
         add_filter( 'comment_row_actions', array( 'Akismet_Admin', 'comment_row_action' ), 10, 2 );
         add_filter( 'comment_text', array( 'Akismet_Admin', 'text_add_link_class' ) );
+
+
     }
 
@@ -60 +62 @@
         if ( !current_user_can( 'manage_options' ) )
             return;
+
+
+
+
+
+
     }
 
@@ -245 +253 @@
             $akismet_user = self::get_akismet_user( $api_key );
             
-            if ( $akismet_user ) {
-                if ( $akismet_user->status != 'missing' )
+            if ( $akismet_user ) {
+                if (  )
                     update_option( 'wordpress_api_key', $api_key );
                 
-                if ( $akismet_user->status == 'active' )
+                if ( $akismet_user->status == 'active' )
                     self::$notices['status'] = 'new-key-valid';
                 else
@@ -742 +750 @@
             
         return $akismet_user;
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
     
@@ -841 +862 @@
         $api_key      = Akismet::get_api_key();
         $akismet_user = self::get_akismet_user( $api_key );
+
         
         // If unset, create the new strictness option using the old discard option to determine its default
         if ( get_option( 'akismet_strictness' ) === false )
             add_option( 'akismet_strictness', (get_option('akismet_discard_month') === 'true' ? '1' : '0') );
-
-        $blog = parse_url( get_option('home'), PHP_URL_HOST );
-
-        foreach( array( '6-months', 'all' ) as $interval ) {
-            $response = Akismet::http_post( http_build_query( array( 'blog' => urlencode( $blog ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
-
-            if ( ! empty( $response[1] ) ) {
-                $stat_totals[$interval] = json_decode( $response[1] );
-            }
-        }
 
         if ( empty( self::$notices ) ) {
@@ -884 +896 @@
         }
         
-        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::log( compact( 'stat_totals', 'akismet_user' ) );
-        Akismet::view( 'config', compact( 'api_key', 'blog', 'akismet_user', 'stat_totals' ) );
+        Akismet::view( 'config', compact( 'api_key', 'akismet_user', 'stat_totals' ) );
     }
 

akismet/trunk/views/config.php

@@ -13 +13 @@
                 </span>
 
-                <iframe allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 215px; overflow: hidden;" src="<?php printf( '%s://akismet.com/web/1.0/snapshot.php?blog=%s&api_key=%s&height=180', is_ssl()?'https':'http', $blog, $api_key );?>"></iframe>
+                <iframe allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 215px; overflow: hidden;" src="<?php printf( ', $api_key );?>"></iframe>
                 <ul>
                     <li>
@@ -132 +132 @@
                                             <td width="5%"/>
                                             <td align="left">
-                                                <span><?php echo ucwords( $akismet_user->status ); ?></span>
+                                                <span><?php 
+                                                    if ( 'active-dunning' == $akismet_user->status ) :
+                                                        esc_html_e( 'Active (Dunning)', 'akismet' ); 
+                                                    elseif ( 'cancelled' == $akismet_user->status ) :
+                                                        esc_html_e( 'Cancelled', 'akismet' ); 
+                                                    elseif ( 'suspended' == $akismet_user->status ) :
+                                                        esc_html_e( 'Suspended', 'akismet' );
+                                                    elseif ( 'missing' == $akismet_user->status ) :
+                                                        esc_html_e( 'Missing', 'akismet' ); 
+                                                    elseif ( 'no-sub' == $akismet_user->status ) :
+                                                        esc_html_e( 'No Subscription Found', 'akismet' );
+                                                    else :
+                                                        esc_html_e( 'Active', 'akismet' );  
+                                                    endif; ?></span>
                                             </td>
                                         </tr>
@@ -149 +162 @@
                             <div id="major-publishing-actions">
                                 <div id="publishing-action">
-                                    <?php Akismet::view( 'get', array( 'text' => ( $akismet_user->account_type == 'free-api-key' ? __( 'Upgrade' , 'akismet') : __( 'Change' , 'akismet') ), 'redirect' => 'upgrade' ) ); ?>
+                                    <?php Akismet::view( 'get', array( 'text' => ( $akismet_user->account_type == 'free-api-key' ? __( 'Upgrade' , 'akismet') : __( 'Change' , 'akismet') ), 'redirect' => 'upgrade' ) ); ?>
                                 </div>
                                 <div class="clear"></div>

akismet/trunk/views/notice.php

@@ -64 +64 @@
 <?php elseif ( $type == 'missing' ) :?>
 <div class="wrap alert critical">
-    <h3 class="key-status failed"><?php esc_html_e("Your subscription is missing.", 'akismet'); ?></h3>
+    <h3 class="key-status failed"><?php esc_html_e(, 'akismet'); ?></h3>
     <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
+
+
+
+
+
 </div>
 <?php elseif ( $type == 'new-key-valid' ) :?>
@@ -83 +88 @@
     <?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>
+    <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>
+    <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>

akismet/trunk/views/stats.php

@@ -1 +1 @@
 <div class="wrap">
     <h2><?php esc_html_e( 'Akismet Stats' , 'akismet');?><?php if ( !isset( $hide_settings_link ) ): ?> <a href="<?php echo esc_url( Akismet_Admin::get_page_url() );?>" class="add-new-h2"><?php esc_html_e( 'Settings' , 'akismet');?></a><?php endif;?></h2> 
-    <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', urlencode( get_bloginfo('url') ), Akismet::get_api_key() ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe>
+    <iframe src="<?php echo esc_url( sprintf( '', urlencode( get_bloginfo('url') ), Akismet::get_api_key() ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe>
 </div>