awesomemotive / google-analytics-for-wordpress

lite/includes/admin/settings.php

Braces +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 			$settings['social']['social_notice'] = array( 
 				'id' => 'social_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress' )
 			);
@@ -20,7 +20,7 @@ 
 			$settings['eucompliance']['eucompliance_notice'] = array( 
 				'id' => 'eucompliance_notice',
 				'no_label' => true,
-				'name' => __( 'Google Analytics EU Compliance', 'google-analytics-for-wordpress'),
+				'name' => __( 'Google Analytics EU Compliance', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "The MonsterInsights EU Compliance addon allows you to improve compliance with GDPR and other privacy regulations.", 'google-analytics-for-wordpress' )
 			);
@@ -29,7 +29,7 @@ 
 			$settings['ads']['ads_notice'] = array( 
 				'id' => 'ads_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress' )
 			);
@@ -38,7 +38,7 @@ 
 			$settings['forms']['forms_notice'] = array( 
 				'id' => 'forms_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress' )
 			);
@@ -47,7 +47,7 @@ 
 			$settings['media']['media_notice'] = array( 
 				'id' => 'media_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress' )
 			);
@@ -56,7 +56,7 @@ 
 			$settings['membership']['membership_notice'] = array( 
 				'id' => 'membership_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress' )
 			);
@@ -65,7 +65,7 @@ 
 			$settings['dimensions']['dimensions_notice'] = array( 
 				'id' => 'dimensions_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress' )
 			);
@@ -74,7 +74,7 @@ 
 			$settings['performance']['performance_notice'] = array( 
 				'id' => 'performance_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress' )
 			);
@@ -83,7 +83,7 @@ 
 			$settings['reporting']['reporting_notice'] = array( 
 				'id' => 'reporting_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress' )
 			);
@@ -92,7 +92,7 @@ 
 			$settings['amp']['amp_notice'] = array( 
 				'id' => 'amp_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress' )
 			);
@@ -101,7 +101,7 @@ 
 			$settings['goptimize']['goptimize_notice'] = array( 
 				'id' => 'goptimize_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use Google Optimize to retarget your website visitors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to use Google Optimize to retarget your website visitors and perform A/B split tests with ease?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress' )
 			);
@@ -110,7 +110,7 @@ 
 			$settings['fbia']['fbia_notice'] = array( 
 				'id' => 'fbia_notice',
 				'no_label' => true,
-				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress' )
 			);
@@ -119,7 +119,7 @@ 
 			$settings['bounce']['bounce_notice'] = array( 
 				'id' => 'bounce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress' )
 			);
@@ -128,7 +128,7 @@ 
 			$settings['notifications']['notifications_notice'] = array( 
 				'id' => 'notifications_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress' )
 			);
@@ -137,7 +137,7 @@ 
 			$settings['ecommerce']['ecommerce_notice'] = array( 
 				'id' => 'ecommerce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress' )
 			);

lite/includes/admin/reports/report-dimensions.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

lite/includes/admin/reports/report-queries.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }

lite/includes/admin/reports/report-ecommerce.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

lite/includes/admin/reports/report-publisher.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

lite/includes/admin/reports/report-forms.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

includes/license.php

Spacing +33 added lines, -33 removed lines

@@ -87,10 +87,10 @@ 
 		$license_key  = ! empty( $license_key ) ? $license_key : MonsterInsights()->license->get_default_license_key();
 		return $license_key;
 	}
