Changeset 1815517

Timestamp:

02/05/2018 08:34:50 AM (8 years ago)

Author:

kmgalanakis

Message:

Fix PHP Warnings in 5.x

Location:

dashboard-for-mailgun/trunk

Files:

• application/controllers/class-mailgun-dashboard-dashboard.php (modified) (6 diffs)
• readme.txt (modified) (2 diffs)

dashboard-for-mailgun/trunk/application/controllers/class-mailgun-dashboard-dashboard.php

@@ -38 +38 @@
         );
 
-        define( 'MAILGUN_DASHBOARD_SETTINGS', wp_parse_args( get_option( Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_OPTION_NAME ), $defaults ) );
+        define( 'MAILGUN_DASHBOARD_SETTINGS', serialize( wp_parse_args( get_option( Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_OPTION_NAME ), $defaults ) ) );
     }
 
@@ -64 +64 @@
             true
         );
+
+        $mailgun_dashboard_settings = unserialize( MAILGUN_DASHBOARD_SETTINGS );
 
         //@codingStandardsIgnoreStart
@@ -102 +104 @@
             ),
             'chartTitle' => __( 'Domain', MAILGUN_DASHBOARD_CONTEXT ) .
-                            ' "' .  MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_DOMAIN_OPTION_NAME ] . '" '
+                            ' "' .  $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_DOMAIN_OPTION_NAME ] . '" '
                             . __( 'chart', MAILGUN_DASHBOARD_CONTEXT ),
             'mailgun_api_failed' => __( 'Mailgun API failed', MAILGUN_DASHBOARD_CONTEXT ),
@@ -138 +140 @@
      */
     public function mgd_get_mailgun_dashboard_api() {
+        $mailgun_dashboard_settings = unserialize( MAILGUN_DASHBOARD_SETTINGS );
         if (
             class_exists( 'Mailgun' )
-            && MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_SETTINGS_SOURCE_NAME ]
+            && $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_SETTINGS_SOURCE_NAME ]
         ) {
             $mailgun_options = get_option( 'mailgun' );
@@ -149 +152 @@
 
         } else {
-            $api_key = MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_API_KEY_OPTION_NAME ];
-
-            $domain = MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_DOMAIN_OPTION_NAME ];
+            $api_key = $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_API_KEY_OPTION_NAME ];
+
+            $domain = $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_DOMAIN_OPTION_NAME ];
         }
 
@@ -377 +380 @@
      */
     public function display_settings_warning() {
+        $mailgun_dashboard_settings = unserialize( MAILGUN_DASHBOARD_SETTINGS );
+        
         $show_warning = false;
         if (
-            '' === MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_DOMAIN_OPTION_NAME ]
-            || '' === MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_API_KEY_OPTION_NAME ] ) {
+            '' === $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_DOMAIN_OPTION_NAME ]
+            || '' === $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_API_KEY_OPTION_NAME ] ) {
 
             if (
                 class_exists( 'Mailgun' )
-                && '' !== MAILGUN_DASHBOARD_SETTINGS[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_SETTINGS_SOURCE_NAME ]
+                && '' !== $mailgun_dashboard_settings[ Mailgun_Dashboard_Settings::MAILGUN_DASHBOARD_SETTINGS_SOURCE_NAME ]
             ) {
                 $mailgun_options = get_option( 'mailgun' );

dashboard-for-mailgun/trunk/readme.txt

@@ -43 +43 @@
 == Changelog ==
 
-= 1.0 =
+= 0.1.0 =
 * Release date: 2018-02-04
 * Initial release.
@@ -49 +49 @@
 == Upgrade Notice ==
 
-= 1.0 =
+= 0.1.0 =
 Initial release.