Changeset 2586158

Timestamp:

08/20/2021 07:37:01 PM (5 years ago)

Author:

procifer

Message:

Improve code readability of alert codes for API usage notices.

Location:

akismet/trunk

Files:

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

akismet/trunk/akismet.php

@@ -7 +7 @@
 Plugin URI: https://akismet.com/
 Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam</strong>. It keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key.
-Version: 4.1.11a4
+Version: 4.1.11a5
 Author: Automattic
 Author URI: https://automattic.com/wordpress-plugins/
@@ -38 +38 @@
 }
 
-define( 'AKISMET_VERSION', '4.1.11a4' );
+define( 'AKISMET_VERSION', '4.1.11a5' );
 define( 'AKISMET__MINIMUM_WP_VERSION', '4.0' );
 define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

akismet/trunk/class.akismet-admin.php

@@ -1039 +1039 @@
 
         $alert_code = get_option( 'akismet_alert_code' );
-        if ( preg_match( '/^105\d\d$/', $alert_code ) ) {
+        if ( isset( Akismet::$LIMIT_NOTICES[ $alert_code ] ) ) {
             $notices[] = self::get_usage_limit_alert_data();
         }
@@ -1081 +1081 @@
         
             $alert_code = get_option( 'akismet_alert_code' );
-            if ( preg_match( '/^105\d\d$/', $alert_code ) ) {
+            if ( isset( Akismet::$LIMIT_NOTICES[ $alert_code ] ) ) {
                 self::display_usage_limit_alert();
             }

akismet/trunk/class.akismet.php

@@ -6 +6 @@
     const MAX_DELAY_BEFORE_MODERATION_EMAIL = 86400; // One day in seconds
 
-    const LIMIT_NOTICE_FIRST_MONTH_OVER_LIMIT        = 10501;
-    const LIMIT_NOTICE_SECOND_MONTH_OVER_LIMIT       = 10502;
-    const LIMIT_NOTICE_THIRD_MONTH_APPROACHING_LIMIT = 10504;
-    const LIMIT_NOTICE_THIRD_MONTH_OVER_LIMIT        = 10508;
-    const LIMIT_NOTICE_FOUR_PLUS_MONTHS_OVER_LIMIT   = 10516;
+    public static $LIMIT_NOTICES = array(
+        10501 => 'FIRST_MONTH_OVER_LIMIT',
+        10502 => 'SECOND_MONTH_OVER_LIMIT',
+        10504 => 'THIRD_MONTH_APPROACHING_LIMIT',
+        10508 => 'THIRD_MONTH_OVER_LIMIT',
+        10516 => 'FOUR_PLUS_MONTHS_OVER_LIMIT',
+    );
 
     private static $last_comment = '';

akismet/trunk/views/notice.php

@@ -140 +140 @@
     <?php endif; ?>
 </div>
-<?php elseif ( $type == 'usage-limit' ) :?>
+<?php elseif ( $type == 'usage-limit' && isset( Akismet::$LIMIT_NOTICES[ $code ] ) ) :?>
 <div class="error akismet-usage-limit-alert">
     <div class="akismet-usage-limit-logo">
@@ -148 +148 @@
         <h3>
         <?php
-        switch ( $code ) {
-            case Akismet::LIMIT_NOTICE_FIRST_MONTH_OVER_LIMIT:
-            case Akismet::LIMIT_NOTICE_SECOND_MONTH_OVER_LIMIT:
+        switch ( Akismet::$LIMIT_NOTICES[ $code ] ) {
+            case 'FIRST_MONTH_OVER_LIMIT':
+            case 'SECOND_MONTH_OVER_LIMIT':
                 esc_html_e( 'Your Akismet account usage is over your plan\'s limit', 'akismet' );
                 break;
-            case Akismet::LIMIT_NOTICE_THIRD_MONTH_APPROACHING_LIMIT:
+            case 'THIRD_MONTH_APPROACHING_LIMIT':
                 esc_html_e( 'Your Akismet account usage is approaching your plan\'s limit', 'akismet' );
                 break;
-            case Akismet::LIMIT_NOTICE_THIRD_MONTH_OVER_LIMIT:
-            case Akismet::LIMIT_NOTICE_FOUR_PLUS_MONTHS_OVER_LIMIT:
+            case 'THIRD_MONTH_OVER_LIMIT':
+            case 'FOUR_PLUS_MONTHS_OVER_LIMIT':
                 esc_html_e( 'Your account has been restricted', 'akismet' );
                 break;
@@ -166 +166 @@
         <p>
         <?php
-        switch ( $code ) {
-            case Akismet::LIMIT_NOTICE_FIRST_MONTH_OVER_LIMIT:
+        switch ( Akismet::$LIMIT_NOTICES[ $code ] ) {
+            case 'FIRST_MONTH_OVER_LIMIT':
                 printf(
                     __( 'Since %s, your account made %s API calls, compared to your plan\'s limit of %s. <a href="%s" target="_blank">Learn more</a> about usage limits.', 'akismet' ),
@@ -176 +176 @@
                 );
                 break;
-            case Akismet::LIMIT_NOTICE_SECOND_MONTH_OVER_LIMIT:
+            case 'SECOND_MONTH_OVER_LIMIT':
                 esc_html_e( 'Your Akismet usage has been over your plan\'s limit for two consecutive months. Next month, we will restrict your account after you reach the limit. Please consider upgrading your plan.', 'akismet' );
                 break;
-            case Akismet::LIMIT_NOTICE_THIRD_MONTH_APPROACHING_LIMIT:
+            case 'THIRD_MONTH_APPROACHING_LIMIT':
                 esc_html_e( 'Your Akismet usage is nearing your plan\'s limit for the third consecutive month. We will restrict your account after you reach the limit. Upgrade your plan so Akismet can continue blocking spam.', 'akismet' );
                 break;
-            case Akismet::LIMIT_NOTICE_THIRD_MONTH_OVER_LIMIT:
-            case Akismet::LIMIT_NOTICE_FOUR_PLUS_MONTHS_OVER_LIMIT:
+            case 'THIRD_MONTH_OVER_LIMIT':
+            case 'FOUR_PLUS_MONTHS_OVER_LIMIT':
                 esc_html_e( 'Your Akismet usage has been over your plan\'s limit for three consecutive months. We have restricted your account for the rest of the month. Upgrade your plan so Akismet can continue blocking spam.', 'akismet' );
                 break;