awesomemotive / google-analytics-for-wordpress

includes/admin/reporting.php

Spacing +29 added lines, -29 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -66,39 +66,39 @@ 
 		// Get object 
 		$this->base        		  = MonsterInsights();
 		$this->client       	  = $this->base->ga;
-		$this->dashboard_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
-		$this->dashboard_report   = monsterinsights_get_option( 'dashboard_report', 'overview' );
+		$this->dashboard_disabled = monsterinsights_get_option('dashboards_disabled', false);
+		$this->dashboard_report   = monsterinsights_get_option('dashboard_report', 'overview');
 
-		if ( isset( $this->client->status ) && $this->client->status === 'valid' ) {
+		if (isset($this->client->status) && $this->client->status === 'valid') {
 			// Cron actions
 				// Add cron if its not there
-				add_action( 'wp', array( $this, 'schedule_cron' ) );
+				add_action('wp', array($this, 'schedule_cron'));
 				
 				// Collect analytics data on cron event
-				add_action( 'monsterinsights_daily_cron', array( $this, 'run_cron' ) );
+				add_action('monsterinsights_daily_cron', array($this, 'run_cron'));
 
 				// If cron did not run for some reason (no users visited site), run it now
-				if ( filter_input( INPUT_GET, 'page' ) === 'monsterinsights_dashboard' || filter_input( INPUT_GET, 'page' ) === 'monsterinsights_reports' ) {
-					add_action( 'admin_init', array( $this, 'maybe_get_data' ) );
+				if (filter_input(INPUT_GET, 'page') === 'monsterinsights_dashboard' || filter_input(INPUT_GET, 'page') === 'monsterinsights_reports') {
+					add_action('admin_init', array($this, 'maybe_get_data'));
 				}
 		}
 
 
 		// Dashboard disabled setting
-		add_action( 'monsterinsights_settings_save_general', array( $this, 'dashboard_disabled' ), 9 );
+		add_action('monsterinsights_settings_save_general', array($this, 'dashboard_disabled'), 9);
 	}
 
 	public function dashboard_disabled( ) {
-		$dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
-		$dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
+		$dashboards_disabled     = isset($_POST['dashboards_disabled']) ? 1 : 0;
+		$dashboards_disabled_old = monsterinsights_get_option('dashboards_disabled', false);
 
 		// We only care if the switch is going on or off
-		if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
+		if ($dashboards_disabled && ! $dashboards_disabled_old) {
 			// The dashboards are now being disabled
 				// Clear data + last run + failed
 				$this->delete_aggregate_data();
 
-		} else if ( ! $dashboards_disabled && $dashboards_disabled_old ){
+		} else if ( ! $dashboards_disabled && $dashboards_disabled_old) {
 			// The dashboards are now being enabled
 				// Refresh data + schedule cron
 				$this->refresh_aggregate_data();
@@ -107,38 +107,38 @@ 
 	}
 
 	public function schedule_cron() {
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+		if ( ! wp_next_scheduled('monsterinsights_daily_cron')) {
 			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+			wp_schedule_event(strtotime(date('Y-m-d', strtotime('tomorrow')) . ' 00:01:00 '), 'daily', 'monsterinsights_daily_cron');
 		}
 	}
 
 	public function maybe_get_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+		if ( ! current_user_can('monsterinsights_view_dashboard')) {
 			return false;
 		}
 
-		$last_run = monsterinsights_get_option( 'cron_last_run', false );
+		$last_run = monsterinsights_get_option('cron_last_run', false);
 
 		// See if issue connecting or expired
-		if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date('Ymd', time() ) ) { 
+		if ($last_run === false || monsterinsights_hours_between($last_run) >= 24 || date('Ymd', $last_run) !== date('Ymd', time())) { 
 			$this->run_cron();
 		}
 	}
 
 	public function run_cron() {
-		if ( $this->dashboard_disabled ) {
+		if ($this->dashboard_disabled) {
 			return;
 		}
 
-		if ( is_numeric( (int) $this->client->profile ) && $this->client->status === 'valid' ) {
+		if (is_numeric((int) $this->client->profile) && $this->client->status === 'valid') {
 			// Profile is set
 			$this->add_aggregate_data();
 		}
 	}
 
 	public function refresh_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+		if ( ! current_user_can('monsterinsights_view_dashboard')) {
 			return false;
 		}
 
@@ -147,7 +147,7 @@ 
 	}
 
 	private function add_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+		if ( ! current_user_can('monsterinsights_view_dashboard')) {
 			return false;
 		}
 		/** 
@@ -157,13 +157,13 @@ 
 		 * not be used by other developers. This hook's behavior may be modified
 		 * or the hook may be removed at any time, without warning.
 		 */
-		do_action( 'monsterinsights_add_aggregate_data', $this->client, $this->client->profile );
-		monsterinsights_update_option( 'cron_last_run', time() );
-		monsterinsights_delete_option( 'cron_failed' );
+		do_action('monsterinsights_add_aggregate_data', $this->client, $this->client->profile);
+		monsterinsights_update_option('cron_last_run', time());
+		monsterinsights_delete_option('cron_failed');
 	}
 
 	public function delete_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+		if ( ! current_user_can('monsterinsights_view_dashboard')) {
 			return false;
 		}
 		/** 
@@ -173,13 +173,13 @@ 
 		 * not be used by other developers. This hook's behavior may be modified
 		 * or the hook may be removed at any time, without warning.
 		 */
-		if ( ! empty( $this->client ) && ! empty( $this->client->profile ) ) {
-			do_action( 'monsterinsights_delete_aggregate_data', $this->client, $this->client->profile );
+		if ( ! empty($this->client) && ! empty($this->client->profile)) {
+			do_action('monsterinsights_delete_aggregate_data', $this->client, $this->client->profile);
 		}
 		$options = array(
 			'cron_failed',
 			'cron_last_run',
 		);
-		monsterinsights_delete_options( $options );
+		monsterinsights_delete_options($options);
 	}
 }
\ No newline at end of file

Indentation +163 added lines, -163 removed lines

@@ -14,172 +14,172 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 final class MonsterInsights_Reporting {
 
-	/**
-	 * Holds the base object.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights $base MonsterInsights Base object.
-	 */
-	public $base;
-
-	/**
-	 * Holds the GA client object if using oAuth.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights_GA_Client $client GA client object.
-	 */
-	public $client;
-
-	/**
-	 * Is the dashboard/reporting pages disabled?
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var bool $dashboard_disabled If the dashboard is disabled.
-	 */
-	public $dashboard_disabled;
-
-	/**
-	 * Dashboard report
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var string $dashboard_report Report hook name of dashboard report.
-	 */
-	public $dashboard_report;
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 */
-	public function __construct( ) {
-
-		// Get object 
-		$this->base        		  = MonsterInsights();
-		$this->client       	  = $this->base->ga;
-		$this->dashboard_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
-		$this->dashboard_report   = monsterinsights_get_option( 'dashboard_report', 'overview' );
-
-		if ( isset( $this->client->status ) && $this->client->status === 'valid' ) {
-			// Cron actions
-				// Add cron if its not there
-				add_action( 'wp', array( $this, 'schedule_cron' ) );
+    /**
+     * Holds the base object.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var MonsterInsights $base MonsterInsights Base object.
+     */
+    public $base;
+
+    /**
+     * Holds the GA client object if using oAuth.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var MonsterInsights_GA_Client $client GA client object.
+     */
+    public $client;
+
+    /**
+     * Is the dashboard/reporting pages disabled?
+     *
+     * @access public
+     * @since 6.0.0
+     * @var bool $dashboard_disabled If the dashboard is disabled.
+     */
+    public $dashboard_disabled;
+
+    /**
+     * Dashboard report
+     *
+     * @access public
+     * @since 6.0.0
+     * @var string $dashboard_report Report hook name of dashboard report.
+     */
+    public $dashboard_report;
+
+    /**
+     * Primary class constructor.
+     *
+     * @access public
+     * @since 6.0.0
+     */
+    public function __construct( ) {
+
+        // Get object 
+        $this->base        		  = MonsterInsights();
+        $this->client       	  = $this->base->ga;
+        $this->dashboard_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
+        $this->dashboard_report   = monsterinsights_get_option( 'dashboard_report', 'overview' );
+
+        if ( isset( $this->client->status ) && $this->client->status === 'valid' ) {
+            // Cron actions
+                // Add cron if its not there
+                add_action( 'wp', array( $this, 'schedule_cron' ) );
 				
-				// Collect analytics data on cron event
-				add_action( 'monsterinsights_daily_cron', array( $this, 'run_cron' ) );
-
-				// If cron did not run for some reason (no users visited site), run it now
-				if ( filter_input( INPUT_GET, 'page' ) === 'monsterinsights_dashboard' || filter_input( INPUT_GET, 'page' ) === 'monsterinsights_reports' ) {
-					add_action( 'admin_init', array( $this, 'maybe_get_data' ) );
-				}
-		}
-
-
-		// Dashboard disabled setting
-		add_action( 'monsterinsights_settings_save_general', array( $this, 'dashboard_disabled' ), 9 );
-	}
-
-	public function dashboard_disabled( ) {
-		$dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
-		$dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
-
-		// We only care if the switch is going on or off
-		if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
-			// The dashboards are now being disabled
-				// Clear data + last run + failed
-				$this->delete_aggregate_data();
-
-		} else if ( ! $dashboards_disabled && $dashboards_disabled_old ){
-			// The dashboards are now being enabled
-				// Refresh data + schedule cron
-				$this->refresh_aggregate_data();
-				$this->schedule_cron();
-		}
-	}
-
-	public function schedule_cron() {
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
-			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
-		}
-	}
-
-	public function maybe_get_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-
-		$last_run = monsterinsights_get_option( 'cron_last_run', false );
-
-		// See if issue connecting or expired
-		if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date('Ymd', time() ) ) { 
-			$this->run_cron();
-		}
-	}
-
-	public function run_cron() {
-		if ( $this->dashboard_disabled ) {
-			return;
-		}
-
-		if ( is_numeric( (int) $this->client->profile ) && $this->client->status === 'valid' ) {
-			// Profile is set
-			$this->add_aggregate_data();
-		}
-	}
-
-	public function refresh_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-
-		$this->delete_aggregate_data();
-		$this->add_aggregate_data();
-	}
-
-	private function add_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-		/** 
-		 * Developer Alert:
-		 *
-		 * Per the README, this is considered an internal hook and should
-		 * not be used by other developers. This hook's behavior may be modified
-		 * or the hook may be removed at any time, without warning.
-		 */
-		do_action( 'monsterinsights_add_aggregate_data', $this->client, $this->client->profile );
-		monsterinsights_update_option( 'cron_last_run', time() );
-		monsterinsights_delete_option( 'cron_failed' );
-	}
-
-	public function delete_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-		/** 
-		 * Developer Alert:
-		 *
-		 * Per the README, this is considered an internal hook and should
-		 * not be used by other developers. This hook's behavior may be modified
-		 * or the hook may be removed at any time, without warning.
-		 */
-		if ( ! empty( $this->client ) && ! empty( $this->client->profile ) ) {
-			do_action( 'monsterinsights_delete_aggregate_data', $this->client, $this->client->profile );
-		}
-		$options = array(
-			'cron_failed',
-			'cron_last_run',
-		);
-		monsterinsights_delete_options( $options );
-	}
+                // Collect analytics data on cron event
+                add_action( 'monsterinsights_daily_cron', array( $this, 'run_cron' ) );
+
+                // If cron did not run for some reason (no users visited site), run it now
+                if ( filter_input( INPUT_GET, 'page' ) === 'monsterinsights_dashboard' || filter_input( INPUT_GET, 'page' ) === 'monsterinsights_reports' ) {
+                    add_action( 'admin_init', array( $this, 'maybe_get_data' ) );
+                }
+        }
+
+
+        // Dashboard disabled setting
+        add_action( 'monsterinsights_settings_save_general', array( $this, 'dashboard_disabled' ), 9 );
+    }
+
+    public function dashboard_disabled( ) {
+        $dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
+        $dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
+
+        // We only care if the switch is going on or off
+        if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
+            // The dashboards are now being disabled
+                // Clear data + last run + failed
+                $this->delete_aggregate_data();
+
+        } else if ( ! $dashboards_disabled && $dashboards_disabled_old ){
+            // The dashboards are now being enabled
+                // Refresh data + schedule cron
+                $this->refresh_aggregate_data();
+                $this->schedule_cron();
+        }
+    }
+
+    public function schedule_cron() {
+        if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+            // Set the next event of fetching data
+            wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+        }
+    }
+
+    public function maybe_get_data() {
+        if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+            return false;
+        }
+
+        $last_run = monsterinsights_get_option( 'cron_last_run', false );
+
+        // See if issue connecting or expired
+        if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date('Ymd', time() ) ) { 
+            $this->run_cron();
+        }
+    }
+
+    public function run_cron() {
+        if ( $this->dashboard_disabled ) {
+            return;
+        }
+
+        if ( is_numeric( (int) $this->client->profile ) && $this->client->status === 'valid' ) {
+            // Profile is set
+            $this->add_aggregate_data();
+        }
+    }
+
+    public function refresh_aggregate_data() {
+        if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+            return false;
+        }
+
+        $this->delete_aggregate_data();
+        $this->add_aggregate_data();
+    }
+
+    private function add_aggregate_data() {
+        if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+            return false;
+        }
+        /** 
+         * Developer Alert:
+         *
+         * Per the README, this is considered an internal hook and should
+         * not be used by other developers. This hook's behavior may be modified
+         * or the hook may be removed at any time, without warning.
+         */
+        do_action( 'monsterinsights_add_aggregate_data', $this->client, $this->client->profile );
+        monsterinsights_update_option( 'cron_last_run', time() );
+        monsterinsights_delete_option( 'cron_failed' );
+    }
+
+    public function delete_aggregate_data() {
+        if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+            return false;
+        }
+        /** 
+         * Developer Alert:
+         *
+         * Per the README, this is considered an internal hook and should
+         * not be used by other developers. This hook's behavior may be modified
+         * or the hook may be removed at any time, without warning.
+         */
+        if ( ! empty( $this->client ) && ! empty( $this->client->profile ) ) {
+            do_action( 'monsterinsights_delete_aggregate_data', $this->client, $this->client->profile );
+        }
+        $options = array(
+            'cron_failed',
+            'cron_last_run',
+        );
+        monsterinsights_delete_options( $options );
+    }
 }
\ No newline at end of file

includes/admin/googleauth.php

Spacing +76 added lines, -76 removed lines

@@ -10,47 +10,47 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
-function monsterinsights_google_auth_start_view( $reauth = false ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_start_view' : 'monsterinsights_google_auth_start_view' ;
+function monsterinsights_google_auth_start_view($reauth = false) {
+    $class = ($reauth) ? 'monsterinsights_google_auth_reauth_start_view' : 'monsterinsights_google_auth_start_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
-        <?php if ( $reauth ) { ?>
+        <?php if ($reauth) { ?>
         <div id="monsterinsights_google_auth_box_header">
                 <div class="monsterinsights_google_auth_box_header_reauth">
-                    <?php esc_html_e( 'This process will replace your current Google Analytics connection.', 'google-analytics-for-wordpress' ); ?> 
-                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>" > 
-                        <?php esc_html_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>
+                    <?php esc_html_e('This process will replace your current Google Analytics connection.', 'google-analytics-for-wordpress'); ?> 
+                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Cancel', 'google-analytics-for-wordpress'); ?>" > 
+                        <?php esc_html_e('Cancel', 'google-analytics-for-wordpress'); ?>
                     </a> 
                 </div>
         </div>
          <?php } ?>
-         <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
-            <?php if ( $reauth ) { ?>
-                <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'RE-AUTHENTICATE', 'google-analytics-for-wordpress' ); ?> </div>
-                <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'Re-authenticate your Google Analytics account with MonsterInsights', 'google-analytics-for-wordpress' ); ?> </div>
+         <div id="monsterinsights_google_auth_box_contents" <?php if ($reauth) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
+            <?php if ($reauth) { ?>
+                <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e('RE-AUTHENTICATE', 'google-analytics-for-wordpress'); ?> </div>
+                <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e('Re-authenticate your Google Analytics account with MonsterInsights', 'google-analytics-for-wordpress'); ?> </div>
             <?php } else {  ?>
-                <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'AUTHENTICATION', 'google-analytics-for-wordpress' ); ?> </div>
-                <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'Authenticate your Google Analytics account with MonsterInsights', 'google-analytics-for-wordpress' ); ?> </div>
+                <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e('AUTHENTICATION', 'google-analytics-for-wordpress'); ?> </div>
+                <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e('Authenticate your Google Analytics account with MonsterInsights', 'google-analytics-for-wordpress'); ?> </div>
             <?php } ?>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'start';?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'start'; ?>">
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
-                <a href="#" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>" > <?php esc_html_e( 'CANCEL', 'google-analytics-for-wordpress' ); ?></a> 
+                <a href="#" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Cancel', 'google-analytics-for-wordpress'); ?>" > <?php esc_html_e('CANCEL', 'google-analytics-for-wordpress'); ?></a> 
             </div>
             <div id="monsterinsights_google_auth_box_footer_center">
                 &nbsp;
             </div>
             <div id="monsterinsights_google_auth_box_footer_right">