-	public function get_site_license_key(){
+	public function get_site_license_key() {
 		return ( ! empty( $this->site['key'] ) && is_string( $this->site['key'] ) && strlen( $this->site['key'] ) > 10 ) ? $this->site['key'] : '';
 	}
-	public function get_network_license_key(){
+	public function get_network_license_key() {
 		return ( ! empty( $this->network['key'] ) && is_string( $this->network['key'] ) && strlen( $this->network['key'] ) > 10 ) ? $this->network['key'] : '';
 	}
 
@@ -98,7 +98,7 @@ 
 		return $this->licensed;
 	}
 
-	public function is_site_licensed(){
+	public function is_site_licensed() {
 		return    ! empty( $this->site['key'] ) // has key
 			   &&   $this->get_site_license_type() // has type
 			   && ! $this->site_license_expired()  // isn't expired
@@ -117,28 +117,28 @@ 
 	}
 
 
-	public function get_site_license_updates(){
+	public function get_site_license_updates() {
 		return get_option( 'monsterinsights_license_updates', '' );
 	}
-	public function get_network_license_updates(){
+	public function get_network_license_updates() {
 		return get_site_option( 'monsterinsights_network_license_updates', '' );
 	}
 
-	public function set_site_license_updates(){
+	public function set_site_license_updates() {
 		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
 	}
 	public function set_network_license_updates() {
 		update_site_option( 'monsterinsights_network_license_updates', strtotime( '+8 hours' ) );
 	}
 
-	public function delete_site_license_updates(){
+	public function delete_site_license_updates() {
 		delete_option( 'monsterinsights_license_updates' );
 	}
-	public function delete_network_license_updates(){
+	public function delete_network_license_updates() {
 		delete_site_option( 'monsterinsights_license_updates' );
 	}
 
-	public function time_to_check_site_license(){
+	public function time_to_check_site_license() {
 		$timestamp = get_option( 'monsterinsights_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -151,7 +151,7 @@ 
 			}
 		}
 	}	
-	public function time_to_check_network_license(){
+	public function time_to_check_network_license() {
 		$timestamp = get_site_option( 'monsterinsights_network_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -165,21 +165,21 @@ 
 		}
 	}
 
-	public function set_site_license( $data = array() ){
+	public function set_site_license( $data = array() ) {
 		update_option( 'monsterinsights_license', $data );
 		$this->set_site_license_updates();
-		$this->site      = $data;
+		$this->site = $data;
 	}
-	public function set_network_license( $data = array() ){
+	public function set_network_license( $data = array() ) {
 		update_site_option( 'monsterinsights_network_license', $data );
 		$this->set_network_license_updates();
-		$this->network   = $data;
+		$this->network = $data;
 	}
 
 	public function delete_site_license() {
 		delete_option( 'monsterinsights_license' );
 		$this->delete_site_license_updates();
-		$this->site      = array();
+		$this->site = array();
 	}
 	public function delete_network_license() {
 		delete_site_option( 'monsterinsights_network_license' );
@@ -187,21 +187,21 @@ 
 		$this->network = array();
 	}
 
-	public function get_license_type(){
+	public function get_license_type() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 
 		return $this->using_network_license() ? $this->get_network_license_type() : $this->get_site_license_type();
 	}
-	public function get_site_license_type(){
+	public function get_site_license_type() {
 		return ( $this->get_site_license_key() && ! empty( $this->site['type'] ) && $this->is_valid_license_type( $this->site['type'] ) ) ? $this->site['type'] : '';
 	}
-	public function get_network_license_type(){
+	public function get_network_license_type() {
 		return ( $this->get_network_license_key() && ! empty( $this->network['type'] ) && $this->is_valid_license_type( $this->network['type'] ) ) ? $this->network['type'] : '';
 	}
 
-	public function license_has_error(){
+	public function license_has_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -215,7 +215,7 @@ 
 			   || $this->site_license_invalid()  // is invalid
 		;
 	}
-	public function network_license_has_error(){
+	public function network_license_has_error() {
 		return 
 				  $this->network_license_expired()  // is expired
 			   || $this->network_license_disabled()  // is disabled
@@ -223,21 +223,21 @@ 
 		;
 	}
 
-	public function license_expired(){
+	public function license_expired() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->network_license_expired() : $this->site_license_expired();
 	}
-	public function site_license_expired(){
+	public function site_license_expired() {
 		return ! empty( $this->site['is_expired'] );
 	}
-	public function network_license_expired(){
+	public function network_license_expired() {
 		return ! empty( $this->network['is_expired'] );
 	}
 
-	public function license_disabled(){
+	public function license_disabled() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -247,11 +247,11 @@ 
 	public function site_license_disabled() {
 		return ! empty( $this->site['is_disabled'] );
 	}
-	public function network_license_disabled(){
+	public function network_license_disabled() {
 		return ! empty( $this->network['is_disabled'] );
 	}
 
-	public function license_invalid(){
+	public function license_invalid() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -261,21 +261,21 @@ 
 	public function site_license_invalid() {
 		return ! empty( $this->site['is_invalid'] );
 	}
-	public function network_license_invalid(){
+	public function network_license_invalid() {
 		return ! empty( $this->network['is_invalid'] );
 	}
 
 
-	public function get_license_error(){
+	public function get_license_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->get_network_license_error() : $this->get_site_license_error();
 	}
-	public function get_site_license_error(){
+	public function get_site_license_error() {
 		if ( $this->site_license_expired() ) {
-			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
 			return esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
 		} else if ( $this->site_license_invalid() ) {
@@ -284,9 +284,9 @@ 
 		return '';
 	}
 
-	public function get_network_license_error(){
+	public function get_network_license_error() {
 		if ( $this->site_license_expired() ) {
-			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
 			return esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
 		} else if ( $this->site_license_invalid() ) {
@@ -362,7 +362,7 @@ 
 		return $can_access;
 	}
 
-	public function get_default_license_key(){
+	public function get_default_license_key() {
 		if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 			return MONSTERINSIGHTS_LICENSE_KEY;
 		}

Braces +30 added lines, -30 removed lines

@@ -87,18 +87,18 @@ 
 		$license_key  = ! empty( $license_key ) ? $license_key : MonsterInsights()->license->get_default_license_key();
 		return $license_key;
 	}
-	public function get_site_license_key(){
+	public function get_site_license_key() {
 		return ( ! empty( $this->site['key'] ) && is_string( $this->site['key'] ) && strlen( $this->site['key'] ) > 10 ) ? $this->site['key'] : '';
 	}
-	public function get_network_license_key(){
+	public function get_network_license_key() {
 		return ( ! empty( $this->network['key'] ) && is_string( $this->network['key'] ) && strlen( $this->network['key'] ) > 10 ) ? $this->network['key'] : '';
 	}
 
-	public function has_license() { 
+	public function has_license() {
 		return $this->licensed;
 	}
 
-	public function is_site_licensed(){
+	public function is_site_licensed() {
 		return    ! empty( $this->site['key'] ) // has key
 			   &&   $this->get_site_license_type() // has type
 			   && ! $this->site_license_expired()  // isn't expired
@@ -117,28 +117,28 @@ 
 	}
 
 
-	public function get_site_license_updates(){
+	public function get_site_license_updates() {
 		return get_option( 'monsterinsights_license_updates', '' );
 	}
-	public function get_network_license_updates(){
+	public function get_network_license_updates() {
 		return get_site_option( 'monsterinsights_network_license_updates', '' );
 	}
 
-	public function set_site_license_updates(){
+	public function set_site_license_updates() {
 		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
 	}
 	public function set_network_license_updates() {
 		update_site_option( 'monsterinsights_network_license_updates', strtotime( '+8 hours' ) );
 	}
 
-	public function delete_site_license_updates(){
+	public function delete_site_license_updates() {
 		delete_option( 'monsterinsights_license_updates' );
 	}
-	public function delete_network_license_updates(){
+	public function delete_network_license_updates() {
 		delete_site_option( 'monsterinsights_license_updates' );
 	}
 
-	public function time_to_check_site_license(){
+	public function time_to_check_site_license() {
 		$timestamp = get_option( 'monsterinsights_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -151,7 +151,7 @@ 
 			}
 		}
 	}	
-	public function time_to_check_network_license(){
+	public function time_to_check_network_license() {
 		$timestamp = get_site_option( 'monsterinsights_network_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -165,12 +165,12 @@ 
 		}
 	}
 
-	public function set_site_license( $data = array() ){
+	public function set_site_license( $data = array() ) {
 		update_option( 'monsterinsights_license', $data );
 		$this->set_site_license_updates();
 		$this->site      = $data;
 	}
-	public function set_network_license( $data = array() ){
+	public function set_network_license( $data = array() ) {
 		update_site_option( 'monsterinsights_network_license', $data );
 		$this->set_network_license_updates();
 		$this->network   = $data;
@@ -187,21 +187,21 @@ 
 		$this->network = array();
 	}
 
-	public function get_license_type(){
+	public function get_license_type() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 
 		return $this->using_network_license() ? $this->get_network_license_type() : $this->get_site_license_type();
 	}
-	public function get_site_license_type(){
+	public function get_site_license_type() {
 		return ( $this->get_site_license_key() && ! empty( $this->site['type'] ) && $this->is_valid_license_type( $this->site['type'] ) ) ? $this->site['type'] : '';
 	}
-	public function get_network_license_type(){
+	public function get_network_license_type() {
 		return ( $this->get_network_license_key() && ! empty( $this->network['type'] ) && $this->is_valid_license_type( $this->network['type'] ) ) ? $this->network['type'] : '';
 	}
 
-	public function license_has_error(){
+	public function license_has_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -215,7 +215,7 @@ 
 			   || $this->site_license_invalid()  // is invalid
 		;
 	}
-	public function network_license_has_error(){
+	public function network_license_has_error() {
 		return 
 				  $this->network_license_expired()  // is expired
 			   || $this->network_license_disabled()  // is disabled
@@ -223,21 +223,21 @@ 
 		;
 	}
 
-	public function license_expired(){
+	public function license_expired() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->network_license_expired() : $this->site_license_expired();
 	}
-	public function site_license_expired(){
+	public function site_license_expired() {
 		return ! empty( $this->site['is_expired'] );
 	}
-	public function network_license_expired(){
+	public function network_license_expired() {
 		return ! empty( $this->network['is_expired'] );
 	}
 
-	public function license_disabled(){
+	public function license_disabled() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -247,11 +247,11 @@ 
 	public function site_license_disabled() {
 		return ! empty( $this->site['is_disabled'] );
 	}
-	public function network_license_disabled(){
+	public function network_license_disabled() {
 		return ! empty( $this->network['is_disabled'] );
 	}
 
-	public function license_invalid(){
+	public function license_invalid() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -261,19 +261,19 @@ 
 	public function site_license_invalid() {
 		return ! empty( $this->site['is_invalid'] );
 	}
-	public function network_license_invalid(){
+	public function network_license_invalid() {
 		return ! empty( $this->network['is_invalid'] );
 	}
 
 
-	public function get_license_error(){
+	public function get_license_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->get_network_license_error() : $this->get_site_license_error();
 	}
-	public function get_site_license_error(){
+	public function get_site_license_error() {
 		if ( $this->site_license_expired() ) {
 			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -284,7 +284,7 @@ 
 		return '';
 	}
 
-	public function get_network_license_error(){
+	public function get_network_license_error() {
 		if ( $this->site_license_expired() ) {
 			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -295,7 +295,7 @@ 
 		return '';
 	}
 
-	public function license_can( $requires = 'lite' ) {		
+	public function license_can( $requires = 'lite' ) {
 		if ( ! monsterinsights_is_pro_version() || ! $this->has_license() ) {
 			return $requires === 'lite';
 		}
@@ -362,7 +362,7 @@ 
 		return $can_access;
 	}
 
-	public function get_default_license_key(){
+	public function get_default_license_key() {
 		if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 			return MONSTERINSIGHTS_LICENSE_KEY;
 		}

includes/admin/common.php

Braces +1 added lines, -1 removed lines

@@ -544,7 +544,7 @@
 	return $shareasale_url;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){

Spacing +103 added lines, -103 removed lines

@@ -155,32 +155,32 @@ 
 				'copytoclip'       				=> esc_html__( 'Copy to Clipboard', 'google-analytics-for-wordpress' ),
 				'failed'           				=> esc_html__( 'Failed!', 'google-analytics-for-wordpress' ),
 				'admin_nonce'      				=> wp_create_nonce( 'mi-admin-nonce' ),
-				'shorten'         				=> esc_html__( 'Shorten URL' ,'google-analytics-for-wordpress'),
-				'shortened'        				=> esc_html__( 'Shortened!' ,'google-analytics-for-wordpress'),
-				'working'          				=> esc_html__( 'Working...' ,'google-analytics-for-wordpress'),
-				'importtext'       				=> esc_html__( 'Import' ,'google-analytics-for-wordpress'),
-				'imported'         				=> esc_html__( 'Imported!' ,'google-analytics-for-wordpress'),
-				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:' ,'google-analytics-for-wordpress'),
-				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'redirect_loading_error_title'  => esc_html__( "Authentication Error:" ,'google-analytics-for-wordpress'),
-				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....' ,'google-analytics-for-wordpress'),
-				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:" ,'google-analytics-for-wordpress'),
-				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!' ,'google-analytics-for-wordpress'),
-				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore." ,'google-analytics-for-wordpress'),
-				'verify_loading_title_text'  	=> esc_html__( 'Verifying....' ,'google-analytics-for-wordpress'),
-				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'verify_loading_error_title' 	=> esc_html__( "Verification Error:" ,'google-analytics-for-wordpress'),
-				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!' ,'google-analytics-for-wordpress'),
-				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!" ,'google-analytics-for-wordpress'),
-				'ok_text' 						=> esc_html__( "OK" ,'google-analytics-for-wordpress'),
-				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate" ,'google-analytics-for-wordpress'),
+				'shorten'         				=> esc_html__( 'Shorten URL', 'google-analytics-for-wordpress' ),
+				'shortened'        				=> esc_html__( 'Shortened!', 'google-analytics-for-wordpress' ),
+				'working'          				=> esc_html__( 'Working...', 'google-analytics-for-wordpress' ),
+				'importtext'       				=> esc_html__( 'Import', 'google-analytics-for-wordpress' ),
+				'imported'         				=> esc_html__( 'Imported!', 'google-analytics-for-wordpress' ),
+				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:', 'google-analytics-for-wordpress' ),
+				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'redirect_loading_error_title'  => esc_html__( "Authentication Error:", 'google-analytics-for-wordpress' ),
+				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....', 'google-analytics-for-wordpress' ),
+				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:", 'google-analytics-for-wordpress' ),
+				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!', 'google-analytics-for-wordpress' ),
+				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore.", 'google-analytics-for-wordpress' ),
+				'verify_loading_title_text'  	=> esc_html__( 'Verifying....', 'google-analytics-for-wordpress' ),
+				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'verify_loading_error_title' 	=> esc_html__( "Verification Error:", 'google-analytics-for-wordpress' ),
+				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!', 'google-analytics-for-wordpress' ),
+				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!", 'google-analytics-for-wordpress' ),
+				'ok_text' 						=> esc_html__( "OK", 'google-analytics-for-wordpress' ),
+				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate", 'google-analytics-for-wordpress' ),
 				'refresh_report_title'          => esc_html__( 'Refreshing Report', 'google-analytics-for-wordpress' ),
 				'refresh_report_text'           => esc_html__( 'Loading new report data...', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Success', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Retrieved the new report data successfully', 'google-analytics-for-wordpress' ),
 				'refresh_report_failure_title'  => esc_html__( 'Error', 'google-analytics-for-wordpress' ),
-				'timezone'						=> date('e'),
+				'timezone'						=> date( 'e' ),
 				'resume_report_title'			=> esc_html__( 'Real-Time Report Paused', 'google-analytics-for-wordpress' ),
 				'resume_report_text'			=> esc_html__( 'The Real-Time Report automatically paused due to inactivity. Please refresh the page to resume the Real-Time Report.', 'google-analytics-for-wordpress' ),
 			)
@@ -244,7 +244,7 @@ 
 		'kad_admin_js', // Pinnacle theme
 		'dt-chart', // DesignThemes core features plugin
 		'tweeetshare_font_script', // TweetShare - Click To Tweet
-		'tweeetshare_jquery_script',  // TweetShare - Click To Tweet
+		'tweeetshare_jquery_script', // TweetShare - Click To Tweet
 		'tweeetshare_jqueryui_script', // TweetShare - Click To Tweet
 		'tweeetshare_custom_script', // TweetShare - Click To Tweet
 		'imagify-promise-polyfill', // Imagify 
@@ -263,16 +263,16 @@ 
 		'rml-modal', // WP Real Media Library
 		'rml-order', // WP Real Media Library
 		'rml-meta', // WP Real Media Library
-		'rml-uploader',  // WP Real Media Library
-		'rml-options',  // WP Real Media Library
-		'rml-usersettings',  // WP Real Media Library
+		'rml-uploader', // WP Real Media Library
+		'rml-options', // WP Real Media Library
+		'rml-usersettings', // WP Real Media Library
 		'rml-main', // WP Real Media Library
 		'control-panel-sweet-alert', // Ken Theme
 		'sweet-alert-js', // Vitrine Theme
 		'theme-admin-script', // Vitrine Theme
 		'sweetalert', //  Church Suite Theme by Webnus
 		'be_alerts_charts', //  WooCommerce bolder product alerts
- 		'magayo-lottery-results',  //  Magayo Lottery Results
+ 		'magayo-lottery-results', //  Magayo Lottery Results
 		'control-panel-sweet-alert', // Ken Theme
 		'cpm_chart', // WP Project Manager
 		'adminscripts', //  Artisan Nayma Theme
@@ -358,15 +358,15 @@ 
 
 	global $wp_styles;
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
@@ -381,15 +381,15 @@ 
 
 	global $wp_scripts;
 	foreach ( $wp_scripts->queue as $handle ) {
-		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
@@ -404,47 +404,47 @@ 
 
 	// Remove actions from themes that are not following best practices and break the admin doing so
 		// Theme: Newspaper by tagDiv
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_js');
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_css');
-			remove_action('admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic');
-			remove_action('admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic');
-			remove_action('admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999);
-			remove_action('print_media_templates', 'td_custom_gallery_settings_hook');
-			remove_action('print_media_templates', 'td_change_backbone_js_hook');
-			remove_action('admin_head', 'tdc_on_admin_head'); //  TagDiv Composer Fix
-			remove_action('print_media_templates', 'us_media_templates'); // Impreza Theme Fix
-			remove_action('admin_footer', 'gt3pg_add_gallery_template'); // GT3 Photo & Video Gallery By GT3 Themes Plugin Fix
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_js' );
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_css' );
+			remove_action( 'admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic' );
+			remove_action( 'admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic' );
+			remove_action( 'admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999 );
+			remove_action( 'print_media_templates', 'td_custom_gallery_settings_hook' );
+			remove_action( 'print_media_templates', 'td_change_backbone_js_hook' );
+			remove_action( 'admin_head', 'tdc_on_admin_head' ); //  TagDiv Composer Fix
+			remove_action( 'print_media_templates', 'us_media_templates' ); // Impreza Theme Fix
+			remove_action( 'admin_footer', 'gt3pg_add_gallery_template' ); // GT3 Photo & Video Gallery By GT3 Themes Plugin Fix
 		// Plugin WP Booklist:
-			remove_action('admin_footer', 'wpbooklist_jre_dismiss_prem_notice_forever_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_add_book_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_show_form_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_show_book_in_colorbox_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_new_lib_shortcode_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_save_library_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_save_post_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_save_page_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_update_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_pagination_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_switch_lib_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_search_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_actual_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_delete_book_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_user_apis_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_upload_new_stylepak_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_upload_new_post_template_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_upload_new_page_template_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_create_db_library_backup_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_restore_db_library_backup_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_create_csv_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_amazon_localization_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_delete_book_bulk_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_reorder_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_exit_results_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_select_category_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_get_story_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_expand_browse_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_save_settings_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_delete_story_action_javascript');
+			remove_action( 'admin_footer', 'wpbooklist_jre_dismiss_prem_notice_forever_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_add_book_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_show_form_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_show_book_in_colorbox_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_new_lib_shortcode_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_save_library_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_save_post_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_save_page_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_update_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_pagination_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_switch_lib_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_search_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_actual_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_delete_book_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_user_apis_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_upload_new_stylepak_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_upload_new_post_template_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_upload_new_page_template_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_create_db_library_backup_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_restore_db_library_backup_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_create_csv_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_amazon_localization_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_delete_book_bulk_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_reorder_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_exit_results_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_select_category_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_get_story_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_expand_browse_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_save_settings_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_delete_story_action_javascript' );
 }
 add_action( 'admin_enqueue_scripts', 'monsterinsights_remove_conflicting_asset_files', 9999 );
 
@@ -456,66 +456,66 @@ 
  *
  * @return null Return early if not on the proper screen.
  */
-function hide_non_monsterinsights_warnings () {
+function hide_non_monsterinsights_warnings() {
 	// Bail if we're not on a MonsterInsights screen.
 	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'monsterinsights' ) === false ) {
 		return;
 	}
 
 	global $wp_filter;
-	if ( !empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 }
-add_action('admin_print_scripts', 'hide_non_monsterinsights_warnings');  
-add_action('admin_head', 'hide_non_monsterinsights_warnings', PHP_INT_MAX  );  
+add_action( 'admin_print_scripts', 'hide_non_monsterinsights_warnings' );  
+add_action( 'admin_head', 'hide_non_monsterinsights_warnings', PHP_INT_MAX );  
 
 /**
  * Called whenever an upgrade button / link is displayed in Lite, this function will
@@ -544,33 +544,33 @@ 
 	}
 
 	// Get the ShareASale ID
-	$shareasale_id   = monsterinsights_get_shareasale_id();
+	$shareasale_id = monsterinsights_get_shareasale_id();
 
 	// If we have a shareasale ID return the shareasale url
 	if ( ! empty( $shareasale_id ) ) {
-		$shareasale_id  = absint( $shareasale_id );
+		$shareasale_id = absint( $shareasale_id );
 		return esc_url( monsterinsights_get_shareasale_url( $shareasale_id, $url ) );
 	} else {
 		return esc_url( $url );
 	}
 }
 
-function monsterinsights_get_url( $medium = '', $campaign = '', $url = '', $escape = true  ) {
+function monsterinsights_get_url( $medium = '', $campaign = '', $url = '', $escape = true ) {
 	// Setup Campaign variables
-	$source          = monsterinsights_is_pro_version()   ? 'proplugin' : 'liteplugin';
-	$medium          = ! empty( $medium )   ? $medium     : 'defaultmedium';
-	$campaign        = ! empty( $campaign ) ? $campaign   : 'defaultcampaign';
-	$content 		 = MONSTERINSIGHTS_VERSION;
-	$default_url     = monsterinsights_is_pro_version()   ? '' : 'lite/';
+	$source          = monsterinsights_is_pro_version() ? 'proplugin' : 'liteplugin';
+	$medium          = ! empty( $medium ) ? $medium : 'defaultmedium';
+	$campaign        = ! empty( $campaign ) ? $campaign : 'defaultcampaign';
+	$content = MONSTERINSIGHTS_VERSION;
+	$default_url     = monsterinsights_is_pro_version() ? '' : 'lite/';
 	$url             = ! empty( $url ) ? $url : 'https://www.monsterinsights.com/' . $default_url;
 
 	// Put together redirect URL
 	$url = add_query_arg(
 		array(
-		    'utm_source'   => $source,   // Pro/Lite Plugin
-		    'utm_medium'   => sanitize_key( $medium ),   // Area of MonsterInsights (example Reports)
+		    'utm_source'   => $source, // Pro/Lite Plugin
+		    'utm_medium'   => sanitize_key( $medium ), // Area of MonsterInsights (example Reports)
 		    'utm_campaign' => sanitize_key( $campaign ), // Which link (example eCommerce Report)
-		    'utm_content'  => $content,  // Version number of MI
+		    'utm_content'  => $content, // Version number of MI
 		),
 		trailingslashit( $url )
 	);
@@ -608,13 +608,13 @@ 
 	$custom = false;
 	if ( defined( 'MONSTERINSIGHTS_SHAREASALE_REDIRECT_URL' ) ) {
 		$shareasale_redirect = MONSTERINSIGHTS_SHAREASALE_REDIRECT_URL;
-		$custom 			 = true;
+		$custom = true;
 	}
 
 	// If there's no constant, check if there's an option.
 	if ( empty( $custom ) ) {
 		$shareasale_redirect = get_option( 'monsterinsights_shareasale_redirect_url', '' );
-		$custom 			 = true;
+		$custom = true;
 	}
 
 	// Whether we have an ID or not, filter the ID.
@@ -623,7 +623,7 @@ 
 	return $shareasale_url;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){
@@ -639,9 +639,9 @@ 
 }
 
 function monsterinsights_ublock_notice() {
-	ob_start();?>
+	ob_start(); ?>
 	<div id="monsterinsights-ublock-origin-error" class="error inline" style="display:none;">
-		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">');
+		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' );
 		?>
 	</div>
 	<?php

includes/admin/admin.php

Braces +8 added lines, -6 removed lines

@@ -221,9 +221,11 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if( ! $upgrade ) {
+// First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
-    } else { // Update
+    } else {
+// Update
         return;
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
@@ -289,7 +291,7 @@ 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
                 $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
@@ -346,7 +348,7 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) {
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
             echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
@@ -372,7 +374,7 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -403,7 +405,7 @@ 
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';

Indentation +140 added lines, -140 removed lines

@@ -33,24 +33,24 @@ 
     $hook = 'monsterinsights_settings';
 
     if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
-        // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
-        $hook = 'monsterinsights_settings';
+	// If dashboards disabled, first settings page
+	add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+	$hook = 'monsterinsights_settings';
 
-        add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
-        add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
+	add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
+	add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
-        // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+	// if dashboards enabled, first dashboard
+	add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
-        $hook = 'monsterinsights_reports';
+	$hook = 'monsterinsights_reports';
 
-        add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
+	add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
-        // then settings page
-        add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
+	// then settings page
+	add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
 
-        add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
+	add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
 
     }
     
@@ -60,7 +60,7 @@ 
     // then addons
     $network_key = MonsterInsights()->license->get_network_license_key();
     if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) {
-        add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' );
+	add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' );
     }
 }
 add_action( 'admin_menu', 'monsterinsights_admin_menu' );
@@ -74,12 +74,12 @@ 
     // First, let's see if this is an MS network enabled plugin. If it is, we should load the license 
     // menu page and the updater on the network panel
     if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-        require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+	require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
     }
 
     $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE );
     if ( ! is_plugin_active_for_network( $plugin ) ) {
-        return;
+	return;
     }
 
     $hook = 'monsterinsights_network';
@@ -103,7 +103,7 @@ 
 function monsterinsights_add_admin_body_class( $classes ) {
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return $classes;
+	return $classes;
     }
        
     return "$classes monsterinsights_page ";
@@ -123,17 +123,17 @@ 
 
     // If lite, show a link where they can get pro from
     if ( ! monsterinsights_is_pro_version() ) {
-        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $get_pro );
+	$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $get_pro );
     }
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );
     }
 
     $settings_link = '<a href="' . esc_url( admin_url( 'admin.php?page=monsterinsights_settings' ) ) . '">' . esc_html__( 'Settings', 'google-analytics-for-wordpress' ) . '</a>';
@@ -158,26 +158,26 @@ 
 function monsterinsights_load_admin_partial( $template, $data = array() ) {
 
     if ( monsterinsights_is_pro_version() ) {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
     
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}
     } else {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
     
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }   
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}   
     }
         
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
-        return true;
+	require_once(  $dir . $template . '.php' );
+	return true;
     }
                 
     return false;
@@ -193,15 +193,15 @@ 
     // Get the current screen, and check whether we're viewing a MonsterInsights screen;
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return;
+	return;
     }
 
     // If here, we're on an MonsterInsights screen, so output the header.
     monsterinsights_load_admin_partial( 'header', array(
-        'mascot'   => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ),
-        'logo'     => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ),
-        '2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', MonsterInsights()->file ),
-        '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
+	'mascot'   => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ),
+	'logo'     => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ),
+	'2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', MonsterInsights()->file ),
+	'2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
     ) );
 }
 add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
@@ -209,7 +209,7 @@ 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
     if ( ! get_transient( '_monsterinsights_activation_redirect' ) ) {
-        return;
+	return;
     }
 
     // Delete the redirect transient
@@ -217,15 +217,15 @@ 
 
     // Bail if activating from network, or bulk
     if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-        return;
+	return;
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
     if( ! $upgrade ) { // First time install
-        //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
+	//wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
-        return;
-        //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
+	return;
+	//wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
 }
 //add_action( 'admin_init', 'monsterinsights_welcome_redirect', 11 ); @todo: Investigate
@@ -241,8 +241,8 @@ 
 function monsterinsights_admin_footer( $text ) {
     global $current_screen;
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
-        $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+	$url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
+	$text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -253,12 +253,12 @@ 
     // Don't show on MonsterInsights pages
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-        return;
+	return;
     }
 
     // Make sure they have the permissions to do something
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     // Priority:
@@ -271,45 +271,45 @@ 
 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
-        $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = admin_url( 'admin.php?page=monsterinsights_settings' );
+	$message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</p></div>';
+	return;
     }
 
     // 2. License key not entered for pro
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
-        $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
+	$message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</p></div>';
+	return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
-        $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
-            if ( MonsterInsights()->license->site_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->site_license_disabled() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->site_license_invalid() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        } else if ( MonsterInsights()->license->get_network_license_key() ) {
-            if ( MonsterInsights()->license->network_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->network_license_disabled() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->network_license_invalid() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        }
-        if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
-            return;
-        }
+	$message = '';
+	if ( MonsterInsights()->license->get_site_license_key() ){
+	    if ( MonsterInsights()->license->site_license_expired() ) {
+		$message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->site_license_disabled() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->site_license_invalid() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	} else if ( MonsterInsights()->license->get_network_license_key() ) {
+	    if ( MonsterInsights()->license->network_license_expired() ) {
+		$message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->network_license_disabled() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->network_license_invalid() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	}
+	if ( ! empty( $message ) ) {
+	    echo '<div class="error"><p>'. $message.'</p></div>';
+	    return;
+	}
     }
 
     // 4. Optin setting not configured
@@ -339,7 +339,7 @@ 
 
     $notices   = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     // 5. Authenticate, not manual
@@ -347,12 +347,12 @@ 
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
     if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
-        echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
-            echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
-            echo '</p>';
-        echo '</div>';
-        return;
+	echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
+	    echo '<p>';
+	    echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+	    echo '</p>';
+	echo '</div>';
+	return;
     }
 
     // 6. Automatic updates not configured
@@ -372,64 +372,64 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' ); 
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' ); 
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    return;
+	}
     }
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' ); 
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' ); 
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    return;
+	}
     }
 }
 add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' );
@@ -439,7 +439,7 @@ 
 // AM Notices
 function monsterinsights_am_notice_optout( $super_admin ) {
     if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) {
-        return false;
+	return false;
     }
     return $super_admin;
 }

Spacing +28 added lines, -28 removed lines

@@ -34,14 +34,14 @@ 
 
     if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
         add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
         $hook = 'monsterinsights_reports';
 
@@ -83,7 +83,7 @@ 
     }
 
     $hook = 'monsterinsights_network';
-    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
     add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
@@ -118,21 +118,21 @@ 
  * @return array $links
  */
 function monsterinsights_add_action_links( $links ) {
-    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="'. monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) .'"">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
+    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) . '"">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
     array_unshift( $links, $docs );
 
     // If lite, show a link where they can get pro from
     if ( ! monsterinsights_is_pro_version() ) {
-        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) . '">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $get_pro );
     }
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     }
 
@@ -161,14 +161,14 @@ 
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }   
     }
@@ -176,7 +176,7 @@ 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
                 
@@ -204,7 +204,7 @@ 
         '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
     ) );
 }
-add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
+add_action( 'in_admin_header', 'monsterinsights_admin_header', 100 );
 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
@@ -221,7 +221,7 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if ( ! $upgrade ) { // First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
         return;
@@ -242,7 +242,7 @@ 
     global $current_screen;
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -272,8 +272,8 @@ 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
         $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ), '<a href="' . $page . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
@@ -281,17 +281,17 @@ 
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
                 $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->site_license_invalid() ) {
@@ -299,7 +299,7 @@ 
             }
         } else if ( MonsterInsights()->license->get_network_license_key() ) {
             if ( MonsterInsights()->license->network_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->network_license_disabled() ) {
                 $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->network_license_invalid() ) {
@@ -307,7 +307,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -337,7 +337,7 @@ 
     //     }
     // }
 
-    $notices   = get_option( 'monsterinsights_notices' );
+    $notices = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
         $notices = array();
     }
@@ -346,10 +346,10 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual'] ) ) { 
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
         return;
@@ -372,7 +372,7 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) { 
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -391,7 +391,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' ); 
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) . '">', ' &raquo;</a>' ); 
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -403,7 +403,7 @@ 
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) { 
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -422,7 +422,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' ); 
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) . '">', ' &raquo;</a>' ); 
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';