-                <a href="#" id="monsterinsights_google_auth_box_next" class="monsterinsights_google_auth_box_next" title="<?php esc_attr_e( 'Next', 'google-analytics-for-wordpress' ); ?>" >
+                <a href="#" id="monsterinsights_google_auth_box_next" class="monsterinsights_google_auth_box_next" title="<?php esc_attr_e('Next', 'google-analytics-for-wordpress'); ?>" >
                     <div id="monsterinsights_google_auth_box_footer_right_next">
-                         <?php esc_html_e( 'NEXT', 'google-analytics-for-wordpress' ); ?> 
+                         <?php esc_html_e('NEXT', 'google-analytics-for-wordpress'); ?> 
                     </div>
                 </a>
             </div>
@@ -61,44 +61,44 @@ 
     ob_end_clean();
     return $contents;
 }
-function monsterinsights_google_auth_enterkey_view( $reauth = false, $auth_url = '', $error = '' ) {
-    $class    = ( $reauth ) ? 'monsterinsights_google_auth_reauth_enterkey_view' : 'monsterinsights_google_auth_enterkey_view' ;
-    $auth_url = esc_js( esc_url( $auth_url ) );
+function monsterinsights_google_auth_enterkey_view($reauth = false, $auth_url = '', $error = '') {
+    $class    = ($reauth) ? 'monsterinsights_google_auth_reauth_enterkey_view' : 'monsterinsights_google_auth_enterkey_view';
+    $auth_url = esc_js(esc_url($auth_url));
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
-        <?php if ( $reauth ) { ?>
+        <?php if ($reauth) { ?>
         <div id="monsterinsights_google_auth_box_header">
                 <div class="monsterinsights_google_auth_box_header_reauth">
-                    <?php esc_html_e( 'This process will replace your current Google Analytics connection.', 'google-analytics-for-wordpress' ); ?> 
-                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>" > 
-                        <?php esc_html_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>
+                    <?php esc_html_e('This process will replace your current Google Analytics connection.', 'google-analytics-for-wordpress'); ?> 
+                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Cancel', 'google-analytics-for-wordpress'); ?>" > 
+                        <?php esc_html_e('Cancel', 'google-analytics-for-wordpress'); ?>
                     </a> 
                 </div>
         </div>
          <?php } ?>
-         <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
-            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_enterkey_view_title"><?php esc_html_e( 'ENTER GOOGLE CODE', 'google-analytics-for-wordpress' ); ?> </div>
-            <a id="monsterinsights-google-oauth-window" class="button" onclick="monsterinsights_popupwindow('<?php echo esc_js( esc_attr( esc_url( $auth_url ) ) );  ?>',500,500);"><?php esc_html_e( 'Click To Get Google Code', 'google-analytics-for-wordpress' ); ?> </a>
-            <label for="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_label_enterkey_view"><?php esc_html_e( 'Copy the Google code into the box below and click next', 'google-analytics-for-wordpress' ); ?> </label>
-            <input type="text"   id="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_enterkey_view" name="monsterinsights_step_data" placeholder="<?php esc_html_e( 'Paste Google Code here', 'google-analytics-for-wordpress'); ?>">
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'enterkey';?>">
-            <?php if ( ! empty( $error ) ) { ?>
-                <div class="monsterinsights_google_auth_enterkey_error notice notice-warning" style="margin:0px;padding:0px;"><p><?php esc_html_e( $error ); ?><p></div>
+         <div id="monsterinsights_google_auth_box_contents" <?php if ($reauth) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
+            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_enterkey_view_title"><?php esc_html_e('ENTER GOOGLE CODE', 'google-analytics-for-wordpress'); ?> </div>
+            <a id="monsterinsights-google-oauth-window" class="button" onclick="monsterinsights_popupwindow('<?php echo esc_js(esc_attr(esc_url($auth_url))); ?>',500,500);"><?php esc_html_e('Click To Get Google Code', 'google-analytics-for-wordpress'); ?> </a>
+            <label for="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_label_enterkey_view"><?php esc_html_e('Copy the Google code into the box below and click next', 'google-analytics-for-wordpress'); ?> </label>
+            <input type="text"   id="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_enterkey_view" name="monsterinsights_step_data" placeholder="<?php esc_html_e('Paste Google Code here', 'google-analytics-for-wordpress'); ?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'enterkey'; ?>">
+            <?php if ( ! empty($error)) { ?>
+                <div class="monsterinsights_google_auth_enterkey_error notice notice-warning" style="margin:0px;padding:0px;"><p><?php esc_html_e($error); ?><p></div>
             <?php } ?>
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
-                <a href="#" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>" > <?php esc_html_e( 'CANCEL', 'google-analytics-for-wordpress' ); ?></a> 
+                <a href="#" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Cancel', 'google-analytics-for-wordpress'); ?>" > <?php esc_html_e('CANCEL', 'google-analytics-for-wordpress'); ?></a> 
             </div>
             <div id="monsterinsights_google_auth_box_footer_center">
                 &nbsp;
             </div>
             <div id="monsterinsights_google_auth_box_footer_right">
-                <a href="#" id="monsterinsights_google_auth_box_next" class="monsterinsights_google_auth_box_next" title="<?php esc_attr_e( 'Next', 'google-analytics-for-wordpress' ); ?>" >
+                <a href="#" id="monsterinsights_google_auth_box_next" class="monsterinsights_google_auth_box_next" title="<?php esc_attr_e('Next', 'google-analytics-for-wordpress'); ?>" >
                     <div id="monsterinsights_google_auth_box_footer_right_next">
-                         <?php esc_html_e( 'NEXT', 'google-analytics-for-wordpress' ); ?> 
+                         <?php esc_html_e('NEXT', 'google-analytics-for-wordpress'); ?> 
                     </div>
                 </a>
             </div>
@@ -109,43 +109,43 @@ 
     ob_end_clean();
     return $contents;    
 }
-function monsterinsights_google_auth_selectprofile_view( $reauth = false, $selectprofile = '', $error = '' ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_selectprofile_view' : 'monsterinsights_google_auth_selectprofile_view' ;
+function monsterinsights_google_auth_selectprofile_view($reauth = false, $selectprofile = '', $error = '') {
+    $class = ($reauth) ? 'monsterinsights_google_auth_reauth_selectprofile_view' : 'monsterinsights_google_auth_selectprofile_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
-        <?php if ( $reauth ) { ?>
+        <?php if ($reauth) { ?>
         <div id="monsterinsights_google_auth_box_header">
                 <div class="monsterinsights_google_auth_box_header_reauth">
-                    <?php esc_html_e( 'This process will replace your current Google Analytics connection.', 'google-analytics-for-wordpress' ); ?> 
-                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>" > 
-                        <?php esc_html_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>
+                    <?php esc_html_e('This process will replace your current Google Analytics connection.', 'google-analytics-for-wordpress'); ?> 
+                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Cancel', 'google-analytics-for-wordpress'); ?>" > 
+                        <?php esc_html_e('Cancel', 'google-analytics-for-wordpress'); ?>
                     </a> 
                 </div>
         </div>
          <?php } ?>
-         <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
+         <div id="monsterinsights_google_auth_box_contents" <?php if ($reauth) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
 
-            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'SELECT PROFILE', 'google-analytics-for-wordpress' ); ?> </div>
-            <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'Select the Google Analytics Profile to Use', 'google-analytics-for-wordpress' ); ?> </div>
+            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e('SELECT PROFILE', 'google-analytics-for-wordpress'); ?> </div>
+            <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e('Select the Google Analytics Profile to Use', 'google-analytics-for-wordpress'); ?> </div>
             <?php echo $selectprofile; ?>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'selectprofile';?>">
-            <?php if ( ! empty( $error ) ) { ?>
-                <div class="monsterinsights_google_auth_selectprofile_error notice notice-warning" style="margin:0px;padding:0px;"><p><?php esc_html_e( $error ); ?><p></div>
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'selectprofile'; ?>">
+            <?php if ( ! empty($error)) { ?>
+                <div class="monsterinsights_google_auth_selectprofile_error notice notice-warning" style="margin:0px;padding:0px;"><p><?php esc_html_e($error); ?><p></div>
             <?php } ?>
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
-                <a href="#" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Cancel', 'google-analytics-for-wordpress' ); ?>" > <?php esc_html_e( 'CANCEL', 'google-analytics-for-wordpress' ); ?></a> 
+                <a href="#" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Cancel', 'google-analytics-for-wordpress'); ?>" > <?php esc_html_e('CANCEL', 'google-analytics-for-wordpress'); ?></a> 
             </div>
             <div id="monsterinsights_google_auth_box_footer_center">
                 &nbsp;
             </div>
             <div id="monsterinsights_google_auth_box_footer_right">
-                <a href="#" id="monsterinsights_google_auth_box_next" class="monsterinsights_google_auth_box_next" title="<?php esc_attr_e( 'Next', 'google-analytics-for-wordpress' ); ?>" >
+                <a href="#" id="monsterinsights_google_auth_box_next" class="monsterinsights_google_auth_box_next" title="<?php esc_attr_e('Next', 'google-analytics-for-wordpress'); ?>" >
                     <div id="monsterinsights_google_auth_box_footer_right_next">
-                         <?php esc_html_e( 'NEXT', 'google-analytics-for-wordpress' ); ?> 
+                         <?php esc_html_e('NEXT', 'google-analytics-for-wordpress'); ?> 
                     </div>
                 </a>
             </div>
@@ -156,23 +156,23 @@ 
     ob_end_clean();
     return $contents;  
 }
-function monsterinsights_google_auth_done_view( $reauth = false ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_done_view' : 'monsterinsights_google_auth_done_view' ;
+function monsterinsights_google_auth_done_view($reauth = false) {
+    $class = ($reauth) ? 'monsterinsights_google_auth_reauth_done_view' : 'monsterinsights_google_auth_done_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
-        <?php if ( $reauth ) { ?>
+        <?php if ($reauth) { ?>
         <div id="monsterinsights_google_auth_box_header">
                 <div class="monsterinsights_google_auth_box_header_reauth">
-                    <?php esc_html_e( 'Your Google connection has been replaced.', 'google-analytics-for-wordpress' ); ?> 
+                    <?php esc_html_e('Your Google connection has been replaced.', 'google-analytics-for-wordpress'); ?> 
                 </div>
         </div>
          <?php } ?>
-         <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
-            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'DONE', 'google-analytics-for-wordpress' ); ?> </div>
-            <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'You\'re all set!', 'google-analytics-for-wordpress' ); ?> </div>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done';?>">
+         <div id="monsterinsights_google_auth_box_contents" <?php if ($reauth) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
+            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e('DONE', 'google-analytics-for-wordpress'); ?> </div>
+            <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e('You\'re all set!', 'google-analytics-for-wordpress'); ?> </div>
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done'; ?>">
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
@@ -182,9 +182,9 @@ 
                 &nbsp;
             </div>
             <div id="monsterinsights_google_auth_box_footer_right">
-                <a href="#" id="monsterinsights_google_auth_box_done" class="monsterinsights_google_auth_box_done" title="<?php esc_attr_e( 'Save and close', 'google-analytics-for-wordpress' ); ?>" >
+                <a href="#" id="monsterinsights_google_auth_box_done" class="monsterinsights_google_auth_box_done" title="<?php esc_attr_e('Save and close', 'google-analytics-for-wordpress'); ?>" >
                     <div id="monsterinsights_google_auth_box_footer_right_next">
-                         <?php esc_html_e( 'CLOSE', 'google-analytics-for-wordpress' ); ?> 
+                         <?php esc_html_e('CLOSE', 'google-analytics-for-wordpress'); ?> 
                     </div>
                 </a>
             </div>
@@ -196,26 +196,26 @@ 
     return $contents;  
 }
 
-function monsterinsights_google_auth_error_view( $reauth = false, $error = '' ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_exit_view' : 'monsterinsights_google_auth_exit_view' ;
+function monsterinsights_google_auth_error_view($reauth = false, $error = '') {
+    $class = ($reauth) ? 'monsterinsights_google_auth_reauth_exit_view' : 'monsterinsights_google_auth_exit_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
-        <?php if ( $reauth ) { ?>
+        <?php if ($reauth) { ?>
         <div id="monsterinsights_google_auth_box_header">
                 <div class="monsterinsights_google_auth_box_header_reauth">
-                    <?php esc_html_e( 'An error has occured.', 'google-analytics-for-wordpress' ); ?> 
-                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e( 'Exit', 'google-analytics-for-wordpress' ); ?>" > 
-                        <?php esc_html_e( 'Exit', 'google-analytics-for-wordpress' ); ?>
+                    <?php esc_html_e('An error has occured.', 'google-analytics-for-wordpress'); ?> 
+                    <a href="" class="monsterinsights_google_auth_box_cancel" title="<?php esc_attr_e('Exit', 'google-analytics-for-wordpress'); ?>" > 
+                        <?php esc_html_e('Exit', 'google-analytics-for-wordpress'); ?>
                     </a> 
                 </div>
         </div>
          <?php } ?>
-         <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
-            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_exit_view_title"><?php esc_html_e( 'ERROR', 'google-analytics-for-wordpress' ); ?> </div>
+         <div id="monsterinsights_google_auth_box_contents" <?php if ($reauth) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
+            <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_exit_view_title"><?php esc_html_e('ERROR', 'google-analytics-for-wordpress'); ?> </div>
             <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_exit_view_description"><?php echo $error; ?> </div>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done';?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done'; ?>">
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
@@ -225,9 +225,9 @@ 
                 &nbsp;
             </div>
             <div id="monsterinsights_google_auth_box_footer_right">
-                <a href="#" id="monsterinsights_google_auth_box_cancel_error" class="monsterinsights_google_auth_box_cancel_error" title="<?php esc_attr_e( 'Exit', 'google-analytics-for-wordpress' ); ?>" >
+                <a href="#" id="monsterinsights_google_auth_box_cancel_error" class="monsterinsights_google_auth_box_cancel_error" title="<?php esc_attr_e('Exit', 'google-analytics-for-wordpress'); ?>" >
                     <div id="monsterinsights_google_auth_box_footer_right_next">
-                         <?php esc_html_e( 'EXIT', 'google-analytics-for-wordpress' ); ?> 
+                         <?php esc_html_e('EXIT', 'google-analytics-for-wordpress'); ?> 
                     </div>
                 </a>
             </div>

includes/admin/notice.php

Spacing +38 added lines, -38 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -37,8 +37,8 @@ 
     public function __construct() {
 
         // Populate $notices
-        $this->notices = get_option( 'monsterinsights_notices' );
-        if ( ! is_array( $this->notices ) ) {
+        $this->notices = get_option('monsterinsights_notices');
+        if ( ! is_array($this->notices)) {
             $this->notices = array();
         }
 
@@ -54,8 +54,8 @@ 
      * @return bool Notice Dismissed
      */
 
-    public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
+    public function is_dismissed($notice) {
+        if ( ! isset($this->notices[$notice])) {
             return false;
         }
         return true;
@@ -71,9 +71,9 @@ 
      * @param string $notice Programmatic Notice Name
      * @return null
      */
-    public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
-        update_option( 'monsterinsights_notices', $this->notices );
+    public function dismiss($notice) {
+        $this->notices[$notice] = true;
+        update_option('monsterinsights_notices', $this->notices);
 
     }
 
@@ -87,9 +87,9 @@ 
      * @param string $notice Programmatic Notice Name
      * @return null
      */
-    public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
-        update_option( 'monsterinsights_notices', $this->notices );
+    public function undismiss($notice) {
+        unset($this->notices[$notice]);
+        update_option('monsterinsights_notices', $this->notices);
 
     }
 
@@ -107,7 +107,7 @@ 
      * @param string    $button_url         Button URL (optional)
      * @param bool      $is_dismissible     User can Dismiss Message (default: false)
      */ 
-    public function display_inline_notice( $name, $title, $message, $type = 'success', $is_dismissible = false, $args = array() ) {
+    public function display_inline_notice($name, $title, $message, $type = 'success', $is_dismissible = false, $args = array()) {
         /* Available/Planned $args options
          * $args = array(
          *  'primary'    => array(
@@ -128,33 +128,33 @@ 
 
 
         // Check if the notice is dismissible, and if so has been dismissed.
-        if ( $is_dismissible && $this->is_dismissed( $name ) ) {
+        if ($is_dismissible && $this->is_dismissed($name)) {
             // Nothing to show here, return!
             return '';
         }
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+        $dismissible = ($is_dismissible) ? ' is-dismissible' : '';
 
         // Display inline notice
         ob_start();
         ?>
-        <div class="monsterinsights-notice <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice' . $dismissible; ?>" data-notice="<?php echo esc_attr( $name ); ?>">
-            <div class="monsterinsights-notice-icon <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-icon'?>">
+        <div class="monsterinsights-notice <?php echo 'monsterinsights-' . esc_attr($type) . '-notice' . $dismissible; ?>" data-notice="<?php echo esc_attr($name); ?>">
+            <div class="monsterinsights-notice-icon <?php echo 'monsterinsights-' . esc_attr($type) . '-notice-icon'?>">
             </div>
-            <div class="monsterinsights-notice-text <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-text'?>">
+            <div class="monsterinsights-notice-text <?php echo 'monsterinsights-' . esc_attr($type) . '-notice-text'?>">
                 <?php
                 // Title
-                if ( ! empty ( $title ) ) {
+                if ( ! empty ($title)) {
                     ?>
-                    <p class="monsterinsights-notice-title"><?php echo esc_html( $title ); ?></p>
+                    <p class="monsterinsights-notice-title"><?php echo esc_html($title); ?></p>
                     <?php
                 }
 
                 // Message
-                if ( ! empty( $message ) ) {
-                    if ( empty( $args['skip_message_escape'] ) ) {
+                if ( ! empty($message)) {
+                    if (empty($args['skip_message_escape'])) {
                         ?>
-                        <p class="monsterinsights-notice-message"><?php echo esc_html( $message ); ?></p>
+                        <p class="monsterinsights-notice-message"><?php echo esc_html($message); ?></p>
                         <?php
                     } else {
                         ?>
@@ -164,65 +164,65 @@ 
                 }
                 
                 // Primary Button
-                if ( ! empty( $args['primary']['text'] ) ) {
+                if ( ! empty($args['primary']['text'])) {
                     
                     $text = '';
-                    if ( ! empty( $args['primary']['text'] ) ) {
+                    if ( ! empty($args['primary']['text'])) {
                         $text = $args['primary']['text'];
                     }
 
                     $url = '#';
-                    if ( ! empty( $args['primary']['url'] ) ) {
+                    if ( ! empty($args['primary']['url'])) {
                         $url = $args['primary']['url'];
                     }
 
                     $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+                    if ( ! empty($args['primary']['target']) && $args['primary']['target'] === 'blank') {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-primary';
-                    if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
+                    if ( ! empty($args['primary']['class'])) {
+                        $class = ' class="' . $args['primary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr($url); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html($text); ?></a>
                     <?php
                 }
 
                 // Secondary Button
-                if ( ! empty( $args['secondary']['text'] ) ) {
+                if ( ! empty($args['secondary']['text'])) {
                     
                     $text = '';
-                    if ( ! empty( $args['secondary']['text'] ) ) {
+                    if ( ! empty($args['secondary']['text'])) {
                         $text = $args['secondary']['text'];
                     }
 
                     $url = '#';
-                    if ( ! empty( $args['secondary']['url'] ) ) {
+                    if ( ! empty($args['secondary']['url'])) {
                         $url = $args['secondary']['url'];
                     }           
 
                     $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+                    if ( ! empty($args['secondary']['target']) && $args['secondary']['target'] === 'blank') {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-secondary';
-                    if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
+                    if ( ! empty($args['secondary']['class'])) {
+                        $class = ' class="' . $args['secondary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr($url); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html($text); ?></a>
                     <?php
                 }
 
                 // Dismiss Button
-                if ( $is_dismissible ) {
+                if ($is_dismissible) {
                     ?>
                     <button type="button" class="notice-dismiss<?php echo $dismissible; ?>">
                         <span class="screen-reader-text">
-                            <?php esc_html_e( 'Dismiss this notice', 'google-analytics-for-wordpress' ); ?>
+                            <?php esc_html_e('Dismiss this notice', 'google-analytics-for-wordpress'); ?>
                         </span>
                     </button>
                     <?php

includes/admin/pages/addons.php

Spacing +100 added lines, -100 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -17,20 +17,20 @@ 
     $current_screen = get_current_screen();
     global $admin_page_hooks;
    
-    if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
+    if ( ! is_object($current_screen) || empty($current_screen->id) || empty($admin_page_hooks)) {
         return false;
     }
 
     $settings_page = false;
-    if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_addons' ) {
+    if ( ! empty($admin_page_hooks['monsterinsights_dashboard']) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_addons') {
         $settings_page = true;
     }
 
-    if ( ! empty( $admin_page_hooks['monsterinsights_settings'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] . '_page_monsterinsights_addons' ) {
+    if ( ! empty($admin_page_hooks['monsterinsights_settings']) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] . '_page_monsterinsights_addons') {
         $settings_page = true;
     }
 
-    if ( ! empty( $admin_page_hooks['monsterinsights_network'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_network'] . '_page_monsterinsights_addons-network' ) {
+    if ( ! empty($admin_page_hooks['monsterinsights_network']) && $current_screen->id === $admin_page_hooks['monsterinsights_network'] . '_page_monsterinsights_addons-network') {
         $settings_page = true;
     }
 
@@ -45,23 +45,23 @@ 
  * @return null Return early if not refreshing the addons.
  */
 function monsterinsights_maybe_refresh_addons() {
-    if ( ! monsterinsights_is_addons_page() ) {
+    if ( ! monsterinsights_is_addons_page()) {
         return;
     }
 
 
-    if ( ! monsterinsights_is_refreshing_addons() ) {
+    if ( ! monsterinsights_is_refreshing_addons()) {
         return;
     }
 
-    if ( ! monsterinsights_refresh_addons_action() ) {
+    if ( ! monsterinsights_refresh_addons_action()) {
         return;
     }
 
-    monsterinsights_get_addons_data( monsterinsights_get_license_key() );
+    monsterinsights_get_addons_data(monsterinsights_get_license_key());
 
 }
-add_action( 'current_screen', 'monsterinsights_maybe_refresh_addons' );
+add_action('current_screen', 'monsterinsights_maybe_refresh_addons');
 
 /**
  * Callback to output the MonsterInsights addons page.
@@ -80,13 +80,13 @@ 
     ?>
     <?php echo monsterinsights_ublock_notice(); ?>
     <div id="monsterinsights-addon-heading" class="monsterinsights-addons-subheading monsterinsights-clearfix-after">
-        <h1><?php esc_html_e( 'MonsterInsights Addons', 'google-analytics-for-wordpress' ); ?></h1>
+        <h1><?php esc_html_e('MonsterInsights Addons', 'google-analytics-for-wordpress'); ?></h1>
         <form id="add-on-search">
             <span class="spinner"></span>
-            <input id="add-on-searchbox" name="monsterinsights-addon-search" value="" placeholder="<?php esc_attr_e( 'Search MI Addons', 'google-analytics-for-wordpress' ); ?>" />
+            <input id="add-on-searchbox" name="monsterinsights-addon-search" value="" placeholder="<?php esc_attr_e('Search MI Addons', 'google-analytics-for-wordpress'); ?>" />
             <select id="monsterinsights-filter-select">
-                <option value="asc"><?php esc_html_e( 'Sort Ascending (A-Z)', 'google-analytics-for-wordpress' ); ?></option>
-                <option value="desc"><?php esc_html_e( 'Sort Descending (Z-A)', 'google-analytics-for-wordpress' ); ?></option>
+                <option value="asc"><?php esc_html_e('Sort Ascending (A-Z)', 'google-analytics-for-wordpress'); ?></option>
+                <option value="desc"><?php esc_html_e('Sort Descending (Z-A)', 'google-analytics-for-wordpress'); ?></option>
             </select>
         </form>
     </div>
@@ -101,7 +101,7 @@ 
              * or the hook may be removed at any time, without warning.
              */
             ?>
-            <?php do_action( 'monsterinsights_addons_section' ); ?>
+            <?php do_action('monsterinsights_addons_section'); ?>
         </div>
     </div>
     <?php
@@ -116,11 +116,11 @@ 
 function monsterinsights_addons_content() {
 
     // If error(s) occured during license key verification, display them and exit now.
-    if ( false !== monsterinsights_get_license_key_errors() ) {
+    if (false !== monsterinsights_get_license_key_errors()) {
         ?>
         <div class="error below-h2">
             <p>
-                <?php esc_html_e( 'In order to get access to Addons, you need to resolve your license key errors.', 'google-analytics-for-wordpress' ); ?>
+                <?php esc_html_e('In order to get access to Addons, you need to resolve your license key errors.', 'google-analytics-for-wordpress'); ?>
             </p>
         </div>
         <?php
@@ -132,14 +132,14 @@ 
 
     // If no Addon(s) were returned, our API call returned an error.
     // Show an error message with a button to reload the page, which will trigger another API call.
-    if ( ! $addons ) {
+    if ( ! $addons) {
         ?>
         <form id="monsterinsights-addons-refresh-addons-form" method="post">
             <p>
-                <?php esc_html_e( 'There was an issue retrieving the addons for this site. Please click on the button below the refresh the addons data.', 'google-analytics-for-wordpress' ); ?>
+                <?php esc_html_e('There was an issue retrieving the addons for this site. Please click on the button below the refresh the addons data.', 'google-analytics-for-wordpress'); ?>
             </p>
             <p>
-                <a href="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" class="button button-primary"><?php esc_html_e( 'Refresh Addons', 'google-analytics-for-wordpress' ); ?></a>
+                <a href="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" class="button button-primary"><?php esc_html_e('Refresh Addons', 'google-analytics-for-wordpress'); ?></a>
             </p>
         </form>
         <?php
@@ -154,17 +154,17 @@ 
     <div id="monsterinsights-addons">
         <?php
         // Output Addons the User is licensed to use.
-        if ( count( $addons['licensed'] )> 0 ) {
+        if (count($addons['licensed']) > 0) {
             ?>
             <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear">
-                <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3>
+                <h3><?php esc_html_e('Available Addons:', 'google-analytics-for-wordpress'); ?></h3>
                 
                 <div id="monsterinsights-addons-licensed" class="monsterinsights-addons">
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['licensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
+                        foreach ((array) $addons['licensed'] as $i => $addon) {
+                            monsterinsights_get_addon_card($addon, $i, true, $installed_plugins);
                         }
                         ?>
                     </div>
@@ -174,18 +174,18 @@ 
         } // Close licensed addons
 
         // Output Addons the User isn't licensed to use.
-        if ( count( $addons['unlicensed'] ) > 0 ) {
+        if (count($addons['unlicensed']) > 0) {
             ?>
             <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear">
-                <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3>
-                <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p>
+                <h3><?php esc_html_e('Unlock More Addons', 'google-analytics-for-wordpress'); ?></h3>
+                <p><?php echo sprintf(esc_html__('%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress'), '<strong>', '</strong> <a href="' . $upgrade_url . '">', '</a>'); ?></p>
                 
                 <div id="monsterinsights-addons-unlicensed" class="monsterinsights-addons">
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
+                        foreach ((array) $addons['unlicensed'] as $i => $addon) {
+                            monsterinsights_get_addon_card($addon, $i, false, $installed_plugins);
                         }
                         ?>
                     </div>
@@ -198,7 +198,7 @@ 
     <?php
 
 }
-add_action( 'monsterinsights_addons_section', 'monsterinsights_addons_content' );
+add_action('monsterinsights_addons_section', 'monsterinsights_addons_content');
 
 /**
  * Retrieves addons from the stored transient or remote server.
@@ -214,12 +214,12 @@ 
     $type = monsterinsights_get_license_key_type();
     
     // Get addons data from transient or perform API query if no transient.
-    if ( false === ( $addons = get_transient( '_monsterinsights_addons' ) ) ) {
-        $addons = monsterinsights_get_addons_data( $key );
+    if (false === ($addons = get_transient('_monsterinsights_addons'))) {
+        $addons = monsterinsights_get_addons_data($key);
     }
 
     // If no Addons exist, return false
-    if ( ! $addons ) {
+    if ( ! $addons) {
         return false;
     }
 
@@ -230,14 +230,14 @@ 
         'licensed'  => array(),
         'unlicensed'=> array(),
     );
-    foreach ( (array) $addons as $i => $addon ) {
+    foreach ((array) $addons as $i => $addon) {
 
         // Determine whether the user is licensed to use this Addon or not.
         if ( 
-            empty( $type ) ||
-            ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
-            ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
-            ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
+            empty($type) ||
+            (in_array('Pro', $addon->categories) && ($type != 'pro' && $type != 'master')) ||
+            (in_array('Plus', $addon->categories) && $type != 'plus' && $type != 'pro' && $type != 'master') ||
+            (in_array('Basic', $addon->categories) && ($type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master'))
         ) {
             // Unlicensed
             $results['unlicensed'][] = $addon;
@@ -262,33 +262,33 @@ 
  * @param   string      $key    The user license key.
  * @return  array               Array of addon data otherwise.
  */
-function monsterinsights_get_addons_data( $key ) {
+function monsterinsights_get_addons_data($key) {
     // Get the base class object.
     $base = MonsterInsights();
     $type = monsterinsights_get_license_key_type();
     
     // Get Addons
     // If the key is valid, we'll get personalised upgrade URLs for each Addon (if necessary) and plugin update information.
-    if ( $key ) {
-        $addons = $base->license->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
+    if ($key) {
+        $addons = $base->license->perform_remote_request('get-addons-data-v600', array('tgm-updater-key' => $key)); 
     } else {
-        $addons = $base->license->perform_remote_request( 'get-all-addons-data', array() ); 
+        $addons = $base->license->perform_remote_request('get-all-addons-data', array()); 
     }
     
     // If there was an API error, set transient for only 10 minutes.
-    if ( ! $addons ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+    if ( ! $addons) {
+        set_transient('_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS);
         return false;
     }
 
     // If there was an error retrieving the addons, set the error.
-    if ( isset( $addons->error ) ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+    if (isset($addons->error)) {
+        set_transient('_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS);
         return false;
     }
 
     // Otherwise, our request worked. Save the data and return it.
-    set_transient( '_monsterinsights_addons', $addons, 4 * HOUR_IN_SECONDS );
+    set_transient('_monsterinsights_addons', $addons, 4 * HOUR_IN_SECONDS);
     return $addons;
 
 }
@@ -301,7 +301,7 @@ 
  * @return bool True if being refreshed, false otherwise.
  */
 function monsterinsights_is_refreshing_addons() {
-    return isset( $_POST['google-analytics-for-wordpress-refresh-addons-submit'] );
+    return isset($_POST['google-analytics-for-wordpress-refresh-addons-submit']);
 }
 
 /**
@@ -312,7 +312,7 @@ 
  * @return bool True if nonces check out, false otherwise.
  */
 function monsterinsights_refresh_addons_action() {
-    return isset( $_POST['google-analytics-for-wordpress-refresh-addons-submit'] ) && wp_verify_nonce( $_POST['google-analytics-for-wordpress-refresh-addons'], 'google-analytics-for-wordpress-refresh-addons' );
+    return isset($_POST['google-analytics-for-wordpress-refresh-addons-submit']) && wp_verify_nonce($_POST['google-analytics-for-wordpress-refresh-addons'], 'google-analytics-for-wordpress-refresh-addons');
 }
 
 /**
@@ -323,11 +323,11 @@ 
  * @param string $slug The plugin slug.
  * @return string      The plugin basename if found, else the plugin slug.
  */
-function monsterinsights_get_plugin_basename_from_slug( $slug ) {
-    $keys = array_keys( get_plugins() );
+function monsterinsights_get_plugin_basename_from_slug($slug) {
+    $keys = array_keys(get_plugins());
 
-    foreach ( $keys as $key ) {
-        if ( preg_match( '|^' . $slug . '|', $key ) ) {
+    foreach ($keys as $key) {
+        if (preg_match('|^' . $slug . '|', $key)) {
             return $key;
         }
     }
@@ -346,55 +346,55 @@ 
  * @param   bool    $is_licensed        Whether the Addon is licensed for use
  * @param   array   $installed_plugins  Installed WordPress Plugins
  */
-function monsterinsights_get_addon_card( $addon, $counter = 0, $is_licensed = false, $installed_plugins = false ) {
+function monsterinsights_get_addon_card($addon, $counter = 0, $is_licensed = false, $installed_plugins = false) {
 
     // Setup some vars
-    $slug = str_replace( 'monsterinsights-', '', $addon->slug );
+    $slug = str_replace('monsterinsights-', '', $addon->slug);
     $slug = 'monsterinsights-' . $addon->slug;
-    if ( $slug === 'monsterinsights-ecommerce' ) {
+    if ($slug === 'monsterinsights-ecommerce') {
         $slug = 'ga-ecommerce';
     } 
 
-    $plugin_basename   = monsterinsights_get_plugin_basename_from_slug( $slug );
-    $categories = implode( ',', $addon->categories );
-    if ( ! $installed_plugins ) {
+    $plugin_basename = monsterinsights_get_plugin_basename_from_slug($slug);
+    $categories = implode(',', $addon->categories);
+    if ( ! $installed_plugins) {
         $installed_plugins = get_plugins();
     }
    
     // If the Addon doesn't supply an upgrade_url key, it's because the user hasn't provided a license
     // get_upgrade_link() will return the Lite or Pro link as necessary for us.
-    if ( ! isset( $addon->upgrade_url ) ) {
+    if ( ! isset($addon->upgrade_url)) {
         $addon->upgrade_url = monsterinsights_get_upgrade_link();
     }
 
     // Link user to doc to install MI pro to install addons
-    if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+    if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset($installed_plugins[$plugin_basename])) {
         $addon->url = 'https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons';
     }
 
     // Output the card
     ?>
     <div class="monsterinsights-addon">
-        <h3 class="monsterinsights-addon-title"><?php echo esc_html( $addon->title ); ?></h3>
+        <h3 class="monsterinsights-addon-title"><?php echo esc_html($addon->title); ?></h3>
         <?php
-        if ( ! empty( $addon->image ) ) {
+        if ( ! empty($addon->image)) {
             ?>
-            <img class="monsterinsights-addon-thumb" src="<?php echo esc_attr( esc_url( $addon->image ) ); ?>" alt="<?php echo esc_attr( $addon->title ); ?>" />
+            <img class="monsterinsights-addon-thumb" src="<?php echo esc_attr(esc_url($addon->image)); ?>" alt="<?php echo esc_attr($addon->title); ?>" />
             <?php
         }
         ?>
 
-        <p class="monsterinsights-addon-excerpt"><?php echo esc_html( $addon->excerpt ); ?></p>
+        <p class="monsterinsights-addon-excerpt"><?php echo esc_html($addon->excerpt); ?></p>
 
         <?php
         // If the Addon is unlicensed, show the upgrade button 
-        if ( ! $is_licensed ) {
+        if ( ! $is_licensed) {
             ?>
             <div class="monsterinsights-addon-active monsterinsights-addon-message">
                 <div class="interior">
                     <div class="monsterinsights-addon-upgrade">
-                        <a href="<?php echo esc_attr( esc_url( $addon->upgrade_url ) ); ?>" target="_blank" rel="noopener noreferrer" referrer="no-referrer" class="button button-primary monsterinsights-addon-upgrade-button"  rel="<?php echo esc_attr( $plugin_basename ); ?>">
-                            <?php esc_html_e( 'Upgrade Now', 'google-analytics-for-wordpress' ); ?>
+                        <a href="<?php echo esc_attr(esc_url($addon->upgrade_url)); ?>" target="_blank" rel="noopener noreferrer" referrer="no-referrer" class="button button-primary monsterinsights-addon-upgrade-button"  rel="<?php echo esc_attr($plugin_basename); ?>">
+                            <?php esc_html_e('Upgrade Now', 'google-analytics-for-wordpress'); ?>
                         </a>
                         <span class="spinner monsterinsights-spinner"></span>
                     </div>
@@ -405,26 +405,26 @@ 
             // Addon is licensed
 
             // If the plugin is not installed, display an install message and button.
-            if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-                if ( empty( $addon->url ) ) {
+            if ( ! isset($installed_plugins[$plugin_basename])) {
+                if (empty($addon->url)) {
                     $addon->url = '';
                 }
                 ?>
                 <div class="monsterinsights-addon-not-installed monsterinsights-addon-message">
                     <div class="interior">
-                         <?php if ( monsterinsights_is_pro_version() ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNot Installed%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
+                         <?php if (monsterinsights_is_pro_version()) { ?>
+                            <span class="addon-status"><?php echo sprintf(esc_html__('Status: %1$sNot Installed%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>'); ?></span>
                          <?php } ?>
                         <div class="monsterinsights-addon-action">
-                                <?php if ( monsterinsights_is_pro_version() ) { ?>
-                                    <a class="button button-primary monsterinsights-addon-action-button monsterinsights-install-addon" href="#" rel="<?php echo esc_attr( esc_url( $addon->url ) ); ?>">
+                                <?php if (monsterinsights_is_pro_version()) { ?>
+                                    <a class="button button-primary monsterinsights-addon-action-button monsterinsights-install-addon" href="#" rel="<?php echo esc_attr(esc_url($addon->url)); ?>">
                                         <i class="monsterinsights-cloud-download"></i>
-                                        <?php esc_html_e( 'Install', 'google-analytics-for-wordpress' ); ?> 
+                                        <?php esc_html_e('Install', 'google-analytics-for-wordpress'); ?> 
                                     </a>
                                 <?php } else { ?>
-                                    <a class="button button-primary monsterinsights-addon-action-button" href="<?php echo esc_url( $addon->url ); ?>" rel="noopener noreferrer" referrer="no-referrer" target="_blank">
+                                    <a class="button button-primary monsterinsights-addon-action-button" href="<?php echo esc_url($addon->url); ?>" rel="noopener noreferrer" referrer="no-referrer" target="_blank">
                                         <i class="monsterinsights-cloud-download"></i>
-                                        <?php esc_html_e( "Why can't I install addons?", 'google-analytics-for-wordpress' ); ?> 
+                                        <?php esc_html_e("Why can't I install addons?", 'google-analytics-for-wordpress'); ?> 
                                     </a>
                                 <?php } ?>
                             <span class="spinner monsterinsights-spinner"></span>
@@ -436,35 +436,35 @@ 
                 // Plugin is installed.
                 
                 $active = false;
-                $ms_active = is_plugin_active_for_network( $plugin_basename );
-                $ss_active = is_plugin_active( $plugin_basename );
+                $ms_active = is_plugin_active_for_network($plugin_basename);
+                $ss_active = is_plugin_active($plugin_basename);
 
-                if ( is_multisite() && is_network_admin() ) {
-                    $active = is_plugin_active_for_network( $plugin_basename );
+                if (is_multisite() && is_network_admin()) {
+                    $active = is_plugin_active_for_network($plugin_basename);
                 } else {
-                    $active = is_plugin_active( $plugin_basename );
+                    $active = is_plugin_active($plugin_basename);
                 }
 
-                if ( $active ) {
+                if ($active) {
                     // Plugin is active. Display the active message and deactivate button.
                     ?>
                     <div class="monsterinsights-addon-active monsterinsights-addon-message">
                         <div class="interior">
-                            <?php if ( $ms_active ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <?php if ($ms_active) { ?>
+                            <span class="addon-status"><?php echo sprintf(esc_html__('Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>'); ?></span>
                             <?php } else { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf(esc_html__('Status: %1$sActive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>'); ?></span>
                             <?php } ?> 
-                            <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) ) { ?>
+                            <?php if ((is_multisite() && is_network_admin() && $ms_active) || ! is_multisite() || (is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active)) { ?>
                             <div class="monsterinsights-addon-action">
-                                <a class="button button-primary monsterinsights-addon-action-button monsterinsights-deactivate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>">
+                                <a class="button button-primary monsterinsights-addon-action-button monsterinsights-deactivate-addon" href="#" rel="<?php echo esc_attr($plugin_basename); ?>">
                                     <i class="monsterinsights-toggle-on"></i>
-                                    <?php if ( is_multisite() && is_network_admin() && $ms_active ) { ?>
-                                        <?php esc_html_e( 'Network deactivate', 'google-analytics-for-wordpress' ); ?> 
-                                    <?php } else if ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) { ?>
-                                        <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> 
+                                    <?php if (is_multisite() && is_network_admin() && $ms_active) { ?>
+                                        <?php esc_html_e('Network deactivate', 'google-analytics-for-wordpress'); ?> 
+                                    <?php } else if (is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active) { ?>
+                                        <?php esc_html_e('Deactivate', 'google-analytics-for-wordpress'); ?> 
                                     <?php } else { ?>
-                                        <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> 
+                                        <?php esc_html_e('Deactivate', 'google-analytics-for-wordpress'); ?> 
                                     <?php } ?> 
                                 </a>
                                 <span class="spinner google-analytics-for-wordpress-spinner"></span>
@@ -478,18 +478,18 @@ 
                     ?>
                     <div class="monsterinsights-addon-inactive monsterinsights-addon-message">
                         <div class="interior">
-                            <?php if ( $ms_active ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <?php if ($ms_active) { ?>
+                            <span class="addon-status"><?php echo sprintf(esc_html__('Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>'); ?></span>
                             <?php } else { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf(esc_html__('Status: %1$sInactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>'); ?></span>
                             <?php } ?> 
                             <div class="monsterinsights-addon-action">
-                                <a class="button button-primary monsterinsights-addon-action-button monsterinsights-activate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>">
+                                <a class="button button-primary monsterinsights-addon-action-button monsterinsights-activate-addon" href="#" rel="<?php echo esc_attr($plugin_basename); ?>">
                                     <i class="monsterinsights-toggle-on"></i>
-                                    <?php if ( is_multisite() && is_network_admin() && ! $ms_active ) { ?>
-                                        <?php esc_html_e( 'Network activate', 'google-analytics-for-wordpress' ); ?> 
+                                    <?php if (is_multisite() && is_network_admin() && ! $ms_active) { ?>
+                                        <?php esc_html_e('Network activate', 'google-analytics-for-wordpress'); ?> 
                                     <?php } else { ?>
-                                        <?php esc_html_e( 'Activate', 'google-analytics-for-wordpress' ); ?> 
+                                        <?php esc_html_e('Activate', 'google-analytics-for-wordpress'); ?> 
                                     <?php } ?>
                                 </a>
                                 <span class="spinner monsterinsights-spinner"></span>

includes/admin/pages/settings.php

Spacing +69 added lines, -69 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -18,16 +18,16 @@ 
     $current_screen = get_current_screen();
     global $admin_page_hooks;
    
-    if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
+    if ( ! is_object($current_screen) || empty($current_screen->id) || empty($admin_page_hooks)) {
         return false;
     }
 
     $settings_page = false;
-    if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_settings' ) {
+    if ( ! empty($admin_page_hooks['monsterinsights_dashboard']) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_settings') {
         $settings_page = true;
     }
 
-    if ( $current_screen->id === 'toplevel_page_monsterinsights_settings' ) {
+    if ($current_screen->id === 'toplevel_page_monsterinsights_settings') {
         $settings_page = true;
     }
 
@@ -51,7 +51,7 @@ 
      * not be used by other developers. This hook's behavior may be modified
      * or the hook may be removed at any time, without warning.
      */
-    do_action( 'monsterinsights_head' );
+    do_action('monsterinsights_head');
     ?>
     <?php echo monsterinsights_ublock_notice(); ?>
 
@@ -59,12 +59,12 @@ 
     <h1 id="monsterinsights-settings-page-main-nav" class="monsterinsights-main-nav-container monsterinsights-nav-container" data-container="#monsterinsights-settings-pages">
         <a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-spacing-item" href="#">&nbsp;</a>
 
-        <a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-active" href="#monsterinsights-main-tab-general" title="<?php echo esc_attr( __( 'General', 'google-analytics-for-wordpress' ) ); ?>">
-            <?php echo esc_html__( 'General', 'google-analytics-for-wordpress' ); ?>
+        <a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-active" href="#monsterinsights-main-tab-general" title="<?php echo esc_attr(__('General', 'google-analytics-for-wordpress')); ?>">
+            <?php echo esc_html__('General', 'google-analytics-for-wordpress'); ?>
         </a>
 
-        <a class="monsterinsights-main-nav-item monsterinsights-nav-item" href="#monsterinsights-main-tab-tracking" title="<?php echo esc_attr( __( 'Tracking', 'google-analytics-for-wordpress' ) ); ?>">
-            <?php echo esc_html__( 'Tracking', 'google-analytics-for-wordpress' ); ?>
+        <a class="monsterinsights-main-nav-item monsterinsights-nav-item" href="#monsterinsights-main-tab-tracking" title="<?php echo esc_attr(__('Tracking', 'google-analytics-for-wordpress')); ?>">
+            <?php echo esc_html__('Tracking', 'google-analytics-for-wordpress'); ?>
         </a>
         <!--
         <a class="monsterinsights-main-nav-item monsterinsights-nav-item" href="#monsterinsights-main-tab-status" title="<?php //echo esc_attr( __( 'Status', 'google-analytics-for-wordpress' ) ); ?>">
@@ -109,24 +109,24 @@ 
  */
 function monsterinsights_save_general_settings_page() {
 
-    if ( ! monsterinsights_is_settings_page() ) {
+    if ( ! monsterinsights_is_settings_page()) {
         return;
     }
 
     // Check if user pressed the 'Update' button and nonce is valid
-    if ( ! isset( $_POST['monsterinsights-settings-submit'] ) ) {
+    if ( ! isset($_POST['monsterinsights-settings-submit'])) {
         return;
     }
 
-    if ( ! wp_verify_nonce( $_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce' ) ) {
+    if ( ! wp_verify_nonce($_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce')) {
         return;
     }
 
-    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+    if ( ! current_user_can('monsterinsights_save_settings')) {
         return;
     }
 
-    if ( ! empty( $_POST['monsterinsights_settings_tab'] ) && $_POST['monsterinsights_settings_tab'] === 'general' ) {
+    if ( ! empty($_POST['monsterinsights_settings_tab']) && $_POST['monsterinsights_settings_tab'] === 'general') {
         /** 
          * Developer Alert:
          *
@@ -134,10 +134,10 @@ 
          * not be used by other developers. This hook's behavior may be modified
          * or the hook may be removed at any time, without warning.
          */
-        do_action( 'monsterinsights_settings_save_general' );
+        do_action('monsterinsights_settings_save_general');
     }
 }
-add_action( 'current_screen', 'monsterinsights_save_general_settings_page' );
+add_action('current_screen', 'monsterinsights_save_general_settings_page');
 
 /**
  * Outputs a WordPress style notification to tell the user settings were saved
@@ -148,7 +148,7 @@ 
  * @return void
  */
 function monsterinsights_updated_settings() {
-    echo monsterinsights_get_message( 'success', esc_html__( 'Settings saved successfully.', 'google-analytics-for-wordpress' ) );   
+    echo monsterinsights_get_message('success', esc_html__('Settings saved successfully.', 'google-analytics-for-wordpress'));   
 }
 
 /**
@@ -160,7 +160,7 @@ 
  * @return void
  */
 function monsterinsights_invalid_ua_code() {
-    echo monsterinsights_get_message( 'error', esc_html__( 'Invalid UA code.', 'google-analytics-for-wordpress' ) );   
+    echo monsterinsights_get_message('error', esc_html__('Invalid UA code.', 'google-analytics-for-wordpress'));   
 }
 
 /**
@@ -176,20 +176,20 @@ 
  *
  * @return void
  */
-function monsterinsights_make_checkbox( $option_id, $title = '', $description = '' ) {
-    $option_value = monsterinsights_get_option( $option_id, 0 );
-    $option_class = str_replace( '_', '-', $option_id );
+function monsterinsights_make_checkbox($option_id, $title = '', $description = '') {
+    $option_value = monsterinsights_get_option($option_id, 0);
+    $option_class = str_replace('_', '-', $option_id);
     ob_start();
     ?>
-    <tr id="monsterinsights-input-<?php echo esc_attr( $option_class ); ?>">
-        <?php if ( !empty ( $title ) ) { ?>
+    <tr id="monsterinsights-input-<?php echo esc_attr($option_class); ?>">
+        <?php if ( ! empty ($title)) { ?>
         <th scope="row">
-            <label for="monsterinsights-<?php echo esc_attr( $option_class ); ?>"><?php echo $title; ?></label>
+            <label for="monsterinsights-<?php echo esc_attr($option_class); ?>"><?php echo $title; ?></label>
         </th>
          <?php } ?>
         <td>
-            <input type="checkbox" id="monsterinsights-<?php echo esc_attr( $option_class ); ?>" name="<?php echo esc_attr( $option_id ); ?>" <?php checked( $option_value, 1 ); ?> />
-            <?php if ( ! empty ( $description ) ) { ?>
+            <input type="checkbox" id="monsterinsights-<?php echo esc_attr($option_class); ?>" name="<?php echo esc_attr($option_id); ?>" <?php checked($option_value, 1); ?> />
+            <?php if ( ! empty ($description)) { ?>
             <p class="description">
                 <?php echo $description; ?>
             </p>
@@ -204,109 +204,109 @@ 
 
 function monsterinsights_switch_to_analyticsjs() {
     $nonce = '';
-    if ( ! empty( $_REQUEST['monsterinsights-switch-to-analyticsjs-nonce'] ) ) {
+    if ( ! empty($_REQUEST['monsterinsights-switch-to-analyticsjs-nonce'])) {
         $nonce = 'monsterinsights-switch-to-analyticsjs-nonce';
-    } else if ( ! empty( $_REQUEST['_wpnonce'] ) ) {
+    } else if ( ! empty($_REQUEST['_wpnonce'])) {
         $nonce = '_wpnonce';
     }
     
-    if ( empty( $nonce ) ) {
+    if (empty($nonce)) {
          return;
     }
     
-    if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-analyticsjs-nonce' ) ) {
+    if ( ! wp_verify_nonce($_REQUEST[$nonce], 'monsterinsights-switch-to-analyticsjs-nonce')) {
         return;
     }
 
-    if ( empty( $_REQUEST['monsterinsights-action'] ) || $_REQUEST['monsterinsights-action'] !== 'switch_to_analyticsjs' ) {
+    if (empty($_REQUEST['monsterinsights-action']) || $_REQUEST['monsterinsights-action'] !== 'switch_to_analyticsjs') {
         return;
     }
 
-    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
+    if ( ! current_user_can('monsterinsights_save_settings')) {
+        wp_die(esc_html__('You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress'), esc_html__('Error', 'google-analytics-for-wordpress'), array('response' => 403));
     }
 
-    $return       = '';
-    if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
-        $return = add_query_arg( 'return', $_REQUEST['return'], $return );
+    $return = '';
+    if ( ! empty($_REQUEST['return']) && monsterinsights_is_settings_tab($_REQUEST['return'])) {
+        $return = admin_url('admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
+        $return = add_query_arg('return', $_REQUEST['return'], $return);
     } else {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched');
+        $return = admin_url('admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched');
     }
-    monsterinsights_update_option( 'tracking_mode', 'analytics' );
-    wp_safe_redirect( $return );exit;
+    monsterinsights_update_option('tracking_mode', 'analytics');
+    wp_safe_redirect($return); exit;
 }
-add_action( 'admin_init', 'monsterinsights_switch_to_analyticsjs',9 );
+add_action('admin_init', 'monsterinsights_switch_to_analyticsjs', 9);
 
 function monsterinsights_switched_to_analyticsjs() {
-    echo monsterinsights_get_message( 'success', esc_html__( 'Successfully migrated to Universal Analytics (analytics.js)!', 'google-analytics-for-wordpress' ) );
+    echo monsterinsights_get_message('success', esc_html__('Successfully migrated to Universal Analytics (analytics.js)!', 'google-analytics-for-wordpress'));
 }
 
 function monsterinsights_switch_to_analyticsjs_show_notice() {
-    if ( empty( $_REQUEST['monsterinsights-message'] ) || $_REQUEST['monsterinsights-message'] !== 'tracking_mode_switched' ) {
+    if (empty($_REQUEST['monsterinsights-message']) || $_REQUEST['monsterinsights-message'] !== 'tracking_mode_switched') {
         return;
     }
     
-    if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        add_action( 'monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_analyticsjs' );
+    if ( ! empty($_REQUEST['return']) && monsterinsights_is_settings_tab($_REQUEST['return'])) {
+        add_action('monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_analyticsjs');
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_analyticsjs' );
+        add_action('monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_analyticsjs');
     }
 }
-add_action( 'admin_init', 'monsterinsights_switch_to_analyticsjs_show_notice', 11 ); 
+add_action('admin_init', 'monsterinsights_switch_to_analyticsjs_show_notice', 11); 
 
 
 
 function monsterinsights_switch_to_jsevents() {
     $nonce = '';
-    if ( ! empty( $_REQUEST['monsterinsights-switch-to-jsevents-nonce'] ) ) {
+    if ( ! empty($_REQUEST['monsterinsights-switch-to-jsevents-nonce'])) {
         $nonce = 'monsterinsights-switch-to-jsevents-nonce';
-    } else if ( ! empty( $_REQUEST['_wpnonce'] ) ) {
+    } else if ( ! empty($_REQUEST['_wpnonce'])) {
         $nonce = '_wpnonce';
     }
     
-    if ( empty( $nonce ) ) {
+    if (empty($nonce)) {
          return;
     }
     
-    if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-jsevents-nonce' ) ) {
+    if ( ! wp_verify_nonce($_REQUEST[$nonce], 'monsterinsights-switch-to-jsevents-nonce')) {
         return;
     }
 
-    if ( empty( $_REQUEST['monsterinsights-action'] ) || $_REQUEST['monsterinsights-action'] !== 'switch_to_jsevents' ) {
+    if (empty($_REQUEST['monsterinsights-action']) || $_REQUEST['monsterinsights-action'] !== 'switch_to_jsevents') {
         return;
     }
 
-    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
+    if ( ! current_user_can('monsterinsights_save_settings')) {
+        wp_die(esc_html__('You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress'), esc_html__('Error', 'google-analytics-for-wordpress'), array('response' => 403));
     }
 
-    $return       = '';
-    if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
-        $return = add_query_arg( 'return', $_REQUEST['return'], $return );
+    $return = '';
+    if ( ! empty($_REQUEST['return']) && monsterinsights_is_settings_tab($_REQUEST['return'])) {
+        $return = admin_url('admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
+        $return = add_query_arg('return', $_REQUEST['return'], $return);
     } else {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched');
+        $return = admin_url('admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched');
     }
-    monsterinsights_update_option( 'events_mode', 'js' );
-    wp_safe_redirect( $return );exit;
+    monsterinsights_update_option('events_mode', 'js');
+    wp_safe_redirect($return); exit;
 }
-add_action( 'admin_init', 'monsterinsights_switch_to_jsevents',9 );
+add_action('admin_init', 'monsterinsights_switch_to_jsevents', 9);
 
 function monsterinsights_switched_to_jsevents() {
-    echo monsterinsights_get_message( 'success', esc_html__( 'Successfully migrated to JS events tracking!', 'google-analytics-for-wordpress' ) );
+    echo monsterinsights_get_message('success', esc_html__('Successfully migrated to JS events tracking!', 'google-analytics-for-wordpress'));
 }
 
 function monsterinsights_switch_to_jsevents_show_notice() {
-    if ( empty( $_REQUEST['monsterinsights-message'] ) || $_REQUEST['monsterinsights-message'] !== 'jsvents_mode_switched' ) {
+    if (empty($_REQUEST['monsterinsights-message']) || $_REQUEST['monsterinsights-message'] !== 'jsvents_mode_switched') {
         return;
     }
     
-    $allowed_tabs = array( 'engagement', 'performance', 'ecommerce', 'demographics', 'dimensions', 'goptimize' );
-    if ( ! empty( $_REQUEST['return'] ) && in_array( $_REQUEST['return'], $allowed_tabs ) ) {
-        add_action( 'monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_jsevents' );
+    $allowed_tabs = array('engagement', 'performance', 'ecommerce', 'demographics', 'dimensions', 'goptimize');
+    if ( ! empty($_REQUEST['return']) && in_array($_REQUEST['return'], $allowed_tabs)) {
+        add_action('monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_jsevents');
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_jsevents' );
+        add_action('monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_jsevents');
     }
 }
-add_action( 'admin_init', 'monsterinsights_switch_to_jsevents_show_notice', 11 ); 
\ No newline at end of file
+add_action('admin_init', 'monsterinsights_switch_to_jsevents_show_notice', 11); 
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
     }
     
     if ( empty( $nonce ) ) {
-         return;
+            return;
     }
     
     if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-analyticsjs-nonce' ) ) {
@@ -266,7 +266,7 @@ 
     }
     
     if ( empty( $nonce ) ) {
-         return;
+            return;
     }
     
     if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-jsevents-nonce' ) ) {

includes/admin/pages/tools.php

Spacing +55 added lines, -55 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,7 +20,7 @@ 
 	 * not be used by other developers. This hook's behavior may be modified
 	 * or the hook may be removed at any time, without warning.
 	 */
-	do_action( 'monsterinsights_head' );
+	do_action('monsterinsights_head');
 	?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 
@@ -28,12 +28,12 @@ 
 	<h1 id="monsterinsights-tools-page-main-nav" class="monsterinsights-main-nav-container monsterinsights-nav-container" data-container="#monsterinsights-tools-pages">
 		<a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-spacing-item" href="#">&nbsp;</a>
 
-		<a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-active" href="#monsterinsights-main-tab-settings" title="<?php echo esc_attr( __( 'Import/Export', 'google-analytics-for-wordpress' ) ); ?>">
-			<?php echo esc_html__( 'Import/Export', 'google-analytics-for-wordpress' ); ?>
+		<a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-active" href="#monsterinsights-main-tab-settings" title="<?php echo esc_attr(__('Import/Export', 'google-analytics-for-wordpress')); ?>">
+			<?php echo esc_html__('Import/Export', 'google-analytics-for-wordpress'); ?>
 		</a>
 
-		<a class="monsterinsights-main-nav-item monsterinsights-nav-item" href="#monsterinsights-main-tab-url-builder" title="<?php echo esc_attr( __( 'Campaign URL Builder', 'google-analytics-for-wordpress' ) ); ?>">
-			<?php echo esc_html__( 'URL Builder', 'google-analytics-for-wordpress' ); ?>
+		<a class="monsterinsights-main-nav-item monsterinsights-nav-item" href="#monsterinsights-main-tab-url-builder" title="<?php echo esc_attr(__('Campaign URL Builder', 'google-analytics-for-wordpress')); ?>">
+			<?php echo esc_html__('URL Builder', 'google-analytics-for-wordpress'); ?>
 		</a>
 	</h1>
 
@@ -51,27 +51,27 @@ 
 	<?php
 }
 
-function monsterinsights_tools_url_builder_tab(){
-	do_action( 'monsterinsights_tools_url_builder_tab' );
+function monsterinsights_tools_url_builder_tab() {
+	do_action('monsterinsights_tools_url_builder_tab');
 }
 
 function monsterinsights_tools_settings_tab() {
-	ob_start();?>
-	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' );?></h2>
-	<p><?php echo esc_html__( 'You can use the below tools to import settings from other MonsterInsights websites or export settings to import into another MonsterInsights install.', 'google-analytics-for-wordpress' ); ?> </p>
+	ob_start(); ?>
+	<h2><?php echo esc_html__('Setting Tools', 'google-analytics-for-wordpress'); ?></h2>
+	<p><?php echo esc_html__('You can use the below tools to import settings from other MonsterInsights websites or export settings to import into another MonsterInsights install.', 'google-analytics-for-wordpress'); ?> </p>
 	<br />
 	<table class="form-table">
 		<tbody>
 			<tr>
 				<th scope="row">
 					<label for="monsterinsights-import-settings">
-						<?php echo esc_html__( 'Import Settings', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__('Import Settings', 'google-analytics-for-wordpress'); ?>
 					</label>
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
-						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
+					if ( ! empty($_REQUEST['action']) && ! empty($_REQUEST['result']) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success') {
+						echo MonsterInsights()->notices->display_inline_notice('monsterinsights_standard_notice', '', __('Successfully imported settings!', 'google-analytics-for-wordpress'), 'success', false, array());
 					}
 					?>
 					<form method="post" enctype="multipart/form-data">
@@ -79,12 +79,12 @@ 
 							<input type="file" name="import_file"/>
 							<input type="hidden" name="monsterinsights_action" value="monsterinsights_import_settings" />
 						</p>
-						<p class="description"><?php echo esc_html__( 'Paste the import field content from another MonsterInsights site in above.', 'google-analytics-for-wordpress' );?></p>
+						<p class="description"><?php echo esc_html__('Paste the import field content from another MonsterInsights site in above.', 'google-analytics-for-wordpress'); ?></p>
 						<p>
-							<?php wp_nonce_field( 'monsterinsights_import_settings', 'monsterinsights_import_settings' ); ?>
+							<?php wp_nonce_field('monsterinsights_import_settings', 'monsterinsights_import_settings'); ?>
 						</p>
 						<p>
-							<?php submit_button( __( 'Import', 'google-analytics-for-wordpress' ), 'monsterinsights-action-button button button-action', 'submit', false ); ?>
+							<?php submit_button(__('Import', 'google-analytics-for-wordpress'), 'monsterinsights-action-button button button-action', 'submit', false); ?>
 						</p>
 					</form>
 				</td>
@@ -92,7 +92,7 @@ 
 			<tr>
 				<th scope="row">
 					<label for="monsterinsights-export-settings">
-						<?php echo esc_html__( 'Export Settings:', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__('Export Settings:', 'google-analytics-for-wordpress'); ?>
 					</label>
 				</th>
 				<td>
@@ -101,10 +101,10 @@ 
 							<input type="hidden" name="monsterinsights_action" value="monsterinsights_export_settings" />
 						</p>
 						<p>
-							<?php wp_nonce_field( 'monsterinsights_export_settings', 'monsterinsights_export_settings' ); ?>
+							<?php wp_nonce_field('monsterinsights_export_settings', 'monsterinsights_export_settings'); ?>
 						</p>
 						<p>
-							<?php submit_button( __( 'Export', 'google-analytics-for-wordpress' ), 'monsterinsights-settings-export monsterinsights-action-button button button-action', 'submit', false ); ?>
+							<?php submit_button(__('Export', 'google-analytics-for-wordpress'), 'monsterinsights-settings-export monsterinsights-action-button button button-action', 'submit', false); ?>
 						</p>
 					</form>
 				</td>
@@ -125,73 +125,73 @@ 
  * @return void
  */
 function monsterinsights_process_export_settings() {
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+	if ( ! isset($_POST['monsterinsights_action']) || empty($_POST['monsterinsights_action'])) {
 		return;
 	}
 
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	if ( ! current_user_can('monsterinsights_save_settings')) {
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+	if ($_POST['monsterinsights_action'] !== 'monsterinsights_export_settings') {
 		return;
 	}
 
-	if ( empty( $_POST['monsterinsights_export_settings'] ) || ! wp_verify_nonce( $_POST['monsterinsights_export_settings'], 'monsterinsights_export_settings' ) ) {
+	if (empty($_POST['monsterinsights_export_settings']) || ! wp_verify_nonce($_POST['monsterinsights_export_settings'], 'monsterinsights_export_settings')) {
 		return;
 	}
 	
 	$settings = monsterinsights_export_settings();
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
 	nocache_headers();
-	header( 'Content-Type: application/json; charset=utf-8' );
-	header( 'Content-Disposition: attachment; filename=monsterinsights-settings-export-' . date( 'm-d-Y' ) . '.json' );
-	header( "Expires: 0" );
+	header('Content-Type: application/json; charset=utf-8');
+	header('Content-Disposition: attachment; filename=monsterinsights-settings-export-' . date('m-d-Y') . '.json');
+	header("Expires: 0");
 
 	echo $settings;
 	exit;
 }
-add_action( 'admin_init', 'monsterinsights_process_export_settings' );
+add_action('admin_init', 'monsterinsights_process_export_settings');
 
 function monsterinsights_import_settings() {
 
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+	if ( ! isset($_POST['monsterinsights_action']) || empty($_POST['monsterinsights_action'])) {
 		return;
 	}
 
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	if ( ! current_user_can('monsterinsights_save_settings')) {
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+	if ($_POST['monsterinsights_action'] !== 'monsterinsights_import_settings') {
 		return;
 	}
 
-	if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
+	if ( ! wp_verify_nonce($_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings')) {
 		return;
 	}
 
-	$extension = explode( '.', $_FILES['import_file']['name'] );
-	$extension = end( $extension );
+	$extension = explode('.', $_FILES['import_file']['name']);
+	$extension = end($extension);
 
-	if ( $extension != 'json' ) {
-		wp_die( __( 'Please upload a valid .json file', 'google-analytics-for-wordpress' ) );
+	if ($extension != 'json') {
+		wp_die(__('Please upload a valid .json file', 'google-analytics-for-wordpress'));
 	}
 
 	$import_file = $_FILES['import_file']['tmp_name'];
 
-	if ( empty( $import_file ) ) {
-		wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
+	if (empty($import_file)) {
+		wp_die(__('Please upload a file to import', 'google-analytics-for-wordpress'));
 	}
 
-	$file     = file_get_contents( $import_file );
-	if ( empty( $file ) ) {
-		wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
+	$file = file_get_contents($import_file);
+	if (empty($file)) {
+		wp_die(__('Please upload a real settings export file to import', 'google-analytics-for-wordpress'));
 	}
 
 	// Retrieve the settings from the file and convert the json object to an array.
-	$new_settings = json_decode( wp_json_encode( json_decode( $file ) ), true );
+	$new_settings = json_decode(wp_json_encode(json_decode($file)), true);
 	$settings     = monsterinsights_get_options();
 	$exclude      = array( 
 						'analytics_profile',
@@ -202,28 +202,28 @@ 
 						'monsterinsights_oauth_status',
 	);
 
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $new_settings[ $e ] ) ) {
-			unset( $new_settings[ $e ] );
+	foreach ($exclude as $e) {
+		if ( ! empty($new_settings[$e])) {
+			unset($new_settings[$e]);
 		}
 	}
 
-	if ( ! is_super_admin() ) {
-		if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
-			unset( $new_settings[ 'custom_code' ] );
+	if ( ! is_super_admin()) {
+		if ( ! empty($new_settings['custom_code'])) {
+			unset($new_settings['custom_code']);
 		}
 	}
 
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			$new_settings = $settings[ $e ];
+	foreach ($exclude as $e) {
+		if ( ! empty($settings[$e])) {
+			$new_settings = $settings[$e];
 		}
 	}
 
 	global $monsterinsights_settings;
 	$monsterinsights_settings = $new_settings;
 
-	update_option( monsterinsights_get_option_name(), $new_settings );
-	wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_tools&action=import&result=success#monsterinsights-main-tab-settings' ) ); exit;
+	update_option(monsterinsights_get_option_name(), $new_settings);
+	wp_safe_redirect(admin_url('admin.php?page=monsterinsights_tools&action=import&result=success#monsterinsights-main-tab-settings')); exit;
 }
-add_action( 'admin_init', 'monsterinsights_import_settings' );
\ No newline at end of file
+add_action('admin_init', 'monsterinsights_import_settings');
\ No newline at end of file

Indentation +106 added lines, -106 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -13,15 +13,15 @@ 
  * @return void
  */
 function monsterinsights_tools_page() {
-	/** 
-	 * Developer Alert:
-	 *
-	 * Per the README, this is considered an internal hook and should
-	 * not be used by other developers. This hook's behavior may be modified
-	 * or the hook may be removed at any time, without warning.
-	 */
-	do_action( 'monsterinsights_head' );
-	?>
+    /** 
+     * Developer Alert:
+     *
+     * Per the README, this is considered an internal hook and should
+     * not be used by other developers. This hook's behavior may be modified
+     * or the hook may be removed at any time, without warning.
+     */
+    do_action( 'monsterinsights_head' );
+    ?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 
 	<!-- Tabs -->
@@ -52,11 +52,11 @@ 
 }
 
 function monsterinsights_tools_url_builder_tab(){
-	do_action( 'monsterinsights_tools_url_builder_tab' );
+    do_action( 'monsterinsights_tools_url_builder_tab' );
 }
 
 function monsterinsights_tools_settings_tab() {
-	ob_start();?>
+    ob_start();?>
 	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' );?></h2>
 	<p><?php echo esc_html__( 'You can use the below tools to import settings from other MonsterInsights websites or export settings to import into another MonsterInsights install.', 'google-analytics-for-wordpress' ); ?> </p>
 	<br />
@@ -70,10 +70,10 @@ 
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
-						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
-					}
-					?>
+                    if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
+                        echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
+                    }
+                    ?>
 					<form method="post" enctype="multipart/form-data">
 						<p>
 							<input type="file" name="import_file"/>
@@ -113,7 +113,7 @@ 
 		</tbody>
 	</table>
 	<?php
-	echo ob_get_clean();
+    echo ob_get_clean();
 }
 
 /**
@@ -125,105 +125,105 @@ 
  * @return void
  */
 function monsterinsights_process_export_settings() {
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
-		return;
-	}
+    if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+        return;
+    }
 
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-		return;
-	}
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+        return;
+    }
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
-		return;
-	}
+    if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+        return;
+    }
 
-	if ( empty( $_POST['monsterinsights_export_settings'] ) || ! wp_verify_nonce( $_POST['monsterinsights_export_settings'], 'monsterinsights_export_settings' ) ) {
-		return;
-	}
+    if ( empty( $_POST['monsterinsights_export_settings'] ) || ! wp_verify_nonce( $_POST['monsterinsights_export_settings'], 'monsterinsights_export_settings' ) ) {
+        return;
+    }
 	
-	$settings = monsterinsights_export_settings();
-	ignore_user_abort( true );
+    $settings = monsterinsights_export_settings();
+    ignore_user_abort( true );
 
-	nocache_headers();
-	header( 'Content-Type: application/json; charset=utf-8' );
-	header( 'Content-Disposition: attachment; filename=monsterinsights-settings-export-' . date( 'm-d-Y' ) . '.json' );
-	header( "Expires: 0" );
+    nocache_headers();
+    header( 'Content-Type: application/json; charset=utf-8' );
+    header( 'Content-Disposition: attachment; filename=monsterinsights-settings-export-' . date( 'm-d-Y' ) . '.json' );
+    header( "Expires: 0" );
 
-	echo $settings;
-	exit;
+    echo $settings;
+    exit;
 }
 add_action( 'admin_init', 'monsterinsights_process_export_settings' );
 
 function monsterinsights_import_settings() {
 
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
-		return;
-	}
-
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-		return;
-	}
-
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
-		return;
-	}
-
-	if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
-		return;
-	}
-
-	$extension = explode( '.', $_FILES['import_file']['name'] );
-	$extension = end( $extension );
-
-	if ( $extension != 'json' ) {
-		wp_die( __( 'Please upload a valid .json file', 'google-analytics-for-wordpress' ) );
-	}
-
-	$import_file = $_FILES['import_file']['tmp_name'];
-
-	if ( empty( $import_file ) ) {
-		wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
-	}
-
-	$file     = file_get_contents( $import_file );
-	if ( empty( $file ) ) {
-		wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
-	}
-
-	// Retrieve the settings from the file and convert the json object to an array.
-	$new_settings = json_decode( wp_json_encode( json_decode( $file ) ), true );
-	$settings     = monsterinsights_get_options();
-	$exclude      = array( 
-						'analytics_profile',
-						'analytics_profile_code',
-						'analytics_profile_name',
-						'oauth_version',
-						'cron_last_run',
-						'monsterinsights_oauth_status',
-	);
-
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $new_settings[ $e ] ) ) {
-			unset( $new_settings[ $e ] );
-		}
-	}
-
-	if ( ! is_super_admin() ) {
-		if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
-			unset( $new_settings[ 'custom_code' ] );
-		}
-	}
-
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			$new_settings = $settings[ $e ];
-		}
-	}
-
-	global $monsterinsights_settings;
-	$monsterinsights_settings = $new_settings;
-
-	update_option( monsterinsights_get_option_name(), $new_settings );
-	wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_tools&action=import&result=success#monsterinsights-main-tab-settings' ) ); exit;
+    if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+        return;
+    }
+
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+        return;
+    }
+
+    if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+        return;
+    }
+
+    if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
+        return;
+    }
+
+    $extension = explode( '.', $_FILES['import_file']['name'] );
+    $extension = end( $extension );
+
+    if ( $extension != 'json' ) {
+        wp_die( __( 'Please upload a valid .json file', 'google-analytics-for-wordpress' ) );
+    }
+
+    $import_file = $_FILES['import_file']['tmp_name'];
+
+    if ( empty( $import_file ) ) {
+        wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
+    }
+
+    $file     = file_get_contents( $import_file );
+    if ( empty( $file ) ) {
+        wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
+    }
+
+    // Retrieve the settings from the file and convert the json object to an array.
+    $new_settings = json_decode( wp_json_encode( json_decode( $file ) ), true );
+    $settings     = monsterinsights_get_options();
+    $exclude      = array( 
+                        'analytics_profile',
+                        'analytics_profile_code',
+                        'analytics_profile_name',
+                        'oauth_version',
+                        'cron_last_run',
+                        'monsterinsights_oauth_status',
+    );
+
+    foreach ( $exclude as $e ) {
+        if ( ! empty( $new_settings[ $e ] ) ) {
+            unset( $new_settings[ $e ] );
+        }
+    }
+
+    if ( ! is_super_admin() ) {
+        if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
+            unset( $new_settings[ 'custom_code' ] );
+        }
+    }
+
+    foreach ( $exclude as $e ) {
+        if ( ! empty( $settings[ $e ] ) ) {
+            $new_settings = $settings[ $e ];
+        }
+    }
+
+    global $monsterinsights_settings;
+    $monsterinsights_settings = $new_settings;
+
+    update_option( monsterinsights_get_option_name(), $new_settings );
+    wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_tools&action=import&result=success#monsterinsights-main-tab-settings' ) ); exit;
 }
 add_action( 'admin_init', 'monsterinsights_import_settings' );
\ No newline at end of file

includes/admin/pages/reports.php

Spacing +51 added lines, -51 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,7 +30,7 @@ 
 	 * not be used by other developers. This hook's behavior may be modified
 	 * or the hook may be removed at any time, without warning.
 	 */
-	$reports =  apply_filters( 'monsterinsights_get_reports', array() );
+	$reports = apply_filters('monsterinsights_get_reports', array());
 	return $reports;
 }
 
@@ -50,20 +50,20 @@ 
 	 * not be used by other developers. This hook's behavior may be modified
 	 * or the hook may be removed at any time, without warning.
 	 */
-	do_action( 'monsterinsights_head' );
+	do_action('monsterinsights_head');
 
-	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+	if ( ! current_user_can('monsterinsights_view_dashboard')) {
+		wp_die(esc_html__('Access denied', 'google-analytics-for-wordpress'));
 	}
 	
-	$dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
-	$profile_enabled    = monsterinsights_get_option( 'analytics_profile', false ); // not using profile
-	$oauth_version      = monsterinsights_get_option( 'oauth_version', '1.0' );
-	$last_run           = monsterinsights_get_option( 'cron_last_run', false );
-	$failed             = monsterinsights_get_option( 'cron_failed', false );
-	$pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
-	$lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
-	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
+	$dashboard_disabled = monsterinsights_get_option('dashboard_disabled', false);
+	$profile_enabled    = monsterinsights_get_option('analytics_profile', false); // not using profile
+	$oauth_version      = monsterinsights_get_option('oauth_version', '1.0');
+	$last_run           = monsterinsights_get_option('cron_last_run', false);
+	$failed             = monsterinsights_get_option('cron_failed', false);
+	$pro_access_key     = get_option('monsterinsights_pro_access_token', false);
+	$lite_access_key    = get_option('monsterinsights_lite_access_token', false);
+	$needs_re_auth      = (($failed && ($last_run === false || monsterinsights_hours_between($last_run) >= 48)) || (empty($pro_access_key) && empty($lite_access_key)) || (version_compare($oauth_version, '1.0', '<'))) ? true : false;
 	?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 	
@@ -74,11 +74,11 @@ 
 		?>
 		<a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-spacing-item" href="#">&nbsp;</a>
 		<?php
-		foreach ( (array) monsterinsights_get_reports() as $id => $title ) {
-			$class = ( 0 === $i ? 'monsterinsights-active' : '' ); 
+		foreach ((array) monsterinsights_get_reports() as $id => $title) {
+			$class = (0 === $i ? 'monsterinsights-active' : ''); 
 			?>
-			<a class="monsterinsights-main-nav-item monsterinsights-nav-item <?php echo $class; ?>" href="#monsterinsights-main-tab-<?php echo esc_attr( $id ); ?>" title="<?php echo esc_attr( $title ); ?>">
-				<?php echo esc_html( $title ); ?>
+			<a class="monsterinsights-main-nav-item monsterinsights-nav-item <?php echo $class; ?>" href="#monsterinsights-main-tab-<?php echo esc_attr($id); ?>" title="<?php echo esc_attr($title); ?>">
+				<?php echo esc_html($title); ?>
 			</a>
 			<?php 
 			$i++; 
@@ -90,7 +90,7 @@ 
 		<div class="monsterinsights-clear">
 			<div class="monsterinsights-reports-action-bar">
 				<div class="monsterinsights-reports-action-bar-title">
-					<?php esc_html_e( 'Reports', 'google-analytics-for-wordpress' );?>
+					<?php esc_html_e('Reports', 'google-analytics-for-wordpress'); ?>
 				</div>
 				<div class="monsterinsights-reports-action-bar-actions"><?php 
 					/** 
@@ -100,7 +100,7 @@ 
 					 * not be used by other developers. This hook's behavior may be modified
 					 * or the hook may be removed at any time, without warning.
 					 */
-					do_action( 'monsterinsights_tab_reports_actions' ); 
+					do_action('monsterinsights_tab_reports_actions'); 
 					?> 
 				</div>
 			</div>
@@ -110,64 +110,64 @@ 
 				<h1 class="monsterinsights-hideme"></h1><!-- so wp notices are below the nav bar -->
 				<?php 
 				$i = 0; 
-				foreach ( (array) monsterinsights_get_reports() as $id => $title ) {
-					$class = ( 0 === $i ? 'monsterinsights-active' : '' ); 
+				foreach ((array) monsterinsights_get_reports() as $id => $title) {
+					$class = (0 === $i ? 'monsterinsights-active' : ''); 
 					?>
-					<div id="monsterinsights-main-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-main-nav-tab monsterinsights-nav-tab <?php echo $class; ?>">
-						<?php if ( $dashboard_disabled ) { ?>
+					<div id="monsterinsights-main-tab-<?php echo esc_attr($id); ?>" class="monsterinsights-main-nav-tab monsterinsights-nav-tab <?php echo $class; ?>">
+						<?php if ($dashboard_disabled) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
+								if (current_user_can('monsterinsights_save_settings')) {
+									echo monsterinsights_get_message('error', sprintf(
 										sprintf(
-											 esc_html__( 'Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress' ),
-												'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+											 esc_html__('Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress'),
+												'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 												'</a>'
 											)
-										) );
+										));
 								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+									echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 								}
 								?>
-						<?php } else if ( ! $profile_enabled ) { ?>
+						<?php } else if ( ! $profile_enabled) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
+								if (current_user_can('monsterinsights_save_settings')) {
+									echo monsterinsights_get_message('error', sprintf(
 										sprintf(
-											 esc_html__( 'Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-												'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+											 esc_html__('Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress'),
+												'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 												'</a>'
 											)
-										) );
+										));
 								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+									echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 								}
 								?>
-						<?php } else if ( $needs_re_auth ) { ?>
+						<?php } else if ($needs_re_auth) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
+								if (current_user_can('monsterinsights_save_settings')) {
+									echo monsterinsights_get_message('error', sprintf(
 										sprintf(
-											 esc_html__( 'Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-												'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+											 esc_html__('Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress'),
+												'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 												'</a>'
 											)
-										) );
+										));
 								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+									echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 								}
 								?>
-						<?php } else if ( $failed ) { ?>
+						<?php } else if ($failed) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
+								if (current_user_can('monsterinsights_save_settings')) {
+									echo monsterinsights_get_message('error', sprintf(
 										sprintf(
-											esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
+											esc_html__('Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress'),
 											'<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
 											'</a>'
 										)
-									) );
+									));
 								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+									echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 								}
 								?>
 						<?php } else { ?>
@@ -181,7 +181,7 @@ 
 							 * or the hook may be removed at any time, without warning.
 							 */
 							?>
-							<?php do_action( 'monsterinsights_tab_reports_notices' ); ?>
+							<?php do_action('monsterinsights_tab_reports_notices'); ?>
 							<?php
 							/** 
 							 * Developer Alert:
@@ -191,7 +191,7 @@ 
 							 * or the hook may be removed at any time, without warning.
 							 */
 							?>
-							<?php do_action( 'monsterinsights_tab_reports_' . $id ); ?>
+							<?php do_action('monsterinsights_tab_reports_' . $id); ?>
 						</div>
 						<?php } ?>
 					</div>

Indentation +118 added lines, -118 removed lines

@@ -11,7 +11,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -23,15 +23,15 @@ 
  * @return array Array of tab information.
  */
 function monsterinsights_get_reports() {
-	/** 
-	 * Developer Alert:
-	 *
-	 * Per the README, this is considered an internal hook and should
-	 * not be used by other developers. This hook's behavior may be modified
-	 * or the hook may be removed at any time, without warning.
-	 */
-	$reports =  apply_filters( 'monsterinsights_get_reports', array() );
-	return $reports;
+    /** 
+     * Developer Alert:
+     *
+     * Per the README, this is considered an internal hook and should
+     * not be used by other developers. This hook's behavior may be modified
+     * or the hook may be removed at any time, without warning.
+     */
+    $reports =  apply_filters( 'monsterinsights_get_reports', array() );
+    return $reports;
 }
 
 /**
@@ -43,47 +43,47 @@ 
  * @return void
  */
 function monsterinsights_reports_page() {
-	/** 
-	 * Developer Alert:
-	 *
-	 * Per the README, this is considered an internal hook and should
-	 * not be used by other developers. This hook's behavior may be modified
-	 * or the hook may be removed at any time, without warning.
-	 */
-	do_action( 'monsterinsights_head' );
+    /** 
+     * Developer Alert:
+     *
+     * Per the README, this is considered an internal hook and should
+     * not be used by other developers. This hook's behavior may be modified
+     * or the hook may be removed at any time, without warning.
+     */
+    do_action( 'monsterinsights_head' );
 
-	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
-	}
+    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+        wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+    }
 	
-	$dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
-	$profile_enabled    = monsterinsights_get_option( 'analytics_profile', false ); // not using profile
-	$oauth_version      = monsterinsights_get_option( 'oauth_version', '1.0' );
-	$last_run           = monsterinsights_get_option( 'cron_last_run', false );
-	$failed             = monsterinsights_get_option( 'cron_failed', false );
-	$pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
-	$lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
-	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
-	?>
+    $dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
+    $profile_enabled    = monsterinsights_get_option( 'analytics_profile', false ); // not using profile
+    $oauth_version      = monsterinsights_get_option( 'oauth_version', '1.0' );
+    $last_run           = monsterinsights_get_option( 'cron_last_run', false );
+    $failed             = monsterinsights_get_option( 'cron_failed', false );
+    $pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
+    $lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
+    $needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
+    ?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 	
 	<!-- Tabs -->
 	<h1 id="monsterinsights-reports-page-main-nav" class="monsterinsights-main-nav-container monsterinsights-nav-container" data-container="#monsterinsights-reports-pages" data-update-hashbang="1">
 		<?php 
-		$i = 0;
-		?>
+        $i = 0;
+        ?>
 		<a class="monsterinsights-main-nav-item monsterinsights-nav-item monsterinsights-spacing-item" href="#">&nbsp;</a>
 		<?php
-		foreach ( (array) monsterinsights_get_reports() as $id => $title ) {
-			$class = ( 0 === $i ? 'monsterinsights-active' : '' ); 
-			?>
+        foreach ( (array) monsterinsights_get_reports() as $id => $title ) {
+            $class = ( 0 === $i ? 'monsterinsights-active' : '' ); 
+            ?>
 			<a class="monsterinsights-main-nav-item monsterinsights-nav-item <?php echo $class; ?>" href="#monsterinsights-main-tab-<?php echo esc_attr( $id ); ?>" title="<?php echo esc_attr( $title ); ?>">
 				<?php echo esc_html( $title ); ?>
 			</a>
 			<?php 
-			$i++; 
-		}
-		?>
+            $i++; 
+        }
+        ?>
 	</h1>
 
 	<div id="monsterinsights-reports" class="wrap">
@@ -93,15 +93,15 @@ 
 					<?php esc_html_e( 'Reports', 'google-analytics-for-wordpress' );?>
 				</div>
 				<div class="monsterinsights-reports-action-bar-actions"><?php 
-					/** 
-					 * Developer Alert:
-					 *
-					 * Per the README, this is considered an internal hook and should
-					 * not be used by other developers. This hook's behavior may be modified
-					 * or the hook may be removed at any time, without warning.
-					 */
-					do_action( 'monsterinsights_tab_reports_actions' ); 
-					?> 
+                    /** 
+                     * Developer Alert:
+                     *
+                     * Per the README, this is considered an internal hook and should
+                     * not be used by other developers. This hook's behavior may be modified
+                     * or the hook may be removed at any time, without warning.
+                     */
+                    do_action( 'monsterinsights_tab_reports_actions' ); 
+                    ?> 
 				</div>
 			</div>
 
@@ -109,96 +109,96 @@ 
 			<div id="monsterinsights-reports-pages" class="monsterinsights-main-nav-tabs monsterinsights-nav-tabs" data-navigation="#monsterinsights-reports-page-main-nav">
 				<h1 class="monsterinsights-hideme"></h1><!-- so wp notices are below the nav bar -->
 				<?php 
-				$i = 0; 
-				foreach ( (array) monsterinsights_get_reports() as $id => $title ) {
-					$class = ( 0 === $i ? 'monsterinsights-active' : '' ); 
-					?>
+                $i = 0; 
+                foreach ( (array) monsterinsights_get_reports() as $id => $title ) {
+                    $class = ( 0 === $i ? 'monsterinsights-active' : '' ); 
+                    ?>
 					<div id="monsterinsights-main-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-main-nav-tab monsterinsights-nav-tab <?php echo $class; ?>">
 						<?php if ( $dashboard_disabled ) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
-										sprintf(
-											 esc_html__( 'Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress' ),
-												'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-												'</a>'
-											)
-										) );
-								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-								}
-								?>
+                                if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                                    echo monsterinsights_get_message( 'error', sprintf(
+                                        sprintf(
+                                                esc_html__( 'Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress' ),
+                                                '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                                                '</a>'
+                                            )
+                                        ) );
+                                } else {
+                                    echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                                }
+                                ?>
 						<?php } else if ( ! $profile_enabled ) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
-										sprintf(
-											 esc_html__( 'Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-												'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-												'</a>'
-											)
-										) );
-								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-								}
-								?>
+                                if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                                    echo monsterinsights_get_message( 'error', sprintf(
+                                        sprintf(
+                                                esc_html__( 'Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
+                                                '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                                                '</a>'
+                                            )
+                                        ) );
+                                } else {
+                                    echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                                }
+                                ?>
 						<?php } else if ( $needs_re_auth ) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
-										sprintf(
-											 esc_html__( 'Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-												'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-												'</a>'
-											)
-										) );
-								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-								}
-								?>
+                                if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                                    echo monsterinsights_get_message( 'error', sprintf(
+                                        sprintf(
+                                                esc_html__( 'Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
+                                                '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                                                '</a>'
+                                            )
+                                        ) );
+                                } else {
+                                    echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                                }
+                                ?>
 						<?php } else if ( $failed ) { ?>
 								<?php 
-								if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-									echo monsterinsights_get_message( 'error', sprintf(
-										sprintf(
-											esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
-											'<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
-											'</a>'
-										)
-									) );
-								} else {
-									echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-								}
-								?>
+                                if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                                    echo monsterinsights_get_message( 'error', sprintf(
+                                        sprintf(
+                                            esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
+                                            '<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
+                                            '</a>'
+                                        )
+                                    ) );
+                                } else {
+                                    echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                                }
+                                ?>
 						<?php } else { ?>
 						 <div class="monsterinsights-reports-wrap">
 							<?php
-							/** 
-							 * Developer Alert:
-							 *
-							 * Per the README, this is considered an internal hook and should
-							 * not be used by other developers. This hook's behavior may be modified
-							 * or the hook may be removed at any time, without warning.
-							 */
-							?>
+                            /** 
+                             * Developer Alert:
+                             *
+                             * Per the README, this is considered an internal hook and should
+                             * not be used by other developers. This hook's behavior may be modified
+                             * or the hook may be removed at any time, without warning.
+                             */
+                            ?>
 							<?php do_action( 'monsterinsights_tab_reports_notices' ); ?>
 							<?php
-							/** 
-							 * Developer Alert:
-							 *
-							 * Per the README, this is considered an internal hook and should
-							 * not be used by other developers. This hook's behavior may be modified
-							 * or the hook may be removed at any time, without warning.
-							 */
-							?>
+                            /** 
+                             * Developer Alert:
+                             *
+                             * Per the README, this is considered an internal hook and should
+                             * not be used by other developers. This hook's behavior may be modified
+                             * or the hook may be removed at any time, without warning.
+                             */
+                            ?>
 							<?php do_action( 'monsterinsights_tab_reports_' . $id ); ?>
 						</div>
 						<?php } ?>
 					</div>
 					<?php
-					$i++;
-				}
-				?>
+                    $i++;
+                }
+                ?>
 			</div>
 		</div>
 	</div>

includes/admin/pages/dashboard.php

Spacing +45 added lines, -45 removed lines

@@ -9,9 +9,9 @@ 
  */
 function monsterinsights_get_dashboard_report() {
 	$reports = monsterinsights_get_reports();
-	$picked  = monsterinsights_get_option( 'dashboard_report', 'overview' );
-	if ( ! empty( $reports ) && is_array( $reports ) && array_key_exists ( $picked, $reports ) ) {
-		return array( 'id' => $picked, 'title' => $reports[ $picked ] );
+	$picked  = monsterinsights_get_option('dashboard_report', 'overview');
+	if ( ! empty($reports) && is_array($reports) && array_key_exists($picked, $reports)) {
+		return array('id' => $picked, 'title' => $reports[$picked]);
 	} else {
 		return array();
 	}
@@ -33,27 +33,27 @@ 
 	 * not be used by other developers. This hook's behavior may be modified
 	 * or the hook may be removed at any time, without warning.
 	 */
-	do_action( 'monsterinsights_head' );
+	do_action('monsterinsights_head');
 
-	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+	if ( ! current_user_can('monsterinsights_view_dashboard')) {
+		wp_die(esc_html__('Access denied', 'google-analytics-for-wordpress'));
 	}
 
-	$dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
-	$profile_enabled    = monsterinsights_get_option( 'analytics_profile', false ); // not using profile
-	$oauth_version      = monsterinsights_get_option( 'oauth_version', '1.0' );
-	$last_run           = monsterinsights_get_option( 'cron_last_run', false );
-	$failed             = monsterinsights_get_option( 'cron_failed', false );
-	$pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
-	$lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
-	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
+	$dashboard_disabled = monsterinsights_get_option('dashboard_disabled', false);
+	$profile_enabled    = monsterinsights_get_option('analytics_profile', false); // not using profile
+	$oauth_version      = monsterinsights_get_option('oauth_version', '1.0');
+	$last_run           = monsterinsights_get_option('cron_last_run', false);
+	$failed             = monsterinsights_get_option('cron_failed', false);
+	$pro_access_key     = get_option('monsterinsights_pro_access_token', false);
+	$lite_access_key    = get_option('monsterinsights_lite_access_token', false);
+	$needs_re_auth      = (($failed && ($last_run === false || monsterinsights_hours_between($last_run) >= 48)) || (empty($pro_access_key) && empty($lite_access_key)) || (version_compare($oauth_version, '1.0', '<'))) ? true : false;
 	?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 	<div id="monsterinsights-reports" class="wrap">
 		<div class="monsterinsights-clear">
 			<div class="monsterinsights-reports-action-bar">
 				<div class="monsterinsights-reports-action-bar-title">
-					<?php esc_html_e( 'Dashboard', 'google-analytics-for-wordpress' );?>
+					<?php esc_html_e('Dashboard', 'google-analytics-for-wordpress'); ?>
 				</div>
 				<div class="monsterinsights-reports-action-bar-actions"><?php 
 					/** 
@@ -63,7 +63,7 @@ 
 					 * not be used by other developers. This hook's behavior may be modified
 					 * or the hook may be removed at any time, without warning.
 					 */
-					do_action( 'monsterinsights_tab_reports_actions' ); 
+					do_action('monsterinsights_tab_reports_actions'); 
 					?> 
 				</div>
 			</div>
@@ -71,60 +71,60 @@ 
 			$report = monsterinsights_get_dashboard_report();
 			?>
 			<div id="monsterinsights_dashboard_container">
-				<?php if ( $dashboard_disabled ) { ?>
+				<?php if ($dashboard_disabled) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
+						if (current_user_can('monsterinsights_save_settings')) {
+							echo monsterinsights_get_message('error', sprintf(
 								sprintf(
-									 esc_html__( 'Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress' ),
-										'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+									 esc_html__('Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress'),
+										'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 										'</a>'
 									)
-								) );
+								));
 						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+							echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 						}
 						?>
-				<?php } else if ( ! $profile_enabled ) { ?>
+				<?php } else if ( ! $profile_enabled) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
+						if (current_user_can('monsterinsights_save_settings')) {
+							echo monsterinsights_get_message('error', sprintf(
 								sprintf(
-									 esc_html__( 'Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-										'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+									 esc_html__('Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress'),
+										'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 										'</a>'
 									)
-								) );
+								));
 						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+							echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 						}
 						?>
-				<?php } else if ( $needs_re_auth ) { ?>
+				<?php } else if ($needs_re_auth) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
+						if (current_user_can('monsterinsights_save_settings')) {
+							echo monsterinsights_get_message('error', sprintf(
 								sprintf(
-									 esc_html__( 'Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-										'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+									 esc_html__('Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress'),
+										'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 										'</a>'
 									)
-								) );
+								));
 						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+							echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 						}
 						?>
-				<?php } else if ( $failed ) { ?>
+				<?php } else if ($failed) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
+						if (current_user_can('monsterinsights_save_settings')) {
+							echo monsterinsights_get_message('error', sprintf(
 								sprintf(
-									esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
+									esc_html__('Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress'),
 									'<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
 									'</a>'
 								)
-							) );
+							));
 						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+							echo monsterinsights_get_message('error', esc_html__('The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress'));
 						}
 						?>
 				<?php } else { ?>
@@ -138,7 +138,7 @@ 
 					 * or the hook may be removed at any time, without warning.
 					 */
 					?>
-					<?php do_action( 'monsterinsights_tab_reports_notices' ); ?>
+					<?php do_action('monsterinsights_tab_reports_notices'); ?>
 					<?php
 					/** 
 					 * Developer Alert:
@@ -148,7 +148,7 @@ 
 					 * or the hook may be removed at any time, without warning.
 					 */
 					?>
-					<?php do_action( 'monsterinsights_tab_reports_' . $report['id'] ); ?>
+					<?php do_action('monsterinsights_tab_reports_' . $report['id']); ?>
 				</div>
 				<?php } ?>
 			</div>

Indentation +102 added lines, -102 removed lines

@@ -8,13 +8,13 @@ 
  * @return array Array of tab information.
  */
 function monsterinsights_get_dashboard_report() {
-	$reports = monsterinsights_get_reports();
-	$picked  = monsterinsights_get_option( 'dashboard_report', 'overview' );
-	if ( ! empty( $reports ) && is_array( $reports ) && array_key_exists ( $picked, $reports ) ) {
-		return array( 'id' => $picked, 'title' => $reports[ $picked ] );
-	} else {
-		return array();
-	}
+    $reports = monsterinsights_get_reports();
+    $picked  = monsterinsights_get_option( 'dashboard_report', 'overview' );
+    if ( ! empty( $reports ) && is_array( $reports ) && array_key_exists ( $picked, $reports ) ) {
+        return array( 'id' => $picked, 'title' => $reports[ $picked ] );
+    } else {
+        return array();
+    }
 }
 
 /**
@@ -26,28 +26,28 @@ 
  * @return void
  */
 function monsterinsights_dashboard_page() {
-	/** 
-	 * Developer Alert:
-	 *
-	 * Per the README, this is considered an internal hook and should
-	 * not be used by other developers. This hook's behavior may be modified
-	 * or the hook may be removed at any time, without warning.
-	 */
-	do_action( 'monsterinsights_head' );
+    /** 
+     * Developer Alert:
+     *
+     * Per the README, this is considered an internal hook and should
+     * not be used by other developers. This hook's behavior may be modified
+     * or the hook may be removed at any time, without warning.
+     */
+    do_action( 'monsterinsights_head' );
 
-	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
-	}
+    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+        wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+    }
 
-	$dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
-	$profile_enabled    = monsterinsights_get_option( 'analytics_profile', false ); // not using profile
-	$oauth_version      = monsterinsights_get_option( 'oauth_version', '1.0' );
-	$last_run           = monsterinsights_get_option( 'cron_last_run', false );
-	$failed             = monsterinsights_get_option( 'cron_failed', false );
-	$pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
-	$lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
-	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
-	?>
+    $dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
+    $profile_enabled    = monsterinsights_get_option( 'analytics_profile', false ); // not using profile
+    $oauth_version      = monsterinsights_get_option( 'oauth_version', '1.0' );
+    $last_run           = monsterinsights_get_option( 'cron_last_run', false );
+    $failed             = monsterinsights_get_option( 'cron_failed', false );
+    $pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
+    $lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
+    $needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
+    ?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 	<div id="monsterinsights-reports" class="wrap">
 		<div class="monsterinsights-clear">
@@ -56,98 +56,98 @@ 
 					<?php esc_html_e( 'Dashboard', 'google-analytics-for-wordpress' );?>
 				</div>
 				<div class="monsterinsights-reports-action-bar-actions"><?php 
-					/** 
-					 * Developer Alert:
-					 *
-					 * Per the README, this is considered an internal hook and should
-					 * not be used by other developers. This hook's behavior may be modified
-					 * or the hook may be removed at any time, without warning.
-					 */
-					do_action( 'monsterinsights_tab_reports_actions' ); 
-					?> 
+                    /** 
+                     * Developer Alert:
+                     *
+                     * Per the README, this is considered an internal hook and should
+                     * not be used by other developers. This hook's behavior may be modified
+                     * or the hook may be removed at any time, without warning.
+                     */
+                    do_action( 'monsterinsights_tab_reports_actions' ); 
+                    ?> 
 				</div>
 			</div>
 			<?php 
-			$report = monsterinsights_get_dashboard_report();
-			?>
+            $report = monsterinsights_get_dashboard_report();
+            ?>
 			<div id="monsterinsights_dashboard_container">
 				<?php if ( $dashboard_disabled ) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
-								sprintf(
-									 esc_html__( 'Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress' ),
-										'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-										'</a>'
-									)
-								) );
-						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-						}
-						?>
+                        if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                            echo monsterinsights_get_message( 'error', sprintf(
+                                sprintf(
+                                        esc_html__( 'Please %1$senable the dashboard%2$s to see report data.', 'google-analytics-for-wordpress' ),
+                                        '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                                        '</a>'
+                                    )
+                                ) );
+                        } else {
+                            echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                        }
+                        ?>
 				<?php } else if ( ! $profile_enabled ) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
-								sprintf(
-									 esc_html__( 'Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-										'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-										'</a>'
-									)
-								) );
-						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-						}
-						?>
+                        if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                            echo monsterinsights_get_message( 'error', sprintf(
+                                sprintf(
+                                        esc_html__( 'Please %1$sauthenticate %2$swith Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
+                                        '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                                        '</a>'
+                                    )
+                                ) );
+                        } else {
+                            echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                        }
+                        ?>
 				<?php } else if ( $needs_re_auth ) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
-								sprintf(
-									 esc_html__( 'Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-										'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-										'</a>'
-									)
-								) );
-						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-						}
-						?>
+                        if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                            echo monsterinsights_get_message( 'error', sprintf(
+                                sprintf(
+                                        esc_html__( 'Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
+                                        '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                                        '</a>'
+                                    )
+                                ) );
+                        } else {
+                            echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                        }
+                        ?>
 				<?php } else if ( $failed ) { ?>
 						<?php 
-						if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-							echo monsterinsights_get_message( 'error', sprintf(
-								sprintf(
-									esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
-									'<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
-									'</a>'
-								)
-							) );
-						} else {
-							echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
-						}
-						?>
+                        if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                            echo monsterinsights_get_message( 'error', sprintf(
+                                sprintf(
+                                    esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
+                                    '<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
+                                    '</a>'
+                                )
+                            ) );
+                        } else {
+                            echo monsterinsights_get_message( 'error', esc_html__( 'The Google oAuth authentication needs to be re-authenticated to view data.', 'google-analytics-for-wordpress' ) );
+                        }
+                        ?>
 				<?php } else { ?>
 				 <div class="monsterinsights-reports-wrap">
 					<?php
-					/** 
-					 * Developer Alert:
-					 *
-					 * Per the README, this is considered an internal hook and should
-					 * not be used by other developers. This hook's behavior may be modified
-					 * or the hook may be removed at any time, without warning.
-					 */
-					?>
+                    /** 
+                     * Developer Alert:
+                     *
+                     * Per the README, this is considered an internal hook and should
+                     * not be used by other developers. This hook's behavior may be modified
+                     * or the hook may be removed at any time, without warning.
+                     */
+                    ?>
 					<?php do_action( 'monsterinsights_tab_reports_notices' ); ?>
 					<?php
-					/** 
-					 * Developer Alert:
-					 *
-					 * Per the README, this is considered an internal hook and should
-					 * not be used by other developers. This hook's behavior may be modified
-					 * or the hook may be removed at any time, without warning.
-					 */
-					?>
+                    /** 
+                     * Developer Alert:
+                     *
+                     * Per the README, this is considered an internal hook and should
+                     * not be used by other developers. This hook's behavior may be modified
+                     * or the hook may be removed at any time, without warning.
+                     */
+                    ?>
 					<?php do_action( 'monsterinsights_tab_reports_' . $report['id'] ); ?>
 				</div>
 				<?php } ?>

includes/admin/pages/network-settings.php

Spacing +41 added lines, -41 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -30,11 +30,11 @@ 
      * not be used by other developers. This hook's behavior may be modified
      * or the hook may be removed at any time, without warning.
      */
-    do_action( 'monsterinsights_head' );
-    $network_license             = get_site_option( 'monsterinsights_license' );
-    $license_key                 = ! empty( $network_license['key'] ) ? esc_attr( $network_license['key'] ) : '';
-    $license_key_type            = ! empty( $network_license['type'] ) ? esc_html( $network_license['type'] ) : '';
-    $network_ua_code             = get_site_option('monsterinsights_network_manual_ua_code', false );
+    do_action('monsterinsights_head');
+    $network_license             = get_site_option('monsterinsights_license');
+    $license_key                 = ! empty($network_license['key']) ? esc_attr($network_license['key']) : '';
+    $license_key_type            = ! empty($network_license['type']) ? esc_html($network_license['type']) : '';
+    $network_ua_code             = get_site_option('monsterinsights_network_manual_ua_code', false);
     ?>
     <?php echo monsterinsights_ublock_notice(); ?>
     <div id="monsterinsights-settings" class="wrap">
@@ -50,40 +50,40 @@ 
                      * not be used by other developers. This hook's behavior may be modified
                      * or the hook may be removed at any time, without warning.
                      */
-                    do_action( 'monsterinsights_network_settings_general_tab_notice' );
+                    do_action('monsterinsights_network_settings_general_tab_notice');
                     ?>
-                    <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress'); ?></h1>
-                    <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
+                    <h1><?php esc_html_e('Network Settings', 'google-analytics-for-wordpress'); ?></h1>
+                    <p><?php esc_html_e('Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
                     <table class="form-table">
                         <tbody>
-                            <?php if ( monsterinsights_is_pro_version() ) : ?>
+                            <?php if (monsterinsights_is_pro_version()) : ?>
                             <tr id="monsterinsights-settings-key-box">
                                 <th scope="row">
-                                    <label for="monsterinsights-settings-key"><?php esc_html_e( 'License Key', 'google-analytics-for-wordpress' ); ?></label>
+                                    <label for="monsterinsights-settings-key"><?php esc_html_e('License Key', 'google-analytics-for-wordpress'); ?></label>
                                 </th>
                                 <td>
                                     <form id="monsterinsights-settings-verify-key" method="post">
-                                        <input type="password" name="monsterinsights-license-key" id="monsterinsights-settings-key" value="<?php echo esc_attr( $license_key ); ?>" />
-                                        <?php wp_nonce_field( 'monsterinsights-key-nonce', 'monsterinsights-key-nonce' ); ?>
-                                        <?php submit_button( esc_html__( 'Verify Key', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-verify-submit', false ); ?>
-                                        <?php submit_button( esc_html__( 'Deactivate Key', 'google-analytics-for-wordpress' ), 'button-danger', 'monsterinsights-deactivate-submit', false ); ?>
-                                        <p class="description"><?php esc_html_e( 'License key to enable automatic updates for MonsterInsights Pro & addons. Deactivate your license if you want to use it on another WordPress site.', 'google-analytics-for-wordpress' ); ?></p>
+                                        <input type="password" name="monsterinsights-license-key" id="monsterinsights-settings-key" value="<?php echo esc_attr($license_key); ?>" />
+                                        <?php wp_nonce_field('monsterinsights-key-nonce', 'monsterinsights-key-nonce'); ?>
+                                        <?php submit_button(esc_html__('Verify Key', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-verify-submit', false); ?>
+                                        <?php submit_button(esc_html__('Deactivate Key', 'google-analytics-for-wordpress'), 'button-danger', 'monsterinsights-deactivate-submit', false); ?>
+                                        <p class="description"><?php esc_html_e('License key to enable automatic updates for MonsterInsights Pro & addons. Deactivate your license if you want to use it on another WordPress site.', 'google-analytics-for-wordpress'); ?></p>
                                     </form>
                                 </td>
                             </tr>
                             <?php endif; ?>
-                            <?php if ( ! empty( $license_key_type ) && monsterinsights_is_pro_version() ) : ?>
+                            <?php if ( ! empty($license_key_type) && monsterinsights_is_pro_version()) : ?>
                             <tr id="monsterinsights-settings-key-type-box">
                                 <th scope="row">
-                                    <label for="monsterinsights-settings-key-type"><?php esc_html_e( 'License Key Type', 'google-analytics-for-wordpress' ); ?></label>
+                                    <label for="monsterinsights-settings-key-type"><?php esc_html_e('License Key Type', 'google-analytics-for-wordpress'); ?></label>
                                 </th>
                                 <td>
                                     <form id="monsterinsights-settings-key-type" method="post">
-                                        <span class="monsterinsights-license-type"><?php printf( esc_html__( 'Your license key type for this site is %s.', 'google-analytics-for-wordpress' ), '<strong>' . $license_key_type . '</strong>' ); ?>
-                                        <input type="hidden" name="monsterinsights-license-key" value="<?php echo esc_attr( $license_key ); ?>" />
-                                        <?php wp_nonce_field( 'monsterinsights-key-nonce', 'monsterinsights-key-nonce' ); ?>
-                                        <?php submit_button( esc_html__( 'Refresh Key', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-refresh-submit', false ); ?>
-                                        <p class="description"><?php esc_html_e( 'Your license key type (handles updates and Addons). Click refresh if your license has been upgraded or the type is incorrect.', 'google-analytics-for-wordpress' ); ?></p>
+                                        <span class="monsterinsights-license-type"><?php printf(esc_html__('Your license key type for this site is %s.', 'google-analytics-for-wordpress'), '<strong>' . $license_key_type . '</strong>'); ?>
+                                        <input type="hidden" name="monsterinsights-license-key" value="<?php echo esc_attr($license_key); ?>" />
+                                        <?php wp_nonce_field('monsterinsights-key-nonce', 'monsterinsights-key-nonce'); ?>
+                                        <?php submit_button(esc_html__('Refresh Key', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-refresh-submit', false); ?>
+                                        <p class="description"><?php esc_html_e('Your license key type (handles updates and Addons). Click refresh if your license has been upgraded or the type is incorrect.', 'google-analytics-for-wordpress'); ?></p>
                                     </form>
                                 </td>
                             </tr>
@@ -91,12 +91,12 @@ 
                             <tr>
                                 <form id="monsterinsights-network-general-tab" method="post">
                                     <th scope="row">
-                                        <label for="monsterinsights-google-ua"><?php esc_html_e( 'Network UA code', 'google-analytics-for-wordpress' ); ?></label>
+                                        <label for="monsterinsights-google-ua"><?php esc_html_e('Network UA code', 'google-analytics-for-wordpress'); ?></label>
                                     </th>
                                     <td>
-                                        <input type="text" id="monsterinsights-network-ua-code" name="network_manual_ua_code" value="<?php echo $network_ua_code; ?>" /><?php submit_button( esc_html__( 'Save Network UA code', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-network-settings-submit', false ); ?>
-                                        <p class="description"><?php esc_html_e( 'This is the default UA code to use for subsites of a network (can be overriden at the single site level).', 'google-analytics-for-wordpress' ); ?></p>
-                                        <?php wp_nonce_field( 'monsterinsights-network-settings-nonce', 'monsterinsights-network-settings-nonce' ); ?>
+                                        <input type="text" id="monsterinsights-network-ua-code" name="network_manual_ua_code" value="<?php echo $network_ua_code; ?>" /><?php submit_button(esc_html__('Save Network UA code', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-network-settings-submit', false); ?>
+                                        <p class="description"><?php esc_html_e('This is the default UA code to use for subsites of a network (can be overriden at the single site level).', 'google-analytics-for-wordpress'); ?></p>
+                                        <?php wp_nonce_field('monsterinsights-network-settings-nonce', 'monsterinsights-network-settings-nonce'); ?>
                                         
                                     </td>
                                 </form>
@@ -121,36 +121,36 @@ 
 function monsterinsights_network_settings_save_general() {
 
     // Check if user pressed the 'Update' button and nonce is valid
-    if ( ! isset( $_POST['monsterinsights-network-settings-submit'] ) ) {
+    if ( ! isset($_POST['monsterinsights-network-settings-submit'])) {
         return;
     }
 
-    if ( ! wp_verify_nonce( $_POST['monsterinsights-network-settings-nonce'], 'monsterinsights-network-settings-nonce' ) ) {
+    if ( ! wp_verify_nonce($_POST['monsterinsights-network-settings-nonce'], 'monsterinsights-network-settings-nonce')) {
         return;
     }
 
-    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+    if ( ! current_user_can('monsterinsights_save_settings')) {
         return;
     }
 
-    $throw_notice    = false;
-    $network_manual_ua_code = isset( $_POST['network_manual_ua_code'] ) ? $_POST['network_manual_ua_code'] : '';
-    $network_manual_ua_code = monsterinsights_is_valid_ua( $network_manual_ua_code ); // also sanitizes the string
+    $throw_notice = false;
+    $network_manual_ua_code = isset($_POST['network_manual_ua_code']) ? $_POST['network_manual_ua_code'] : '';
+    $network_manual_ua_code = monsterinsights_is_valid_ua($network_manual_ua_code); // also sanitizes the string
 
-    if ( $network_manual_ua_code ) {
-        update_site_option( 'monsterinsights_network_manual_ua_code', $network_manual_ua_code );
+    if ($network_manual_ua_code) {
+        update_site_option('monsterinsights_network_manual_ua_code', $network_manual_ua_code);
     } else {
-        if ( empty ( $network_manual_ua_code ) && isset( $_POST['network_manual_ua_code'] ) ) {
+        if (empty ($network_manual_ua_code) && isset($_POST['network_manual_ua_code'])) {
              $throw_notice = true;
         }
-        update_site_option( 'monsterinsights_network_manual_ua_code', '' );
+        update_site_option('monsterinsights_network_manual_ua_code', '');
     }
 
     // Output an admin notice so the user knows what happened
-    if ( $throw_notice ) {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+    if ($throw_notice) {
+        add_action('monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code');
     } else {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+        add_action('monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings');
     }
 }
-add_action( 'admin_init', 'monsterinsights_network_settings_save_general', 11 );
\ No newline at end of file
+add_action('admin_init', 'monsterinsights_network_settings_save_general', 11);
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         update_site_option( 'monsterinsights_network_manual_ua_code', $network_manual_ua_code );
     } else {
         if ( empty ( $network_manual_ua_code ) && isset( $_POST['network_manual_ua_code'] ) ) {
-             $throw_notice = true;
+                $throw_notice = true;
         }
         update_site_option( 'monsterinsights_network_manual_ua_code', '' );
     }