awesomemotive / google-analytics-for-wordpress

includes/install.php

Spacing +163 added lines, -163 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined('ABSPATH')) { 
 	exit;
 }
 
@@ -58,54 +58,54 @@ 
 	public function init() {
 
 		// Get a copy of the current MI settings.
-		$this->new_settings = get_option( monsterinsights_get_option_name() );
+		$this->new_settings = get_option(monsterinsights_get_option_name());
 
 
-		$version = get_option( 'monsterinsights_current_version', false );
-		$yoast   = get_option( 'yst_ga', false );
+		$version = get_option('monsterinsights_current_version', false);
+		$yoast   = get_option('yst_ga', false);
 		$cachec  = false; // have we forced an object cache to be cleared already (so we don't clear it unnecessarily)
 
 		// if new install and have not used Yoast previously
-		if ( ! $version && ! $yoast ) {
+		if ( ! $version && ! $yoast) {
 
 			$this->new_install();
 			// This is the version used for MI upgrade routines.
-			update_option( 'monsterinsights_db_version', '6.2.0' );
+			update_option('monsterinsights_db_version', '6.2.0');
 			
-		} else if ( ! $version && $yoast ) { // if new install and has used Yoast previously
+		} else if ( ! $version && $yoast) { // if new install and has used Yoast previously
 
 			$this->upgrade_from_yoast();
 			// This is the version used for MI upgrade routines.
-			update_option( 'monsterinsights_db_version', '6.2.0' );
+			update_option('monsterinsights_db_version', '6.2.0');
 
-			if ( ! $cachec ) {
+			if ( ! $cachec) {
 				wp_cache_flush();
 				$cachec = true;
 			}
 			
 		} else { // if existing install
-			if ( version_compare( $version, '6.0.2', '<' ) ) {
+			if (version_compare($version, '6.0.2', '<')) {
 				$this->v602_upgrades();
 			}
 			
-			if ( version_compare( $version, '6.0.11', '<' ) ) {
+			if (version_compare($version, '6.0.11', '<')) {
 				$this->v6011_upgrades();
 
-				if ( ! $cachec ) {
+				if ( ! $cachec) {
 					wp_cache_flush();
 					$cachec = true;
 				}
 			}
-			if ( version_compare( $version, '6.2.0', '<' ) ) {
+			if (version_compare($version, '6.2.0', '<')) {
 				$this->v620_upgrades();
 			}
 
-			update_option( 'monsterinsights_db_version', '6.2.0' );
+			update_option('monsterinsights_db_version', '6.2.0');
 			
 			// @todo: doc as nonpublic
 			
-			update_option( 'monsterinsights_version_upgraded_from', $version );
-			do_action( 'monsterinsights_after_existing_upgrade_routine', $version );
+			update_option('monsterinsights_version_upgraded_from', $version);
+			do_action('monsterinsights_after_existing_upgrade_routine', $version);
 		}
 
 		// This hook is used primarily by the Pro version to run some Pro
@@ -114,16 +114,16 @@ 
 		// relocated, and/or altered without warning at any time. You've been warned.
 		// As this hook is not for public use, we've intentionally not docbloc'd this
 		// hook to avoid developers seeing it future public dev docs.
-		do_action( 'monsterinsights_after_install_routine', $version );
+		do_action('monsterinsights_after_install_routine', $version);
 
 		// This is the version of the MI settings themselves
-		update_option( 'monsterinsights_settings_version', '6.0.0' );
+		update_option('monsterinsights_settings_version', '6.0.0');
 
 		// This is the version of MI installed
-		update_option( 'monsterinsights_current_version', MONSTERINSIGHTS_VERSION );
+		update_option('monsterinsights_current_version', MONSTERINSIGHTS_VERSION);
 
 		// This is where we save MI settings
-		update_option( monsterinsights_get_option_name(), $this->new_settings );
+		update_option(monsterinsights_get_option_name(), $this->new_settings);
 
 		// This is where we redirect to the MI welcome page
 		//set_transient( '_monsterinsights_activation_redirect', true, 30 ); @todo: Investigate
@@ -223,16 +223,16 @@ 
 			'installed_pro'     => monsterinsights_is_pro_version(),
 		);
 
-		update_option( 'monsterinsights_over_time', $data );
+		update_option('monsterinsights_over_time', $data);
 
 		// Add cron job
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+		if ( ! wp_next_scheduled('monsterinsights_daily_cron')) {
 			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:05:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+			wp_schedule_event(strtotime(date('Y-m-d', strtotime('tomorrow')) . ' 00:05:00 '), 'daily', 'monsterinsights_daily_cron');
 		}
 
 		// Let addons + MI Pro/Lite hook in here. @todo: doc as nonpublic
-		do_action( 'monsterinsights_after_new_install_routine', MONSTERINSIGHTS_VERSION );
+		do_action('monsterinsights_after_new_install_routine', MONSTERINSIGHTS_VERSION);
 	}
 
 	/**
@@ -248,27 +248,27 @@ 
 	 */
 	public function upgrade_from_yoast() {
 		// Do Yoast's Old Routines
-		$options = get_option( 'yst_ga', array() );
-		if ( ! empty( $options['ga_general'] ) ) {
+		$options = get_option('yst_ga', array());
+		if ( ! empty($options['ga_general'])) {
 			$options = $options['ga_general'];
 		}
 
 		$tracking_code = null;
-		if ( ! empty( $options['analytics_profile'] ) && ! empty( $options['analytics_profile_code'] ) ) {
+		if ( ! empty($options['analytics_profile']) && ! empty($options['analytics_profile_code'])) {
 			$tracking_code = $options['analytics_profile_code'];
-		} else if ( ! empty( $options['analytics_profile'] ) && empty( $options['analytics_profile_code'] ) ) {
+		} else if ( ! empty($options['analytics_profile']) && empty($options['analytics_profile_code'])) {
 			// Analytics profile is still holding the UA code
 			$tracking_code = $options['analytics_profile'];
 		}
 
-		if ( ! empty( $options['manual_ua_code_field'] ) && ! empty( $options['manual_ua_code'] ) ) {
+		if ( ! empty($options['manual_ua_code_field']) && ! empty($options['manual_ua_code'])) {
 			$tracking_code = $options['manual_ua_code_field'];
 		}
 
-		if ( ! isset( $options['version'] ) && is_null( $tracking_code ) ) {
-			$old_options = get_option( 'Yoast_Google_Analytics' );
-			if ( isset( $old_options ) && is_array( $old_options ) ) {
-				if ( isset( $old_options['uastring'] ) && '' !== trim( $old_options['uastring'] ) ) {
+		if ( ! isset($options['version']) && is_null($tracking_code)) {
+			$old_options = get_option('Yoast_Google_Analytics');
+			if (isset($old_options) && is_array($old_options)) {
+				if (isset($old_options['uastring']) && '' !== trim($old_options['uastring'])) {
 					// Save UA as manual UA, instead of saving all the old GA crap
 					$options['manual_ua_code']       = 1;
 					$options['manual_ua_code_field'] = $old_options['uastring'];
@@ -282,44 +282,44 @@ 
 				$options['track_internal_as_label']    = $old_options['internallinklabel'];
 				$options['extensions_of_files']        = $old_options['dlextensions'];
 			}
-			delete_option( 'Yoast_Google_Analytics' );
+			delete_option('Yoast_Google_Analytics');
 		}
 		// 5.0.0 to 5.0.1 fix of ignore users array
-		if ( ! isset( $options['version'] ) || version_compare( $options['version'], '5.0.1', '<' ) ) {
-			if ( isset( $options['ignore_users'] ) && ! is_array( $options['ignore_users'] ) ) {
+		if ( ! isset($options['version']) || version_compare($options['version'], '5.0.1', '<')) {
+			if (isset($options['ignore_users']) && ! is_array($options['ignore_users'])) {
 				$options['ignore_users'] = (array) $options['ignore_users'];
 			}
 		}
 		// 5.1.2+ Remove firebug_lite from options, if set
-		if ( ! isset ( $options['version'] ) || version_compare( $options['version'], '5.1.2', '<' ) ) {
-			if ( isset( $options['firebug_lite'] ) ) {
-				unset( $options['firebug_lite'] );
+		if ( ! isset ($options['version']) || version_compare($options['version'], '5.1.2', '<')) {
+			if (isset($options['firebug_lite'])) {
+				unset($options['firebug_lite']);
 			}
 		}
 		// 5.2.8+ Add disabled dashboards option
-		if ( ! isset ( $options['dashboards_disabled'] ) || version_compare( $options['version'], '5.2.8', '>' ) ) {
+		if ( ! isset ($options['dashboards_disabled']) || version_compare($options['version'], '5.2.8', '>')) {
 			$options['dashboards_disabled'] = 0;
 		}
 		// Check is API option already exists - if not add it
-		$yst_ga_api = get_option( 'yst_ga_api' );
-		if ( $yst_ga_api === false ) {
-			add_option( 'yst_ga_api', array(), '', 'no' );
+		$yst_ga_api = get_option('yst_ga_api');
+		if ($yst_ga_api === false) {
+			add_option('yst_ga_api', array(), '', 'no');
 		}
 		// Fallback to make sure every default option has a value
 		$defaults = $this->get_yoast_default_values();
-		if ( is_array( $defaults ) ) {
-			foreach ( $defaults[ 'ga_general' ] as $key => $value ) {
-				if ( ! isset( $options[ $key ] ) ) {
-					$options[ $key ] = $value;
+		if (is_array($defaults)) {
+			foreach ($defaults['ga_general'] as $key => $value) {
+				if ( ! isset($options[$key])) {
+					$options[$key] = $value;
 				}
 			}
 		}
 
 		// Set to the current version now that we've done all needed upgrades
 		$options['version'] = '5.5.3'; // Last Yoast codebase version
-		$saved_options = get_option( 'yst_ga' );
-		$saved_options[ 'ga_general' ] = $options;
-		update_option( 'yst_ga', $saved_options );
+		$saved_options = get_option('yst_ga');
+		$saved_options['ga_general'] = $options;
+		update_option('yst_ga', $saved_options);
 
 
 		// Do license key switchover 
@@ -327,117 +327,117 @@ 
 			$found   = false;
 			$network = false;
 			// Try network active Premium
-			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-				$key    = $is_key['key'];
+			$is_key = get_site_option('google-analytics-by-yoast-premium_license', array());
+			if ($is_key && ! empty($is_key) && is_array($is_key) && ! empty($is_key['key']) && is_multisite()) {
+				$key = $is_key['key'];
 				$found = true;
 				$network = true;
 			}
 
 			// Try single site Premium
-			if ( ! $found ) {
-				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+			if ( ! $found) {
+				$is_key = get_option('google-analytics-by-yoast-premium_license', array());
+				if ($is_key && ! empty($is_key) && is_array($is_key) && ! empty($is_key['key'])) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
 
 			// Try network active Premium
-			if ( ! $found ) {
-				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+			if ( ! $found) {
+				$is_key = get_site_option('monsterinsights-pro_license', array());
+				if ($is_key && ! empty($is_key) && is_array($is_key) && ! empty($is_key['key']) && is_multisite()) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}				
 			}
 			
 			// Try single site Premium
-			if ( ! $found ) {
-				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+			if ( ! $found) {
+				$is_key = get_option('monsterinsights-pro_license', array());
+				if ($is_key && ! empty($is_key) && is_array($is_key) && ! empty($is_key['key'])) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
 			
 			// Try network active ecommmerce
-			if ( ! $found ) {
-				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+			if ( ! $found) {
+				$is_key = get_site_option('ecommerce-addon_license', array());
+				if ($is_key && ! empty($is_key) && is_array($is_key) && ! empty($is_key['key']) && is_multisite()) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}
 			}
 			// Try single site ecommerce
-			if ( ! $found ) {
-				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+			if ( ! $found) {
+				$is_key = get_option('ecommerce-addon_license', array());
+				if ($is_key && ! empty($is_key) && is_array($is_key) && ! empty($is_key['key'])) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
 
 			// set as new key for monsterinsights
-			if ( $found && ! empty( $key ) ) {
+			if ($found && ! empty($key)) {
 				// In pro, install custom dimensions + ads. In lite, just save the key
-				do_action( 'monsterinsights_upgrade_from_yoast', $key, $network );
+				do_action('monsterinsights_upgrade_from_yoast', $key, $network);
 			}
 
 		// Next up: Settings Migration
 		
-			$options = get_option( 'yst_ga', array() );
-			if ( ! empty( $options['ga_general'] ) ) {
+			$options = get_option('yst_ga', array());
+			if ( ! empty($options['ga_general'])) {
 				$options = $options['ga_general'];
 			}
 
 
 			// Let's remove the defaults
-			if ( isset( $options['ga_general'] ) ) {
-				unset( $options['ga_general'] );
+			if (isset($options['ga_general'])) {
+				unset($options['ga_general']);
 			}
 
 			// Let's remove unused options
-			if ( isset( $options['yoast_ga_nonce'] ) ) {
-				unset( $options['yoast_ga_nonce'] );
+			if (isset($options['yoast_ga_nonce'])) {
+				unset($options['yoast_ga_nonce']);
 			}			
-			if ( isset( $options['ga-form-settings'] ) ) {
-				unset( $options['ga-form-settings'] );
+			if (isset($options['ga-form-settings'])) {
+				unset($options['ga-form-settings']);
 			}
-			if ( isset( $options['string_error_custom_dimensions'] ) ) {
-				unset( $options['string_error_custom_dimensions'] );
+			if (isset($options['string_error_custom_dimensions'])) {
+				unset($options['string_error_custom_dimensions']);
 			}
-			if ( isset( $options['custom_metrics'] ) ) {
-				unset( $options['custom_metrics'] );
+			if (isset($options['custom_metrics'])) {
+				unset($options['custom_metrics']);
 			}	
-			if ( isset( $options['track_full_url'] ) ) {
-				unset( $options['track_full_url'] );
+			if (isset($options['track_full_url'])) {
+				unset($options['track_full_url']);
 			}	
-			if ( isset( $options['version'] ) ) {
-				unset( $options['version'] );
+			if (isset($options['version'])) {
+				unset($options['version']);
 			}
 
 			// Migrate universal to tracking_mode
-			if ( isset( $options['enable_universal'] ) ) {
-				unset( $options['enable_universal'] );
+			if (isset($options['enable_universal'])) {
+				unset($options['enable_universal']);
 				$options['tracking_mode'] = 'analytics';
 			} else {
 				$options['tracking_mode'] = 'ga';
 			}
 
 			// Migrate events tracking
-			if ( isset( $options['track_outbound'] ) ) {
-				unset( $options['track_outbound'] );
+			if (isset($options['track_outbound'])) {
+				unset($options['track_outbound']);
 				$options['events_mode'] = 'php';
 			} else {
 				$options['events_mode'] = 'none';
 			}
 
 			// Migrate anonymous_data to allow tracking
-			if ( isset( $options['anonymous_data'] ) ) {
-				unset( $options['anonymous_data'] );
+			if (isset($options['anonymous_data'])) {
+				unset($options['anonymous_data']);
 				$options['allow_tracking'] = 1;
 			} else {
 				$options['allow_tracking'] = 0;
@@ -446,42 +446,42 @@ 
 		
 		// Migrate GA profile data if there
 			// first let's try to salvage the current profile
-			$access_token  = get_option( 'yoast-ga-access_token', array() );
-			$refresh_token = get_option( 'yoast-ga-refresh_token', array() );
-			$profiles      = get_option( 'yst_ga_api', array() );
+			$access_token  = get_option('yoast-ga-access_token', array());
+			$refresh_token = get_option('yoast-ga-refresh_token', array());
+			$profiles      = get_option('yst_ga_api', array());
 
-			$profile_name  = ! empty( $options['analytics_profile'] ) ? $options['analytics_profile'] : ''; 
+			$profile_name  = ! empty($options['analytics_profile']) ? $options['analytics_profile'] : ''; 
 
-				if ( empty( $refresh_token ) && ! empty( $access_token['refresh_token'] ) ) {
+				if (empty($refresh_token) && ! empty($access_token['refresh_token'])) {
 					$refresh_token = $access_token['refresh_token'];
 				}
 	
 				// We need a name and a profile
-				if ( ! empty( $refresh_token ) && ! empty( $options['analytics_profile'] ) && ! empty( $profiles['ga_api_response_accounts'] ) ) {
+				if ( ! empty($refresh_token) && ! empty($options['analytics_profile']) && ! empty($profiles['ga_api_response_accounts'])) {
 					// See if we have an access token
-					if ( ! empty( $access_token['access_token'] ) ) {
-						if ( monsterinsights_is_pro_version() ) {
-							update_option( 'monsterinsights_pro_access_token', $access_token['access_token'] );
+					if ( ! empty($access_token['access_token'])) {
+						if (monsterinsights_is_pro_version()) {
+							update_option('monsterinsights_pro_access_token', $access_token['access_token']);
 						} else {
-							update_option( 'monsterinsights_lite_access_token', $access_token['access_token'] );
+							update_option('monsterinsights_lite_access_token', $access_token['access_token']);
 						}
 					}
 
 					// We need a refresh token
-					if ( monsterinsights_is_pro_version() ) {
-						update_option( 'monsterinsights_pro_refresh_token', $refresh_token );
+					if (monsterinsights_is_pro_version()) {
+						update_option('monsterinsights_pro_refresh_token', $refresh_token);
 					} else {
-						update_option( 'monsterinsights_lite_refresh_token', $refresh_token );
+						update_option('monsterinsights_lite_refresh_token', $refresh_token);
 					}
 
 					// If we can find the profile in the response save the name
-					if ( ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
-						foreach ( $profiles['ga_api_response_accounts'] as $account ) {
-							foreach ( $account['items'] as $profile ) {
-								foreach ( $profile['items'] as $subprofile ) {
-									if ( isset( $subprofile['id'] ) && $subprofile['id'] == $profile_name ) {
+					if ( ! empty($profiles['ga_api_response_accounts']) && is_array($profiles['ga_api_response_accounts'])) {
+						foreach ($profiles['ga_api_response_accounts'] as $account) {
+							foreach ($account['items'] as $profile) {
+								foreach ($profile['items'] as $subprofile) {
+									if (isset($subprofile['id']) && $subprofile['id'] == $profile_name) {
 										$options['analytics_profile_name'] = $subprofile['name'];
-										if ( empty( $options['analytics_profile_code'] ) ) {
+										if (empty($options['analytics_profile_code'])) {
 											$options['analytics_profile_code'] = $subprofile['ua_code'];
 										}
 										break 3;
@@ -493,36 +493,36 @@ 
 					$options['cron_last_run'] = strtotime("-25 hours");
 				} else {
 					// if UA in manual code field, remove analytics profile fields if set
-					if ( ! empty( $options['manual_ua_code_field' ] ) ) {
-						if ( isset( $options['analytics_profile_code'] ) ) {
-							unset( $options['analytics_profile_code'] );
+					if ( ! empty($options['manual_ua_code_field'])) {
+						if (isset($options['analytics_profile_code'])) {
+							unset($options['analytics_profile_code']);
 						}
-						if ( isset( $options['analytics_profile'] ) ) {
-							unset( $options['analytics_profile'] );
+						if (isset($options['analytics_profile'])) {
+							unset($options['analytics_profile']);
 						}
 						$options['manual_ua_code'] = $options['manual_ua_code_field'];
-						delete_option( 'yoast-ga-access_token' );
-						delete_option( 'yoast-ga-refresh_token' );
-						delete_option( 'yst_ga_api' );
-					} else if ( ! empty( $options['analytics_profile_code' ] ) ) {
+						delete_option('yoast-ga-access_token');
+						delete_option('yoast-ga-refresh_token');
+						delete_option('yst_ga_api');
+					} else if ( ! empty($options['analytics_profile_code'])) {
 					// if UA in profile fields, remove others and use that
 						$options['manual_ua_code'] = $options['analytics_profile_code'];
-						if ( isset( $options['analytics_profile_code'] ) ) {
-							unset( $options['analytics_profile_code'] );
+						if (isset($options['analytics_profile_code'])) {
+							unset($options['analytics_profile_code']);
 						}
-						if ( isset( $options['analytics_profile'] ) ) {
-							unset( $options['analytics_profile'] );
+						if (isset($options['analytics_profile'])) {
+							unset($options['analytics_profile']);
 						}
-						delete_option( 'yoast-ga-access_token' );
-						delete_option( 'yoast-ga-refresh_token' );
-						delete_option( 'yst_ga_api' );
-					}  else {
+						delete_option('yoast-ga-access_token');
+						delete_option('yoast-ga-refresh_token');
+						delete_option('yst_ga_api');
+					} else {
 					// if UA in profile profiles, remove others and use that
-						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
-							foreach ( $profiles as $account ) {
-								foreach ( $account['items'] as $profile ) {
-									foreach ( $profile['items'] as $subprofile ) {
-										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile' ] ) {
+						if ( ! empty($options['analytics_profile']) && ! empty($profiles['ga_api_response_accounts']) && is_array($profiles['ga_api_response_accounts'])) {
+							foreach ($profiles as $account) {
+								foreach ($account['items'] as $profile) {
+									foreach ($profile['items'] as $subprofile) {
+										if (isset($subprofile['id']) && $subprofile['id'] == $options['analytics_profile']) {
 											$options['manual_ua_code'] = $subprofile['ua_code'];
 											break 3;
 										}
@@ -530,14 +530,14 @@ 
 								}
 							}
 						}
-						delete_option( 'yoast-ga-access_token' );
-						delete_option( 'yoast-ga-refresh_token' );
-						delete_option( 'yst_ga_api' );
+						delete_option('yoast-ga-access_token');
+						delete_option('yoast-ga-refresh_token');
+						delete_option('yst_ga_api');
 					}
 				}
 			
-			if ( isset( $options['manual_ua_code_field'] ) ) {
-				unset( $options['manual_ua_code_field'] );
+			if (isset($options['manual_ua_code_field'])) {
+				unset($options['manual_ua_code_field']);
 			}
 
 		// oAuth Stir Data Tank
@@ -552,12 +552,12 @@ 
 			'installed_pro'     => monsterinsights_is_pro_version(),
 		);
 
-		update_option( 'monsterinsights_over_time', $data );
+		update_option('monsterinsights_over_time', $data);
 		
 		// Add the cron job
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+		if ( ! wp_next_scheduled('monsterinsights_daily_cron')) {
 			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:05:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+			wp_schedule_event(strtotime(date('Y-m-d', strtotime('tomorrow')) . ' 00:05:00 '), 'daily', 'monsterinsights_daily_cron');
 		}
 		
 		// Finish up
@@ -578,7 +578,7 @@ 
 				'anonymous_data'             => 0,
 				'enable_universal'           => 1,
 				'demographics'               => 0,
-				'ignore_users'               => array( 'administrator', 'editor' ),
+				'ignore_users'               => array('administrator', 'editor'),
 				'dashboards_disabled'        => 0,
 				'anonymize_ips'              => 0,
 				'track_download_as'          => 'event',
@@ -593,7 +593,7 @@ 
 				'debug_mode'                 => 0,
 			)
 		);
-		$options = apply_filters( 'yst_ga_default-ga-values', $options, 'ga_general' );
+		$options = apply_filters('yst_ga_default-ga-values', $options, 'ga_general');
 		return $options;
 	}
 
@@ -609,7 +609,7 @@ 
 			'tracking_mode'              => 'analytics',
 			'events_mode'                => 'js',
 			'demographics'               => 1,
-			'ignore_users'               => array( 'administrator', 'editor' ),
+			'ignore_users'               => array('administrator', 'editor'),
 			'dashboards_disabled'        => 0,
 			'anonymize_ips'              => 0,
 			'track_download_as'          => 'event',
@@ -641,12 +641,12 @@ 
 	 * @return void
 	 */
 	public function v602_upgrades() {
-		$options = get_option( 'yst_ga', array() );
-		if ( ( empty( $this->new_settings[ 'manual_ua_code'] ) || $this->new_settings[ 'manual_ua_code']  === '1' )  &&  
-			 empty( $this->new_settings[ 'analytics_profile_code'] ) &&
-			 ! empty( $options ) &&
-			 is_array( $options ) &&
-			 ! empty( $options['ga_general']['manual_ua_code_field'] )
+		$options = get_option('yst_ga', array());
+		if ((empty($this->new_settings['manual_ua_code']) || $this->new_settings['manual_ua_code'] === '1') &&  
+			 empty($this->new_settings['analytics_profile_code']) &&
+			 ! empty($options) &&
+			 is_array($options) &&
+			 ! empty($options['ga_general']['manual_ua_code_field'])
 		) {
 			$this->new_settings['manual_ua_code'] = $options['ga_general']['manual_ua_code_field'];
 		}
@@ -664,18 +664,18 @@ 
 	 */
 	public function v6011_upgrades() {
 		// If old tracking checkin exists, remove it
-		if ( wp_next_scheduled( 'monsterinsights_send_tracking_checkin' ) ) {
-			wp_clear_scheduled_hook( 'monsterinsights_send_tracking_checkin' );
+		if (wp_next_scheduled('monsterinsights_send_tracking_checkin')) {
+			wp_clear_scheduled_hook('monsterinsights_send_tracking_checkin');
 		}
 
 		// Remove Weekly cron
-		if ( wp_next_scheduled( 'monsterinsights_weekly_cron' ) ) {
-			wp_clear_scheduled_hook( 'monsterinsights_weekly_cron' );
+		if (wp_next_scheduled('monsterinsights_weekly_cron')) {
+			wp_clear_scheduled_hook('monsterinsights_weekly_cron');
 		}
 
 		// Remove Yoast cron
-		if ( wp_next_scheduled( 'yst_ga_aggregate_data' ) ) {
-			wp_clear_scheduled_hook( 'yst_ga_aggregate_data' );
+		if (wp_next_scheduled('yst_ga_aggregate_data')) {
+			wp_clear_scheduled_hook('yst_ga_aggregate_data');
 		}
 	}
 
@@ -691,8 +691,8 @@ 
 	 */
 	public function v620_upgrades() {
 		// Turns off debug mode if its on.
-		if ( empty( $this->new_settings['debug_mode' ] ) ) {
-			$this->new_settings['debug_mode' ] = 0;
+		if (empty($this->new_settings['debug_mode'])) {
+			$this->new_settings['debug_mode'] = 0;
 		}
 	}
 

Braces +1 added lines, -1 removed lines

@@ -516,7 +516,7 @@
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
 						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {

Indentation +667 added lines, -667 removed lines

@@ -14,7 +14,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) { 
-	exit;
+    exit;
 }
 
 /**
@@ -29,693 +29,693 @@ 
  */
 class MonsterInsights_Install {
 
-	/**
-	 * MI Settings.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var array $new_settings When the init() function starts, initially
-	 *      					contains the original settings. At the end 
-	 *      				 	of init() contains the settings to save.
-	 */	
-	public $new_settings = array();
-
-	/**
-	 * Install/Upgrade routine.
-	 *
-	 * This function is what is called to actually install MI data on new installs and to do
-	 * behind the scenes upgrades on MI upgrades. If this function contains a bug, the results 
-	 * can be catastrophic. This function gets the highest priority in all of MI for unit tests.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @todo  I'd like to add preflight checks here.
-	 * @todo  I'd like to add a recovery system here.
-	 * 
-	 * @return void
-	 */
-	public function init() {
-
-		// Get a copy of the current MI settings.
-		$this->new_settings = get_option( monsterinsights_get_option_name() );
-
-
-		$version = get_option( 'monsterinsights_current_version', false );
-		$yoast   = get_option( 'yst_ga', false );
-		$cachec  = false; // have we forced an object cache to be cleared already (so we don't clear it unnecessarily)
-
-		// if new install and have not used Yoast previously
-		if ( ! $version && ! $yoast ) {
-
-			$this->new_install();
-			// This is the version used for MI upgrade routines.
-			update_option( 'monsterinsights_db_version', '6.2.0' );
+    /**
+     * MI Settings.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var array $new_settings When the init() function starts, initially
+     *      					contains the original settings. At the end 
+     *      				 	of init() contains the settings to save.
+     */	
+    public $new_settings = array();
+
+    /**
+     * Install/Upgrade routine.
+     *
+     * This function is what is called to actually install MI data on new installs and to do
+     * behind the scenes upgrades on MI upgrades. If this function contains a bug, the results 
+     * can be catastrophic. This function gets the highest priority in all of MI for unit tests.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @todo  I'd like to add preflight checks here.
+     * @todo  I'd like to add a recovery system here.
+     * 
+     * @return void
+     */
+    public function init() {
+
+        // Get a copy of the current MI settings.
+        $this->new_settings = get_option( monsterinsights_get_option_name() );
+
+
+        $version = get_option( 'monsterinsights_current_version', false );
+        $yoast   = get_option( 'yst_ga', false );
+        $cachec  = false; // have we forced an object cache to be cleared already (so we don't clear it unnecessarily)
+
+        // if new install and have not used Yoast previously
+        if ( ! $version && ! $yoast ) {
+
+            $this->new_install();
+            // This is the version used for MI upgrade routines.
+            update_option( 'monsterinsights_db_version', '6.2.0' );
 			
-		} else if ( ! $version && $yoast ) { // if new install and has used Yoast previously
+        } else if ( ! $version && $yoast ) { // if new install and has used Yoast previously
 
-			$this->upgrade_from_yoast();
-			// This is the version used for MI upgrade routines.
-			update_option( 'monsterinsights_db_version', '6.2.0' );
+            $this->upgrade_from_yoast();
+            // This is the version used for MI upgrade routines.
+            update_option( 'monsterinsights_db_version', '6.2.0' );
 
-			if ( ! $cachec ) {
-				wp_cache_flush();
-				$cachec = true;
-			}
+            if ( ! $cachec ) {
+                wp_cache_flush();
+                $cachec = true;
+            }
 			
-		} else { // if existing install
-			if ( version_compare( $version, '6.0.2', '<' ) ) {
-				$this->v602_upgrades();
-			}
+        } else { // if existing install
+            if ( version_compare( $version, '6.0.2', '<' ) ) {
+                $this->v602_upgrades();
+            }
 			
-			if ( version_compare( $version, '6.0.11', '<' ) ) {
-				$this->v6011_upgrades();
-
-				if ( ! $cachec ) {
-					wp_cache_flush();
-					$cachec = true;
-				}
-			}
-			if ( version_compare( $version, '6.2.0', '<' ) ) {
-				$this->v620_upgrades();
-			}
-
-			update_option( 'monsterinsights_db_version', '6.2.0' );
+            if ( version_compare( $version, '6.0.11', '<' ) ) {
+                $this->v6011_upgrades();
+
+                if ( ! $cachec ) {
+                    wp_cache_flush();
+                    $cachec = true;
+                }
+            }
+            if ( version_compare( $version, '6.2.0', '<' ) ) {
+                $this->v620_upgrades();
+            }
+
+            update_option( 'monsterinsights_db_version', '6.2.0' );
 			
-			// @todo: doc as nonpublic
+            // @todo: doc as nonpublic
 			
-			update_option( 'monsterinsights_version_upgraded_from', $version );
-			do_action( 'monsterinsights_after_existing_upgrade_routine', $version );
-		}
-
-		// This hook is used primarily by the Pro version to run some Pro
-		// specific install stuff. Please do not use this hook. It is not 
-		// considered a public hook by MI's dev team and can/will be removed, 
-		// relocated, and/or altered without warning at any time. You've been warned.
-		// As this hook is not for public use, we've intentionally not docbloc'd this
-		// hook to avoid developers seeing it future public dev docs.
-		do_action( 'monsterinsights_after_install_routine', $version );
-
-		// This is the version of the MI settings themselves
-		update_option( 'monsterinsights_settings_version', '6.0.0' );
-
-		// This is the version of MI installed
-		update_option( 'monsterinsights_current_version', MONSTERINSIGHTS_VERSION );
-
-		// This is where we save MI settings
-		update_option( monsterinsights_get_option_name(), $this->new_settings );
-
-		// This is where we redirect to the MI welcome page
-		//set_transient( '_monsterinsights_activation_redirect', true, 30 ); @todo: Investigate
-
-		// There's no code for this function below this. Just an explanation
-		// of the MI core options.
-
-		/** 
-		 * Explanation of MonsterInsights core options
-		 *
-		 * By now your head is probably spinning trying to figure
-		 * out what all of these version options are for. Note, I've abbreviated
-		 * "monsterinsights" to "mi" in the options names to make this table easier
-		 * to read.
-		 *
-		 * Here's a basic rundown:
-		 *
-		 * mi_settings_version: Used to store the version 
-		 * 						of the MI settings. We use this
-		 * 						so we can do upgrade routines where
-		 * 						we'd have to do different actions based
-		 * 						on the version the settings were installed
-		 * 						in. For example: if we made a mistake with 
-		 * 						the value we saved as the default for 
-		 * 						a select setting, we can detect the version
-		 * 						containing this mistake and correct it.
-		 *
-		 * mi_current_version:  This starts with the actual version MI was
-		 * 						installed on. We use this version to 
-		 * 						determine whether or not a site needs
-		 * 						to run one of the behind the scenes
-		 * 						MI upgrade routines. This version is updated
-		 * 						every time a minor or major background upgrade
-		 * 						routine is run. Generally lags behind the 
-		 * 						MONSTERINSIGHTS_VERSION constant by at most a couple minor
-		 * 						versions. Never lags behind by 1 major version
-		 * 						or more.
-		 *
-		 * mi_db_version: 		This is different from mi_current_version.
-		 * 						Unlike the former, this is used to determine
-		 * 						if a site needs to run a *user* initiated
-		 * 						upgrade routine (see MI_Upgrade class). This
-		 * 						value is only update when a user initiated
-		 * 						upgrade routine is done. Because we do very
-		 * 						few user initiated upgrades compared to 
-		 * 						automatic ones, this version can lag behind by
-		 * 						2 or even 3 major versions. Generally contains
-		 * 						the current major version.
-		 *
-		 * mi_settings:		    Returned by monsterinsights_get_option_name(), this
-		 * 						is actually "monsterinsights_settings" for both pro
-		 * 						and lite version. However we use a helper function to 
-		 * 						retrieve the option name in case we ever decide down the
-		 * 						road to maintain seperate options for the Lite and Pro versions.
-		 * 					 	If you need to access MI's settings directly, (as opposed to our
-		 * 					 	monsterinsights_get_option helper which uses the option name helper
-		 * 					 	automatically), you should use this function to get the 
-		 * 					 	name of the option to retrieve.
-		 *
-		 * yst_ga:			    Yoast's old settings option. We no longer use this, though
-		 * 						for backwards compatibility reasons we store the updated settings
-		 * 						in this just for a little while longer. These settings are migrated
-		 * 						to the new settings option when you upgrade to MonsterInsights
-		 * 						6.0 or higher automatically.
-		 *
-		 * yst_* & yoast_*:		These are options from when the plugin was developed by
-		 * 						Yoast, and also of the few point releases we did after
-		 * 						the acquisition. Note, while we currently do backcompat
-		 * 						on some of these options so other plugins will continue working
-		 * 						please realize there will be a point in the near future that we 
-		 * 						will no longer support them. Please do not use them anymore.
-		 */			
-	}
-
-
-	/**
-	 * New MonsterInsights Install routine.
-	 *
-	 * This function installs all of the default
-	 * things on new MI installs. Flight 5476 with 
-	 * non-stop service to a whole world of 
-	 * possibilities is now boarding.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function new_install() {
-
-		// Add default settings values
-		$this->new_settings = $this->get_monsterinsights_default_values();
-
-		$data = array(
-			'installed_version' => MONSTERINSIGHTS_VERSION,
-			'installed_date'    => time(),
-			'installed_pro'     => monsterinsights_is_pro_version(),
-		);
-
-		update_option( 'monsterinsights_over_time', $data );
-
-		// Add cron job
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
-			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:05:00 ' ), 'daily', 'monsterinsights_daily_cron' );
-		}
-
-		// Let addons + MI Pro/Lite hook in here. @todo: doc as nonpublic
-		do_action( 'monsterinsights_after_new_install_routine', MONSTERINSIGHTS_VERSION );
-	}
-
-	/**
-	 * Upgrade from Yoast.
-	 *
-	 * This function does the upgrade routine from Yoast to this plugin version.
-	 * Includes all of Yoast's previous routines.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function upgrade_from_yoast() {
-		// Do Yoast's Old Routines
-		$options = get_option( 'yst_ga', array() );
-		if ( ! empty( $options['ga_general'] ) ) {
-			$options = $options['ga_general'];
-		}
-
-		$tracking_code = null;
-		if ( ! empty( $options['analytics_profile'] ) && ! empty( $options['analytics_profile_code'] ) ) {
-			$tracking_code = $options['analytics_profile_code'];
-		} else if ( ! empty( $options['analytics_profile'] ) && empty( $options['analytics_profile_code'] ) ) {
-			// Analytics profile is still holding the UA code
-			$tracking_code = $options['analytics_profile'];
-		}
-
-		if ( ! empty( $options['manual_ua_code_field'] ) && ! empty( $options['manual_ua_code'] ) ) {
-			$tracking_code = $options['manual_ua_code_field'];
-		}
-
-		if ( ! isset( $options['version'] ) && is_null( $tracking_code ) ) {
-			$old_options = get_option( 'Yoast_Google_Analytics' );
-			if ( isset( $old_options ) && is_array( $old_options ) ) {
-				if ( isset( $old_options['uastring'] ) && '' !== trim( $old_options['uastring'] ) ) {
-					// Save UA as manual UA, instead of saving all the old GA crap
-					$options['manual_ua_code']       = 1;
-					$options['manual_ua_code_field'] = $old_options['uastring'];
-				}
-				// Other settings
-				$options['allow_anchor']               = $old_options['allowanchor'];
-				$options['add_allow_linker']           = $old_options['allowlinker'];
-				$options['anonymous_data']             = $old_options['anonymizeip'];
-				$options['track_outbound']             = $old_options['trackoutbound'];
-				$options['track_internal_as_outbound'] = $old_options['internallink'];
-				$options['track_internal_as_label']    = $old_options['internallinklabel'];
-				$options['extensions_of_files']        = $old_options['dlextensions'];
-			}
-			delete_option( 'Yoast_Google_Analytics' );
-		}
-		// 5.0.0 to 5.0.1 fix of ignore users array
-		if ( ! isset( $options['version'] ) || version_compare( $options['version'], '5.0.1', '<' ) ) {
-			if ( isset( $options['ignore_users'] ) && ! is_array( $options['ignore_users'] ) ) {
-				$options['ignore_users'] = (array) $options['ignore_users'];
-			}
-		}
-		// 5.1.2+ Remove firebug_lite from options, if set
-		if ( ! isset ( $options['version'] ) || version_compare( $options['version'], '5.1.2', '<' ) ) {
-			if ( isset( $options['firebug_lite'] ) ) {
-				unset( $options['firebug_lite'] );
-			}
-		}
-		// 5.2.8+ Add disabled dashboards option
-		if ( ! isset ( $options['dashboards_disabled'] ) || version_compare( $options['version'], '5.2.8', '>' ) ) {
-			$options['dashboards_disabled'] = 0;
-		}
-		// Check is API option already exists - if not add it
-		$yst_ga_api = get_option( 'yst_ga_api' );
-		if ( $yst_ga_api === false ) {
-			add_option( 'yst_ga_api', array(), '', 'no' );
-		}
-		// Fallback to make sure every default option has a value
-		$defaults = $this->get_yoast_default_values();
-		if ( is_array( $defaults ) ) {
-			foreach ( $defaults[ 'ga_general' ] as $key => $value ) {
-				if ( ! isset( $options[ $key ] ) ) {
-					$options[ $key ] = $value;
-				}
-			}
-		}
-
-		// Set to the current version now that we've done all needed upgrades
-		$options['version'] = '5.5.3'; // Last Yoast codebase version
-		$saved_options = get_option( 'yst_ga' );
-		$saved_options[ 'ga_general' ] = $options;
-		update_option( 'yst_ga', $saved_options );
-
-
-		// Do license key switchover 
-			$key     = '';
-			$found   = false;
-			$network = false;
-			// Try network active Premium
-			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-				$key    = $is_key['key'];
-				$found = true;
-				$network = true;
-			}
-
-			// Try single site Premium
-			if ( ! $found ) {
-				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
-					$found = true;
-				}				
-			}
-
-			// Try network active Premium
-			if ( ! $found ) {
-				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
-					$found = true;
-					$network = true;
-				}				
-			}
+            update_option( 'monsterinsights_version_upgraded_from', $version );
+            do_action( 'monsterinsights_after_existing_upgrade_routine', $version );
+        }
+
+        // This hook is used primarily by the Pro version to run some Pro
+        // specific install stuff. Please do not use this hook. It is not 
+        // considered a public hook by MI's dev team and can/will be removed, 
+        // relocated, and/or altered without warning at any time. You've been warned.
+        // As this hook is not for public use, we've intentionally not docbloc'd this
+        // hook to avoid developers seeing it future public dev docs.
+        do_action( 'monsterinsights_after_install_routine', $version );
+
+        // This is the version of the MI settings themselves
+        update_option( 'monsterinsights_settings_version', '6.0.0' );
+
+        // This is the version of MI installed
+        update_option( 'monsterinsights_current_version', MONSTERINSIGHTS_VERSION );
+
+        // This is where we save MI settings
+        update_option( monsterinsights_get_option_name(), $this->new_settings );
+
+        // This is where we redirect to the MI welcome page
+        //set_transient( '_monsterinsights_activation_redirect', true, 30 ); @todo: Investigate
+
+        // There's no code for this function below this. Just an explanation
+        // of the MI core options.
+
+        /** 
+         * Explanation of MonsterInsights core options
+         *
+         * By now your head is probably spinning trying to figure
+         * out what all of these version options are for. Note, I've abbreviated
+         * "monsterinsights" to "mi" in the options names to make this table easier
+         * to read.
+         *
+         * Here's a basic rundown:
+         *
+         * mi_settings_version: Used to store the version 
+         * 						of the MI settings. We use this
+         * 						so we can do upgrade routines where
+         * 						we'd have to do different actions based
+         * 						on the version the settings were installed
+         * 						in. For example: if we made a mistake with 
+         * 						the value we saved as the default for 
+         * 						a select setting, we can detect the version
+         * 						containing this mistake and correct it.
+         *
+         * mi_current_version:  This starts with the actual version MI was
+         * 						installed on. We use this version to 
+         * 						determine whether or not a site needs
+         * 						to run one of the behind the scenes
+         * 						MI upgrade routines. This version is updated
+         * 						every time a minor or major background upgrade
+         * 						routine is run. Generally lags behind the 
+         * 						MONSTERINSIGHTS_VERSION constant by at most a couple minor
+         * 						versions. Never lags behind by 1 major version
+         * 						or more.
+         *
+         * mi_db_version: 		This is different from mi_current_version.
+         * 						Unlike the former, this is used to determine
+         * 						if a site needs to run a *user* initiated
+         * 						upgrade routine (see MI_Upgrade class). This
+         * 						value is only update when a user initiated
+         * 						upgrade routine is done. Because we do very
+         * 						few user initiated upgrades compared to 
+         * 						automatic ones, this version can lag behind by
+         * 						2 or even 3 major versions. Generally contains
+         * 						the current major version.
+         *
+         * mi_settings:		    Returned by monsterinsights_get_option_name(), this
+         * 						is actually "monsterinsights_settings" for both pro
+         * 						and lite version. However we use a helper function to 
+         * 						retrieve the option name in case we ever decide down the
+         * 						road to maintain seperate options for the Lite and Pro versions.
+         * 					 	If you need to access MI's settings directly, (as opposed to our
+         * 					 	monsterinsights_get_option helper which uses the option name helper
+         * 					 	automatically), you should use this function to get the 
+         * 					 	name of the option to retrieve.
+         *
+         * yst_ga:			    Yoast's old settings option. We no longer use this, though
+         * 						for backwards compatibility reasons we store the updated settings
+         * 						in this just for a little while longer. These settings are migrated
+         * 						to the new settings option when you upgrade to MonsterInsights
+         * 						6.0 or higher automatically.
+         *
+         * yst_* & yoast_*:		These are options from when the plugin was developed by
+         * 						Yoast, and also of the few point releases we did after
+         * 						the acquisition. Note, while we currently do backcompat
+         * 						on some of these options so other plugins will continue working
+         * 						please realize there will be a point in the near future that we 
+         * 						will no longer support them. Please do not use them anymore.
+         */			
+    }
+
+
+    /**
+     * New MonsterInsights Install routine.
+     *
+     * This function installs all of the default
+     * things on new MI installs. Flight 5476 with 
+     * non-stop service to a whole world of 
+     * possibilities is now boarding.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @return void
+     */
+    public function new_install() {
+
+        // Add default settings values
+        $this->new_settings = $this->get_monsterinsights_default_values();
+
+        $data = array(
+            'installed_version' => MONSTERINSIGHTS_VERSION,
+            'installed_date'    => time(),
+            'installed_pro'     => monsterinsights_is_pro_version(),
+        );
+
+        update_option( 'monsterinsights_over_time', $data );
+
+        // Add cron job
+        if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+            // Set the next event of fetching data
+            wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:05:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+        }
+
+        // Let addons + MI Pro/Lite hook in here. @todo: doc as nonpublic
+        do_action( 'monsterinsights_after_new_install_routine', MONSTERINSIGHTS_VERSION );
+    }
+
+    /**
+     * Upgrade from Yoast.
+     *
+     * This function does the upgrade routine from Yoast to this plugin version.
+     * Includes all of Yoast's previous routines.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @return void
+     */
+    public function upgrade_from_yoast() {
+        // Do Yoast's Old Routines
+        $options = get_option( 'yst_ga', array() );
+        if ( ! empty( $options['ga_general'] ) ) {
+            $options = $options['ga_general'];
+        }
+
+        $tracking_code = null;
+        if ( ! empty( $options['analytics_profile'] ) && ! empty( $options['analytics_profile_code'] ) ) {
+            $tracking_code = $options['analytics_profile_code'];
+        } else if ( ! empty( $options['analytics_profile'] ) && empty( $options['analytics_profile_code'] ) ) {
+            // Analytics profile is still holding the UA code
+            $tracking_code = $options['analytics_profile'];
+        }
+
+        if ( ! empty( $options['manual_ua_code_field'] ) && ! empty( $options['manual_ua_code'] ) ) {
+            $tracking_code = $options['manual_ua_code_field'];
+        }
+
+        if ( ! isset( $options['version'] ) && is_null( $tracking_code ) ) {
+            $old_options = get_option( 'Yoast_Google_Analytics' );
+            if ( isset( $old_options ) && is_array( $old_options ) ) {
+                if ( isset( $old_options['uastring'] ) && '' !== trim( $old_options['uastring'] ) ) {
+                    // Save UA as manual UA, instead of saving all the old GA crap
+                    $options['manual_ua_code']       = 1;
+                    $options['manual_ua_code_field'] = $old_options['uastring'];
+                }
+                // Other settings
+                $options['allow_anchor']               = $old_options['allowanchor'];
+                $options['add_allow_linker']           = $old_options['allowlinker'];
+                $options['anonymous_data']             = $old_options['anonymizeip'];
+                $options['track_outbound']             = $old_options['trackoutbound'];
+                $options['track_internal_as_outbound'] = $old_options['internallink'];
+                $options['track_internal_as_label']    = $old_options['internallinklabel'];
+                $options['extensions_of_files']        = $old_options['dlextensions'];
+            }
+            delete_option( 'Yoast_Google_Analytics' );
+        }
+        // 5.0.0 to 5.0.1 fix of ignore users array
+        if ( ! isset( $options['version'] ) || version_compare( $options['version'], '5.0.1', '<' ) ) {
+            if ( isset( $options['ignore_users'] ) && ! is_array( $options['ignore_users'] ) ) {
+                $options['ignore_users'] = (array) $options['ignore_users'];
+            }
+        }
+        // 5.1.2+ Remove firebug_lite from options, if set
+        if ( ! isset ( $options['version'] ) || version_compare( $options['version'], '5.1.2', '<' ) ) {
+            if ( isset( $options['firebug_lite'] ) ) {
+                unset( $options['firebug_lite'] );
+            }
+        }
+        // 5.2.8+ Add disabled dashboards option
+        if ( ! isset ( $options['dashboards_disabled'] ) || version_compare( $options['version'], '5.2.8', '>' ) ) {
+            $options['dashboards_disabled'] = 0;
+        }
+        // Check is API option already exists - if not add it
+        $yst_ga_api = get_option( 'yst_ga_api' );
+        if ( $yst_ga_api === false ) {
+            add_option( 'yst_ga_api', array(), '', 'no' );
+        }
+        // Fallback to make sure every default option has a value
+        $defaults = $this->get_yoast_default_values();
+        if ( is_array( $defaults ) ) {
+            foreach ( $defaults[ 'ga_general' ] as $key => $value ) {
+                if ( ! isset( $options[ $key ] ) ) {
+                    $options[ $key ] = $value;
+                }
+            }
+        }
+
+        // Set to the current version now that we've done all needed upgrades
+        $options['version'] = '5.5.3'; // Last Yoast codebase version
+        $saved_options = get_option( 'yst_ga' );
+        $saved_options[ 'ga_general' ] = $options;
+        update_option( 'yst_ga', $saved_options );
+
+
+        // Do license key switchover 
+            $key     = '';
+            $found   = false;
+            $network = false;
+            // Try network active Premium
+            $is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
+            if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+                $key    = $is_key['key'];
+                $found = true;
+                $network = true;
+            }
+
+            // Try single site Premium
+            if ( ! $found ) {
+                $is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
+                if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+                    $key    = $is_key['key'];
+                    $found = true;
+                }				
+            }
+
+            // Try network active Premium
+            if ( ! $found ) {
+                $is_key = get_site_option( 'monsterinsights-pro_license', array() );
+                if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+                    $key    = $is_key['key'];
+                    $found = true;
+                    $network = true;
+                }				
+            }
 			
-			// Try single site Premium
-			if ( ! $found ) {
-				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
-					$found = true;
-				}				
-			}
+            // Try single site Premium
+            if ( ! $found ) {
+                $is_key = get_option( 'monsterinsights-pro_license', array() );
+                if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+                    $key    = $is_key['key'];
+                    $found = true;
+                }				
+            }
 			
-			// Try network active ecommmerce
-			if ( ! $found ) {
-				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
-					$found = true;
-					$network = true;
-				}
-			}
-			// Try single site ecommerce
-			if ( ! $found ) {
-				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
-					$found = true;
-				}				
-			}
-
-			// set as new key for monsterinsights
-			if ( $found && ! empty( $key ) ) {
-				// In pro, install custom dimensions + ads. In lite, just save the key
-				do_action( 'monsterinsights_upgrade_from_yoast', $key, $network );
-			}
-
-		// Next up: Settings Migration
+            // Try network active ecommmerce
+            if ( ! $found ) {
+                $is_key = get_site_option( 'ecommerce-addon_license', array() );
+                if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+                    $key    = $is_key['key'];
+                    $found = true;
+                    $network = true;
+                }
+            }
+            // Try single site ecommerce
+            if ( ! $found ) {
+                $is_key = get_option( 'ecommerce-addon_license', array() );
+                if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+                    $key    = $is_key['key'];
+                    $found = true;
+                }				
+            }
+
+            // set as new key for monsterinsights
+            if ( $found && ! empty( $key ) ) {
+                // In pro, install custom dimensions + ads. In lite, just save the key
+                do_action( 'monsterinsights_upgrade_from_yoast', $key, $network );
+            }
+
+        // Next up: Settings Migration
 		
-			$options = get_option( 'yst_ga', array() );
-			if ( ! empty( $options['ga_general'] ) ) {
-				$options = $options['ga_general'];
-			}
-
-
-			// Let's remove the defaults
-			if ( isset( $options['ga_general'] ) ) {
-				unset( $options['ga_general'] );
-			}
-
-			// Let's remove unused options
-			if ( isset( $options['yoast_ga_nonce'] ) ) {
-				unset( $options['yoast_ga_nonce'] );
-			}			
-			if ( isset( $options['ga-form-settings'] ) ) {
-				unset( $options['ga-form-settings'] );
-			}
-			if ( isset( $options['string_error_custom_dimensions'] ) ) {
-				unset( $options['string_error_custom_dimensions'] );
-			}
-			if ( isset( $options['custom_metrics'] ) ) {
-				unset( $options['custom_metrics'] );
-			}	
-			if ( isset( $options['track_full_url'] ) ) {
-				unset( $options['track_full_url'] );
-			}	
-			if ( isset( $options['version'] ) ) {
-				unset( $options['version'] );
-			}
-
-			// Migrate universal to tracking_mode
-			if ( isset( $options['enable_universal'] ) ) {
-				unset( $options['enable_universal'] );
-				$options['tracking_mode'] = 'analytics';
-			} else {
-				$options['tracking_mode'] = 'ga';
-			}
-
-			// Migrate events tracking
-			if ( isset( $options['track_outbound'] ) ) {
-				unset( $options['track_outbound'] );
-				$options['events_mode'] = 'php';
-			} else {
-				$options['events_mode'] = 'none';
-			}
-
-			// Migrate anonymous_data to allow tracking
-			if ( isset( $options['anonymous_data'] ) ) {
-				unset( $options['anonymous_data'] );
-				$options['allow_tracking'] = 1;
-			} else {
-				$options['allow_tracking'] = 0;
-			}
+            $options = get_option( 'yst_ga', array() );
+            if ( ! empty( $options['ga_general'] ) ) {
+                $options = $options['ga_general'];
+            }
+
+
+            // Let's remove the defaults
+            if ( isset( $options['ga_general'] ) ) {
+                unset( $options['ga_general'] );
+            }
+
+            // Let's remove unused options
+            if ( isset( $options['yoast_ga_nonce'] ) ) {
+                unset( $options['yoast_ga_nonce'] );
+            }			
+            if ( isset( $options['ga-form-settings'] ) ) {
+                unset( $options['ga-form-settings'] );
+            }
+            if ( isset( $options['string_error_custom_dimensions'] ) ) {
+                unset( $options['string_error_custom_dimensions'] );
+            }
+            if ( isset( $options['custom_metrics'] ) ) {
+                unset( $options['custom_metrics'] );
+            }	
+            if ( isset( $options['track_full_url'] ) ) {
+                unset( $options['track_full_url'] );
+            }	
+            if ( isset( $options['version'] ) ) {
+                unset( $options['version'] );
+            }
+
+            // Migrate universal to tracking_mode
+            if ( isset( $options['enable_universal'] ) ) {
+                unset( $options['enable_universal'] );
+                $options['tracking_mode'] = 'analytics';
+            } else {
+                $options['tracking_mode'] = 'ga';
+            }
+
+            // Migrate events tracking
+            if ( isset( $options['track_outbound'] ) ) {
+                unset( $options['track_outbound'] );
+                $options['events_mode'] = 'php';
+            } else {
+                $options['events_mode'] = 'none';
+            }
+
+            // Migrate anonymous_data to allow tracking
+            if ( isset( $options['anonymous_data'] ) ) {
+                unset( $options['anonymous_data'] );
+                $options['allow_tracking'] = 1;
+            } else {
+                $options['allow_tracking'] = 0;
+            }
 
 		
-		// Migrate GA profile data if there
-			// first let's try to salvage the current profile
-			$access_token  = get_option( 'yoast-ga-access_token', array() );
-			$refresh_token = get_option( 'yoast-ga-refresh_token', array() );
-			$profiles      = get_option( 'yst_ga_api', array() );
+        // Migrate GA profile data if there
+            // first let's try to salvage the current profile
+            $access_token  = get_option( 'yoast-ga-access_token', array() );
+            $refresh_token = get_option( 'yoast-ga-refresh_token', array() );
+            $profiles      = get_option( 'yst_ga_api', array() );
 
-			$profile_name  = ! empty( $options['analytics_profile'] ) ? $options['analytics_profile'] : ''; 
+            $profile_name  = ! empty( $options['analytics_profile'] ) ? $options['analytics_profile'] : ''; 
 
-				if ( empty( $refresh_token ) && ! empty( $access_token['refresh_token'] ) ) {
-					$refresh_token = $access_token['refresh_token'];
-				}
+                if ( empty( $refresh_token ) && ! empty( $access_token['refresh_token'] ) ) {
+                    $refresh_token = $access_token['refresh_token'];
+                }
 	
-				// We need a name and a profile
-				if ( ! empty( $refresh_token ) && ! empty( $options['analytics_profile'] ) && ! empty( $profiles['ga_api_response_accounts'] ) ) {
-					// See if we have an access token
-					if ( ! empty( $access_token['access_token'] ) ) {
-						if ( monsterinsights_is_pro_version() ) {
-							update_option( 'monsterinsights_pro_access_token', $access_token['access_token'] );
-						} else {
-							update_option( 'monsterinsights_lite_access_token', $access_token['access_token'] );
-						}
-					}
-
-					// We need a refresh token
-					if ( monsterinsights_is_pro_version() ) {
-						update_option( 'monsterinsights_pro_refresh_token', $refresh_token );
-					} else {
-						update_option( 'monsterinsights_lite_refresh_token', $refresh_token );
-					}
-
-					// If we can find the profile in the response save the name
-					if ( ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
-						foreach ( $profiles['ga_api_response_accounts'] as $account ) {
-							foreach ( $account['items'] as $profile ) {
-								foreach ( $profile['items'] as $subprofile ) {
-									if ( isset( $subprofile['id'] ) && $subprofile['id'] == $profile_name ) {
-										$options['analytics_profile_name'] = $subprofile['name'];
-										if ( empty( $options['analytics_profile_code'] ) ) {
-											$options['analytics_profile_code'] = $subprofile['ua_code'];
-										}
-										break 3;
-									}
-								}
-							}
-						}
-					}
-					$options['cron_last_run'] = strtotime("-25 hours");
-				} else {
-					// if UA in manual code field, remove analytics profile fields if set
-					if ( ! empty( $options['manual_ua_code_field' ] ) ) {
-						if ( isset( $options['analytics_profile_code'] ) ) {
-							unset( $options['analytics_profile_code'] );
-						}
-						if ( isset( $options['analytics_profile'] ) ) {
-							unset( $options['analytics_profile'] );
-						}
-						$options['manual_ua_code'] = $options['manual_ua_code_field'];
-						delete_option( 'yoast-ga-access_token' );
-						delete_option( 'yoast-ga-refresh_token' );
-						delete_option( 'yst_ga_api' );
-					} else if ( ! empty( $options['analytics_profile_code' ] ) ) {
-					// if UA in profile fields, remove others and use that
-						$options['manual_ua_code'] = $options['analytics_profile_code'];
-						if ( isset( $options['analytics_profile_code'] ) ) {
-							unset( $options['analytics_profile_code'] );
-						}
-						if ( isset( $options['analytics_profile'] ) ) {
-							unset( $options['analytics_profile'] );
-						}
-						delete_option( 'yoast-ga-access_token' );
-						delete_option( 'yoast-ga-refresh_token' );
-						delete_option( 'yst_ga_api' );
-					}  else {
-					// if UA in profile profiles, remove others and use that
-						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
-							foreach ( $profiles as $account ) {
-								foreach ( $account['items'] as $profile ) {
-									foreach ( $profile['items'] as $subprofile ) {
-										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile' ] ) {
-											$options['manual_ua_code'] = $subprofile['ua_code'];
-											break 3;
-										}
-									}
-								}
-							}
-						}
-						delete_option( 'yoast-ga-access_token' );
-						delete_option( 'yoast-ga-refresh_token' );
-						delete_option( 'yst_ga_api' );
-					}
-				}
+                // We need a name and a profile
+                if ( ! empty( $refresh_token ) && ! empty( $options['analytics_profile'] ) && ! empty( $profiles['ga_api_response_accounts'] ) ) {
+                    // See if we have an access token
+                    if ( ! empty( $access_token['access_token'] ) ) {
+                        if ( monsterinsights_is_pro_version() ) {
+                            update_option( 'monsterinsights_pro_access_token', $access_token['access_token'] );
+                        } else {
+                            update_option( 'monsterinsights_lite_access_token', $access_token['access_token'] );
+                        }
+                    }
+
+                    // We need a refresh token
+                    if ( monsterinsights_is_pro_version() ) {
+                        update_option( 'monsterinsights_pro_refresh_token', $refresh_token );
+                    } else {
+                        update_option( 'monsterinsights_lite_refresh_token', $refresh_token );
+                    }
+
+                    // If we can find the profile in the response save the name
+                    if ( ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
+                        foreach ( $profiles['ga_api_response_accounts'] as $account ) {
+                            foreach ( $account['items'] as $profile ) {
+                                foreach ( $profile['items'] as $subprofile ) {
+                                    if ( isset( $subprofile['id'] ) && $subprofile['id'] == $profile_name ) {
+                                        $options['analytics_profile_name'] = $subprofile['name'];
+                                        if ( empty( $options['analytics_profile_code'] ) ) {
+                                            $options['analytics_profile_code'] = $subprofile['ua_code'];
+                                        }
+                                        break 3;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    $options['cron_last_run'] = strtotime("-25 hours");
+                } else {
+                    // if UA in manual code field, remove analytics profile fields if set
+                    if ( ! empty( $options['manual_ua_code_field' ] ) ) {
+                        if ( isset( $options['analytics_profile_code'] ) ) {
+                            unset( $options['analytics_profile_code'] );
+                        }
+                        if ( isset( $options['analytics_profile'] ) ) {
+                            unset( $options['analytics_profile'] );
+                        }
+                        $options['manual_ua_code'] = $options['manual_ua_code_field'];
+                        delete_option( 'yoast-ga-access_token' );
+                        delete_option( 'yoast-ga-refresh_token' );
+                        delete_option( 'yst_ga_api' );
+                    } else if ( ! empty( $options['analytics_profile_code' ] ) ) {
+                    // if UA in profile fields, remove others and use that
+                        $options['manual_ua_code'] = $options['analytics_profile_code'];
+                        if ( isset( $options['analytics_profile_code'] ) ) {
+                            unset( $options['analytics_profile_code'] );
+                        }
+                        if ( isset( $options['analytics_profile'] ) ) {
+                            unset( $options['analytics_profile'] );
+                        }
+                        delete_option( 'yoast-ga-access_token' );
+                        delete_option( 'yoast-ga-refresh_token' );
+                        delete_option( 'yst_ga_api' );
+                    }  else {
+                    // if UA in profile profiles, remove others and use that
+                        if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
+                            foreach ( $profiles as $account ) {
+                                foreach ( $account['items'] as $profile ) {
+                                    foreach ( $profile['items'] as $subprofile ) {
+                                        if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile' ] ) {
+                                            $options['manual_ua_code'] = $subprofile['ua_code'];
+                                            break 3;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        delete_option( 'yoast-ga-access_token' );
+                        delete_option( 'yoast-ga-refresh_token' );
+                        delete_option( 'yst_ga_api' );
+                    }
+                }
 			
-			if ( isset( $options['manual_ua_code_field'] ) ) {
-				unset( $options['manual_ua_code_field'] );
-			}
+            if ( isset( $options['manual_ua_code_field'] ) ) {
+                unset( $options['manual_ua_code_field'] );
+            }
 
-		// oAuth Stir Data Tank
-			// Will happen automatically as cron_last_run set to 25 hours ago
+        // oAuth Stir Data Tank
+            // Will happen automatically as cron_last_run set to 25 hours ago
 
-		// Add oAuth version 
-				$options['oauth_version'] = '1.0.0';
+        // Add oAuth version 
+                $options['oauth_version'] = '1.0.0';
 
-		$data = array(
-			'installed_version' => MONSTERINSIGHTS_VERSION,
-			'installed_date'    => time(),
-			'installed_pro'     => monsterinsights_is_pro_version(),
-		);
+        $data = array(
+            'installed_version' => MONSTERINSIGHTS_VERSION,
+            'installed_date'    => time(),
+            'installed_pro'     => monsterinsights_is_pro_version(),
+        );
 
-		update_option( 'monsterinsights_over_time', $data );
+        update_option( 'monsterinsights_over_time', $data );
 		
-		// Add the cron job
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
-			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:05:00 ' ), 'daily', 'monsterinsights_daily_cron' );
-		}
+        // Add the cron job
+        if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+            // Set the next event of fetching data
+            wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:05:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+        }
 		
-		// Finish up
-			// Save the new settings
-			$this->new_settings = $options;
-	}
-
-	public function get_yoast_default_values() {
-		$options = array(
-			'ga_general' => array(
-				'analytics_profile'          => null,
-				'analytics_profile_code'     => null,
-				'manual_ua_code'             => 0,
-				'manual_ua_code_field'       => null,
-				'track_internal_as_outbound' => null,
-				'track_internal_as_label'    => null,
-				'track_outbound'             => 0,
-				'anonymous_data'             => 0,
-				'enable_universal'           => 1,
-				'demographics'               => 0,
-				'ignore_users'               => array( 'administrator', 'editor' ),
-				'dashboards_disabled'        => 0,
-				'anonymize_ips'              => 0,
-				'track_download_as'          => 'event',
-				'extensions_of_files'        => 'doc,exe,js,pdf,ppt,tgz,zip,xls',
-				'track_full_url'             => 'domain',
-				'subdomain_tracking'         => null,
-				'tag_links_in_rss'           => 0,
-				'allow_anchor'               => 0,
-				'add_allow_linker'           => 0,
-				'enhanced_link_attribution'  => 0,
-				'custom_code'                => null,
-				'debug_mode'                 => 0,
-			)
-		);
-		$options = apply_filters( 'yst_ga_default-ga-values', $options, 'ga_general' );
-		return $options;
-	}
-
-	public function get_monsterinsights_default_values() {
-		return array(
-			'analytics_profile'          => '',
-			'analytics_profile_code'     => '',
-			'manual_ua_code'             => '',
-			'track_internal_as_outbound' => 0,
-			'track_internal_as_label'    => '',
-			'track_outbound'             => 1,
-			'allow_tracking'             => 0,
-			'tracking_mode'              => 'analytics',
-			'events_mode'                => 'js',
-			'demographics'               => 1,
-			'ignore_users'               => array( 'administrator', 'editor' ),
-			'dashboards_disabled'        => 0,
-			'anonymize_ips'              => 0,
-			'track_download_as'          => 'event',
-			'extensions_of_files'        => 'doc,exe,js,pdf,ppt,tgz,zip,xls',
-			'subdomain_tracking'         => '',
-			'tag_links_in_rss'           => 0,
-			'allow_anchor'               => 0,
-			'add_allow_linker'           => 0,
-			'enhanced_link_attribution'  => 1,
-			'custom_code'                => '',
-			'debug_mode'                 => 0,
-			'anonymous_data'             => 0,
-			'save_settings'              => array(),
-			'view_reports'               => array(),
-		);
-	}
-
-	/**
-	 * MonsterInsights Version 6.0.2 upgrades.
-	 *
-	 * This detects if a manual auth code is in the Yoast settings, and not
-	 * in the MI settings, and that oAuth hasn't been performed (caused by the
-	 * manual ua code not being transferred during the 6.0 upgrade routine)
-	 * and automatically fixes it.
-	 *
-	 * @since 6.0.2
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function v602_upgrades() {
-		$options = get_option( 'yst_ga', array() );
-		if ( ( empty( $this->new_settings[ 'manual_ua_code'] ) || $this->new_settings[ 'manual_ua_code']  === '1' )  &&  
-			 empty( $this->new_settings[ 'analytics_profile_code'] ) &&
-			 ! empty( $options ) &&
-			 is_array( $options ) &&
-			 ! empty( $options['ga_general']['manual_ua_code_field'] )
-		) {
-			$this->new_settings['manual_ua_code'] = $options['ga_general']['manual_ua_code_field'];
-		}
-	}
-
-	/**
-	 * MonsterInsights Version 6.0.11 upgrades.
-	 *
-	 * This upgrade routine finds and removes the old crons if they exist.
-	 *
-	 * @since 6.0.11
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function v6011_upgrades() {
-		// If old tracking checkin exists, remove it
-		if ( wp_next_scheduled( 'monsterinsights_send_tracking_checkin' ) ) {
-			wp_clear_scheduled_hook( 'monsterinsights_send_tracking_checkin' );
-		}
-
-		// Remove Weekly cron
-		if ( wp_next_scheduled( 'monsterinsights_weekly_cron' ) ) {
-			wp_clear_scheduled_hook( 'monsterinsights_weekly_cron' );
-		}
-
-		// Remove Yoast cron
-		if ( wp_next_scheduled( 'yst_ga_aggregate_data' ) ) {
-			wp_clear_scheduled_hook( 'yst_ga_aggregate_data' );
-		}
-	}
-
-	/**
-	 * MonsterInsights Version 6.2.0 upgrades.
-	 *
-	 * Turns off debug mode if its on.
-	 *
-	 * @since 6.2.0
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function v620_upgrades() {
-		// Turns off debug mode if its on.
-		if ( empty( $this->new_settings['debug_mode' ] ) ) {
-			$this->new_settings['debug_mode' ] = 0;
-		}
-	}
-
-	/**
-	 * MonsterInsights Version 6.3 upgrades.
-	 *
-	 * This function does the
-	 * upgrade routine from MonsterInsights 6.2->6.3.
-	 *
-	 * @since 6.3.0
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function v630_upgrades() {
-		// Not in use yet.
+        // Finish up
+            // Save the new settings
+            $this->new_settings = $options;
+    }
+
+    public function get_yoast_default_values() {
+        $options = array(
+            'ga_general' => array(
+                'analytics_profile'          => null,
+                'analytics_profile_code'     => null,
+                'manual_ua_code'             => 0,
+                'manual_ua_code_field'       => null,
+                'track_internal_as_outbound' => null,
+                'track_internal_as_label'    => null,
+                'track_outbound'             => 0,
+                'anonymous_data'             => 0,
+                'enable_universal'           => 1,
+                'demographics'               => 0,
+                'ignore_users'               => array( 'administrator', 'editor' ),
+                'dashboards_disabled'        => 0,
+                'anonymize_ips'              => 0,
+                'track_download_as'          => 'event',
+                'extensions_of_files'        => 'doc,exe,js,pdf,ppt,tgz,zip,xls',
+                'track_full_url'             => 'domain',
+                'subdomain_tracking'         => null,
+                'tag_links_in_rss'           => 0,
+                'allow_anchor'               => 0,
+                'add_allow_linker'           => 0,
+                'enhanced_link_attribution'  => 0,
+                'custom_code'                => null,
+                'debug_mode'                 => 0,
+            )
+        );
+        $options = apply_filters( 'yst_ga_default-ga-values', $options, 'ga_general' );
+        return $options;
+    }
+
+    public function get_monsterinsights_default_values() {
+        return array(
+            'analytics_profile'          => '',
+            'analytics_profile_code'     => '',
+            'manual_ua_code'             => '',
+            'track_internal_as_outbound' => 0,
+            'track_internal_as_label'    => '',
+            'track_outbound'             => 1,
+            'allow_tracking'             => 0,
+            'tracking_mode'              => 'analytics',
+            'events_mode'                => 'js',
+            'demographics'               => 1,
+            'ignore_users'               => array( 'administrator', 'editor' ),
+            'dashboards_disabled'        => 0,
+            'anonymize_ips'              => 0,
+            'track_download_as'          => 'event',
+            'extensions_of_files'        => 'doc,exe,js,pdf,ppt,tgz,zip,xls',
+            'subdomain_tracking'         => '',
+            'tag_links_in_rss'           => 0,
+            'allow_anchor'               => 0,
+            'add_allow_linker'           => 0,
+            'enhanced_link_attribution'  => 1,
+            'custom_code'                => '',
+            'debug_mode'                 => 0,
+            'anonymous_data'             => 0,
+            'save_settings'              => array(),
+            'view_reports'               => array(),
+        );
+    }
+
+    /**
+     * MonsterInsights Version 6.0.2 upgrades.
+     *
+     * This detects if a manual auth code is in the Yoast settings, and not
+     * in the MI settings, and that oAuth hasn't been performed (caused by the
+     * manual ua code not being transferred during the 6.0 upgrade routine)
+     * and automatically fixes it.
+     *
+     * @since 6.0.2
+     * @access public
+     * 
+     * @return void
+     */
+    public function v602_upgrades() {
+        $options = get_option( 'yst_ga', array() );
+        if ( ( empty( $this->new_settings[ 'manual_ua_code'] ) || $this->new_settings[ 'manual_ua_code']  === '1' )  &&  
+             empty( $this->new_settings[ 'analytics_profile_code'] ) &&
+             ! empty( $options ) &&
+             is_array( $options ) &&
+             ! empty( $options['ga_general']['manual_ua_code_field'] )
+        ) {
+            $this->new_settings['manual_ua_code'] = $options['ga_general']['manual_ua_code_field'];
+        }
+    }
+
+    /**
+     * MonsterInsights Version 6.0.11 upgrades.
+     *
+     * This upgrade routine finds and removes the old crons if they exist.
+     *
+     * @since 6.0.11
+     * @access public
+     * 
+     * @return void
+     */
+    public function v6011_upgrades() {
+        // If old tracking checkin exists, remove it
+        if ( wp_next_scheduled( 'monsterinsights_send_tracking_checkin' ) ) {
+            wp_clear_scheduled_hook( 'monsterinsights_send_tracking_checkin' );
+        }
+
+        // Remove Weekly cron
+        if ( wp_next_scheduled( 'monsterinsights_weekly_cron' ) ) {
+            wp_clear_scheduled_hook( 'monsterinsights_weekly_cron' );
+        }
+
+        // Remove Yoast cron
+        if ( wp_next_scheduled( 'yst_ga_aggregate_data' ) ) {
+            wp_clear_scheduled_hook( 'yst_ga_aggregate_data' );
+        }
+    }
+
+    /**
+     * MonsterInsights Version 6.2.0 upgrades.
+     *
+     * Turns off debug mode if its on.
+     *
+     * @since 6.2.0
+     * @access public
+     * 
+     * @return void
+     */
+    public function v620_upgrades() {
+        // Turns off debug mode if its on.
+        if ( empty( $this->new_settings['debug_mode' ] ) ) {
+            $this->new_settings['debug_mode' ] = 0;
+        }
+    }
+
+    /**
+     * MonsterInsights Version 6.3 upgrades.
+     *
+     * This function does the
+     * upgrade routine from MonsterInsights 6.2->6.3.
+     *
+     * @since 6.3.0
+     * @access public
+     * 
+     * @return void
+     */
+    public function v630_upgrades() {
+        // Not in use yet.
 		
-		/**
-		 * Running List of Things To Do In 6.1.0's Upgrade Routine
-		 *
-		 * 1. Drop Yoast yst_ga options if the upgraded from option === 6.0 or higher
-		 * 2. Remove yst_ga support from helper options
-		 * 3. Remove track_full_url
-		 */
-	}
+        /**
+         * Running List of Things To Do In 6.1.0's Upgrade Routine
+         *
+         * 1. Drop Yoast yst_ga options if the upgraded from option === 6.0 or higher
+         * 2. Remove yst_ga support from helper options
+         * 3. Remove track_full_url
+         */
+    }
 }

includes/options.php

Spacing +85 added lines, -85 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,11 +24,11 @@ 
 	//if ( $is_network && $use_network_settings ) {
 	//    return $settings;
 	//} else if ( $is_network ) {
-		$settings = get_option( $option_name );
+		$settings = get_option($option_name);
 	//} else {
 	//    return $settings;
 	//}
-	if ( empty( $settings ) || ! is_array( $settings ) ) {
+	if (empty($settings) || ! is_array($settings)) {
 		$settings = array();
 	}
 	return $settings;
@@ -45,11 +45,11 @@ 
  * @param mixed $default   The default value of the setting key to retrieve.
  * @return string       The value of the setting.
  */
-function monsterinsights_get_option( $key = '', $default = false ) {
+function monsterinsights_get_option($key = '', $default = false) {
 	global $monsterinsights_settings;
-	$value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
-	$value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
-	return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
+	$value = ! empty($monsterinsights_settings[$key]) ? $monsterinsights_settings[$key] : $default;
+	$value = apply_filters('monsterinsights_get_option', $value, $key, $default);
+	return apply_filters('monsterinsights_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -62,38 +62,38 @@ 
  */
 function monsterinsights_get_ua() {
 	$ua = '';
-	if ( is_multisite() ) {
-		if ( defined( 'MONSTERINSIGHTS_MS_GA_UA' ) && monsterinsights_is_valid_ua( MONSTERINSIGHTS_MS_GA_UA ) ) {
+	if (is_multisite()) {
+		if (defined('MONSTERINSIGHTS_MS_GA_UA') && monsterinsights_is_valid_ua(MONSTERINSIGHTS_MS_GA_UA)) {
 			$ua = MONSTERINSIGHTS_MS_GA_UA;
 		}
 	}
 
-	if ( is_multisite() ) {
-		$ua_code = monsterinsights_is_valid_ua( get_site_option( 'monsterinsights_network_manual_ua_code', '' ) );
-		if ( $ua_code ) {
+	if (is_multisite()) {
+		$ua_code = monsterinsights_is_valid_ua(get_site_option('monsterinsights_network_manual_ua_code', ''));
+		if ($ua_code) {
 			$ua = $ua_code;
 		}
 	}
 
-	if ( defined( 'MONSTERINSIGHTS_GA_UA' ) && monsterinsights_is_valid_ua( MONSTERINSIGHTS_GA_UA ) ) {
+	if (defined('MONSTERINSIGHTS_GA_UA') && monsterinsights_is_valid_ua(MONSTERINSIGHTS_GA_UA)) {
 		$ua = MONSTERINSIGHTS_GA_UA;
 	}
 
-	$ua_code = monsterinsights_is_valid_ua( monsterinsights_get_option( 'analytics_profile_code', '' ) );
+	$ua_code = monsterinsights_is_valid_ua(monsterinsights_get_option('analytics_profile_code', ''));
 
-	if ( $ua_code ) {
+	if ($ua_code) {
 		$ua = $ua_code;
 	}
 
-	$manual_ua_code = monsterinsights_is_valid_ua( monsterinsights_get_option( 'manual_ua_code', '' ) );
+	$manual_ua_code = monsterinsights_is_valid_ua(monsterinsights_get_option('manual_ua_code', ''));
 
-	if ( $manual_ua_code ) {
+	if ($manual_ua_code) {
 		$ua = $manual_ua_code;
 	}
 
-	$ua = apply_filters( 'monsterinsights_get_ua', $ua );
+	$ua = apply_filters('monsterinsights_get_ua', $ua);
 
-	return monsterinsights_is_valid_ua( $ua );
+	return monsterinsights_is_valid_ua($ua);
 }
 
 /**
@@ -105,10 +105,10 @@ 
  * @param array $args Allow calling functions to give args to use in future applications.
  * @return string The UA to use on frontend.
  */
-function monsterinsights_get_ua_to_output( $args = array() ) {
+function monsterinsights_get_ua_to_output($args = array()) {
 	$ua = monsterinsights_get_ua();
-	$ua = apply_filters( 'monsterinsights_get_ua_to_output', $ua, $args );
-	return monsterinsights_is_valid_ua( $ua );
+	$ua = apply_filters('monsterinsights_get_ua_to_output', $ua, $args);
+	return monsterinsights_is_valid_ua($ua);
 }
 
 /**
@@ -121,15 +121,15 @@ 
  * @param string $value The value to set for the key.
  * @return boolean True if updated, false if not.
  */
-function monsterinsights_update_option( $key = '', $value = false ) {
+function monsterinsights_update_option($key = '', $value = false) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if (empty($key)) {
 		return false;
 	}
 
-	if ( empty( $value ) ) {
-		$remove_option = monsterinsights_delete_option( $key );
+	if (empty($value)) {
+		$remove_option = monsterinsights_delete_option($key);
 		return $remove_option;
 	}
 
@@ -143,30 +143,30 @@ 
 	//$is_network            = is_multisite();
 	//$update_network_option = true;
 	//if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
-	   $settings = get_option( $option_name );
+	   $settings = get_option($option_name);
 	//   $update_network_option = false;
 	//}
 
-	if ( ! is_array( $settings ) ) {
+	if ( ! is_array($settings)) {
 		$settings = array();
 	}
 
 	// Let's let devs alter that value coming in
-	$value = apply_filters( 'monsterinsights_update_option', $value, $key );
+	$value = apply_filters('monsterinsights_update_option', $value, $key);
 
 	// Next let's try to update the value
-	$settings[ $key ] = $value;
+	$settings[$key] = $value;
 	$did_update = false;
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( $option_name, $settings );
 	//} else {
-		$did_update = update_option( $option_name, $settings );
+		$did_update = update_option($option_name, $settings);
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ($did_update) {
 		global $monsterinsights_settings;
-		$monsterinsights_settings[ $key ] = $value;
+		$monsterinsights_settings[$key] = $value;
 	}
 
 	return $did_update;
@@ -181,9 +181,9 @@ 
  * @param string $key   The setting key.
  * @return boolean True if removed, false if not.
  */
-function monsterinsights_delete_option( $key = '' ) {
+function monsterinsights_delete_option($key = '') {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if (empty($key)) {
 		return false;
 	}
 
@@ -197,24 +197,24 @@ 
 	//$is_network            = is_multisite();
 	//$update_network_option = true;
 	//if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
-	   $settings = get_option( $option_name );
+	   $settings = get_option($option_name);
 	//   $update_network_option = false;
 	//}
 
 	// Next let's try to remove the key
-	if( isset( $settings[ $key ] ) ) {
-		unset( $settings[ $key ] );
+	if (isset($settings[$key])) {
+		unset($settings[$key]);
 	}
 
 	$did_update = false;
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( 'monsterinsights_settings', $settings );
 	//} else {
-		$did_update = update_option( $option_name, $settings );
+		$did_update = update_option($option_name, $settings);
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ($did_update) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -231,9 +231,9 @@ 
  * @param string $key   The setting key.
  * @return boolean True if removed, false if not.
  */
-function monsterinsights_delete_options( $keys = array() ) {
+function monsterinsights_delete_options($keys = array()) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if (empty($keys) || ! is_array($keys)) {
 		return false;
 	}
 
@@ -247,14 +247,14 @@ 
 	//$is_network            = is_multisite();
 	//$update_network_option = true;
 	//if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
-	   $settings = get_option( $option_name );
+	   $settings = get_option($option_name);
 	//   $update_network_option = false;
 	//}
 
 	// Next let's try to remove the keys
-	foreach ( $keys as $key ) {
-		if( isset( $settings[ $key ] ) ) {
-			unset( $settings[ $key ] );
+	foreach ($keys as $key) {
+		if (isset($settings[$key])) {
+			unset($settings[$key]);
 		}
 	}
 
@@ -262,11 +262,11 @@ 
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( 'monsterinsights_settings', $settings );
 	//} else {
-		$did_update = update_option( $option_name, $settings );
+		$did_update = update_option($option_name, $settings);
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ($did_update) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -286,26 +286,26 @@ 
  */
 function monsterinsights_get_license() {
 	$license = false;
-	if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
-		$license = array( 'key' => MONSTERINSIGHTS_LICENSE_KEY );
-	} else if ( is_multisite() && monsterinsights_is_network_active() ){
-		$network_license = get_site_option( 'monsterinsights_license' );
-		if ( ! empty( $network_license['key'] ) && is_string( $network_license['key'] ) && strlen( $network_license['key'] ) > 10 ) {
+	if (defined('MONSTERINSIGHTS_LICENSE_KEY') && is_string(MONSTERINSIGHTS_LICENSE_KEY) && strlen(MONSTERINSIGHTS_LICENSE_KEY) > 10) {
+		$license = array('key' => MONSTERINSIGHTS_LICENSE_KEY);
+	} else if (is_multisite() && monsterinsights_is_network_active()) {
+		$network_license = get_site_option('monsterinsights_license');
+		if ( ! empty($network_license['key']) && is_string($network_license['key']) && strlen($network_license['key']) > 10) {
 			$license = $network_license;
 		} else {
-			$site_license = get_option( 'monsterinsights_license' );
-			if ( ! empty( $site_license['key'] ) && is_string( $site_license['key'] ) && strlen( $site_license['key'] ) > 10 ) {
+			$site_license = get_option('monsterinsights_license');
+			if ( ! empty($site_license['key']) && is_string($site_license['key']) && strlen($site_license['key']) > 10) {
 				$license = $site_license;
 			}
 		}
 	} else {
-		$site_license = get_option( 'monsterinsights_license' );
-		if ( ! empty( $site_license['key'] ) && is_string( $site_license['key'] ) && strlen( $site_license['key'] ) > 10 ) {
+		$site_license = get_option('monsterinsights_license');
+		if ( ! empty($site_license['key']) && is_string($site_license['key']) && strlen($site_license['key']) > 10) {
 			$license = $site_license;
 		}
 	}
 
-	return apply_filters( 'monsterinsights_license', $license );
+	return apply_filters('monsterinsights_license', $license);
 }
 
 /**
@@ -320,18 +320,18 @@ 
  */
 function monsterinsights_get_license_key() {
 	$license = false;
-	if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
+	if (defined('MONSTERINSIGHTS_LICENSE_KEY') && is_string(MONSTERINSIGHTS_LICENSE_KEY) && strlen(MONSTERINSIGHTS_LICENSE_KEY) > 10) {
 		$license = MONSTERINSIGHTS_LICENSE_KEY;
 	} else {
 		$license = monsterinsights_get_license();
-		if ( ! empty( $license['key'] ) && is_string( $license['key'] ) && strlen( $license['key'] ) > 10 ) {
+		if ( ! empty($license['key']) && is_string($license['key']) && strlen($license['key']) > 10) {
 			$license = $license['key'];
 		} else {
 			$license = false;
 		}
 	}
 
-	return apply_filters( 'monsterinsights_license_key', $license );
+	return apply_filters('monsterinsights_license_key', $license);
 }
 
 /**
@@ -344,16 +344,16 @@ 
  * @param string $value The value to set for the key.
  * @return boolean True if updated, false if not.
  */
-function monsterinsights_update_license_key( $license_key = false, $network = false, $override = false ) {
-	if ( ! $license_key || ! is_string( $license_key ) || ! strlen( $license_key ) > 10  ) {
+function monsterinsights_update_license_key($license_key = false, $network = false, $override = false) {
+	if ( ! $license_key || ! is_string($license_key) || ! strlen($license_key) > 10) {
 		return false;
 	}
 
-	if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
-		update_site_option( 'monsterinsights_license', $license_key );
+	if ($network && is_multisite() && (is_network_admin() || $override)) {
+		update_site_option('monsterinsights_license', $license_key);
 		return true;
 	} else {
-		update_option( 'monsterinsights_license', $license_key );
+		update_option('monsterinsights_license', $license_key);
 		return true;
 	}
 }
@@ -367,12 +367,12 @@ 
  * @param string $key   The setting key.
  * @return boolean True if removed, false if not.
  */
-function monsterinsights_delete_license_key( $network = false, $override = false ) {
-	if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
-		delete_site_option( 'monsterinsights_license' );
+function monsterinsights_delete_license_key($network = false, $override = false) {
+	if ($network && is_multisite() && (is_network_admin() || $override)) {
+		delete_site_option('monsterinsights_license');
 		return true;
 	} else {
-		delete_option( 'monsterinsights_license' );
+		delete_option('monsterinsights_license');
 		return true;
 	}
 }
@@ -389,8 +389,8 @@ 
 function monsterinsights_get_license_key_type() {
 	$type = false;
 	$license = monsterinsights_get_license();
-	if ( ! empty( $license['type'] ) && is_string( $license['type'] ) ) {
-		if ( in_array( $license['type'], array( 'master', 'pro', 'plus', 'basic' ) ) ) {
+	if ( ! empty($license['type']) && is_string($license['type'])) {
+		if (in_array($license['type'], array('master', 'pro', 'plus', 'basic'))) {
 			$type = $license['type'];
 		}
 	}
@@ -408,10 +408,10 @@ 
 function monsterinsights_get_license_key_errors() {
 	$errors = false;
 	$license = monsterinsights_get_license();
-	if ( ! empty( $license['type'] ) && is_string( $license['type'] ) && strlen( $license['type'] ) > 3 ) {
-		if ( ( isset( $license['is_expired'] )  && $license['is_expired'] ) 
-		  || ( isset( $license['is_disabled'] ) && $license['is_disabled'] )
-		  || ( isset( $license['is_invalid'] )  && $license['is_invalid'] ) ) {
+	if ( ! empty($license['type']) && is_string($license['type']) && strlen($license['type']) > 3) {
+		if ((isset($license['is_expired']) && $license['is_expired']) 
+		  || (isset($license['is_disabled']) && $license['is_disabled'])
+		  || (isset($license['is_invalid']) && $license['is_invalid'])) {
 			$errors = true;
 		}
 	}
@@ -428,18 +428,18 @@ 
  *
  * @return string|false Return cleaned ua string if valid, else returns false.
  */
-function monsterinsights_is_valid_ua( $ua_code = '' ) {
+function monsterinsights_is_valid_ua($ua_code = '') {
 	$ua_code = (string) $ua_code; // Rare case, but let's make sure it never happens.
-	$ua_code = trim( $ua_code );
+	$ua_code = trim($ua_code);
 
-	if ( empty( $ua_code ) ) {
+	if (empty($ua_code)) {
 		return '';
 	}
 	
 	// Replace all type of dashes (n-dash, m-dash, minus) with normal dashes.
-	$ua_code = str_replace( array( '–', '—', '−' ), '-', $ua_code );
+	$ua_code = str_replace(array('–', '—', '−'), '-', $ua_code);
 	
-	if ( preg_match( "/^(UA|YT|MO)-\d{4,}-\d+$/", strval( $ua_code ) ) ) {
+	if (preg_match("/^(UA|YT|MO)-\d{4,}-\d+$/", strval($ua_code))) {
 		return $ua_code;
 	} else {
 		return '';
@@ -465,10 +465,10 @@ 
 				'monsterinsights_oauth_status',
 	);
 
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			unset( $settings[ $e ] );
+	foreach ($exclude as $e) {
+		if ( ! empty($settings[$e])) {
+			unset($settings[$e]);
 		}
 	}
-	return wp_json_encode( $settings );
+	return wp_json_encode($settings);
 }
\ No newline at end of file

Indentation +305 added lines, -305 removed lines

@@ -11,27 +11,27 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 function monsterinsights_get_options() {
-	$settings = array();
-	$option_name = monsterinsights_get_option_name();
-	//$settings             = get_site_option( $option_name );
-	//$use_network_settings = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
-	//$is_network           = is_multisite();
-
-	//if ( $is_network && $use_network_settings ) {
-	//    return $settings;
-	//} else if ( $is_network ) {
-		$settings = get_option( $option_name );
-	//} else {
-	//    return $settings;
-	//}
-	if ( empty( $settings ) || ! is_array( $settings ) ) {
-		$settings = array();
-	}
-	return $settings;
+    $settings = array();
+    $option_name = monsterinsights_get_option_name();
+    //$settings             = get_site_option( $option_name );
+    //$use_network_settings = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
+    //$is_network           = is_multisite();
+
+    //if ( $is_network && $use_network_settings ) {
+    //    return $settings;
+    //} else if ( $is_network ) {
+        $settings = get_option( $option_name );
+    //} else {
+    //    return $settings;
+    //}
+    if ( empty( $settings ) || ! is_array( $settings ) ) {
+        $settings = array();
+    }
+    return $settings;
 }
 
 /**
@@ -46,10 +46,10 @@ 
  * @return string       The value of the setting.
  */
 function monsterinsights_get_option( $key = '', $default = false ) {
-	global $monsterinsights_settings;
-	$value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
-	$value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
-	return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
+    global $monsterinsights_settings;
+    $value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
+    $value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
+    return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
 }
 
 /**
@@ -61,39 +61,39 @@ 
  * @return string The UA to use.
  */
 function monsterinsights_get_ua() {
-	$ua = '';
-	if ( is_multisite() ) {
-		if ( defined( 'MONSTERINSIGHTS_MS_GA_UA' ) && monsterinsights_is_valid_ua( MONSTERINSIGHTS_MS_GA_UA ) ) {
-			$ua = MONSTERINSIGHTS_MS_GA_UA;
-		}
-	}
+    $ua = '';
+    if ( is_multisite() ) {
+        if ( defined( 'MONSTERINSIGHTS_MS_GA_UA' ) && monsterinsights_is_valid_ua( MONSTERINSIGHTS_MS_GA_UA ) ) {
+            $ua = MONSTERINSIGHTS_MS_GA_UA;
+        }
+    }
 
-	if ( is_multisite() ) {
-		$ua_code = monsterinsights_is_valid_ua( get_site_option( 'monsterinsights_network_manual_ua_code', '' ) );
-		if ( $ua_code ) {
-			$ua = $ua_code;
-		}
-	}
+    if ( is_multisite() ) {
+        $ua_code = monsterinsights_is_valid_ua( get_site_option( 'monsterinsights_network_manual_ua_code', '' ) );
+        if ( $ua_code ) {
+            $ua = $ua_code;
+        }
+    }
 
-	if ( defined( 'MONSTERINSIGHTS_GA_UA' ) && monsterinsights_is_valid_ua( MONSTERINSIGHTS_GA_UA ) ) {
-		$ua = MONSTERINSIGHTS_GA_UA;
-	}
+    if ( defined( 'MONSTERINSIGHTS_GA_UA' ) && monsterinsights_is_valid_ua( MONSTERINSIGHTS_GA_UA ) ) {
+        $ua = MONSTERINSIGHTS_GA_UA;
+    }
 
-	$ua_code = monsterinsights_is_valid_ua( monsterinsights_get_option( 'analytics_profile_code', '' ) );
+    $ua_code = monsterinsights_is_valid_ua( monsterinsights_get_option( 'analytics_profile_code', '' ) );
 
-	if ( $ua_code ) {
-		$ua = $ua_code;
-	}
+    if ( $ua_code ) {
+        $ua = $ua_code;
+    }
 
-	$manual_ua_code = monsterinsights_is_valid_ua( monsterinsights_get_option( 'manual_ua_code', '' ) );
+    $manual_ua_code = monsterinsights_is_valid_ua( monsterinsights_get_option( 'manual_ua_code', '' ) );
 
-	if ( $manual_ua_code ) {
-		$ua = $manual_ua_code;
-	}
+    if ( $manual_ua_code ) {
+        $ua = $manual_ua_code;
+    }
 
-	$ua = apply_filters( 'monsterinsights_get_ua', $ua );
+    $ua = apply_filters( 'monsterinsights_get_ua', $ua );
 
-	return monsterinsights_is_valid_ua( $ua );
+    return monsterinsights_is_valid_ua( $ua );
 }
 
 /**
@@ -106,9 +106,9 @@ 
  * @return string The UA to use on frontend.
  */
 function monsterinsights_get_ua_to_output( $args = array() ) {
-	$ua = monsterinsights_get_ua();
-	$ua = apply_filters( 'monsterinsights_get_ua_to_output', $ua, $args );
-	return monsterinsights_is_valid_ua( $ua );
+    $ua = monsterinsights_get_ua();
+    $ua = apply_filters( 'monsterinsights_get_ua_to_output', $ua, $args );
+    return monsterinsights_is_valid_ua( $ua );
 }
 
 /**
@@ -123,155 +123,155 @@ 
  */
 function monsterinsights_update_option( $key = '', $value = false ) {
 
-	// If no key, exit
-	if ( empty( $key ) ){
-		return false;
-	}
-
-	if ( empty( $value ) ) {
-		$remove_option = monsterinsights_delete_option( $key );
-		return $remove_option;
-	}
-
-	$option_name = monsterinsights_get_option_name();
-
-	// First let's grab the current settings
-
-	// if on network panel or if on single site using network settings
-	//$settings              = get_site_option( $option_name );
-	//$use_network_settings  = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
-	//$is_network            = is_multisite();
-	//$update_network_option = true;
-	//if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
-	   $settings = get_option( $option_name );
-	//   $update_network_option = false;
-	//}
-
-	if ( ! is_array( $settings ) ) {
-		$settings = array();
-	}
-
-	// Let's let devs alter that value coming in
-	$value = apply_filters( 'monsterinsights_update_option', $value, $key );
-
-	// Next let's try to update the value
-	$settings[ $key ] = $value;
-	$did_update = false;
-	//if ( $update_network_option ) {
-	//    $did_update = update_site_option( $option_name, $settings );
-	//} else {
-		$did_update = update_option( $option_name, $settings );
-	//}
-
-	// If it updated, let's update the global variable
-	if ( $did_update ){
-		global $monsterinsights_settings;
-		$monsterinsights_settings[ $key ] = $value;
-	}
-
-	return $did_update;
+    // If no key, exit
+    if ( empty( $key ) ){
+        return false;
+    }
+
+    if ( empty( $value ) ) {
+        $remove_option = monsterinsights_delete_option( $key );
+        return $remove_option;
+    }
+
+    $option_name = monsterinsights_get_option_name();
+
+    // First let's grab the current settings
+
+    // if on network panel or if on single site using network settings
+    //$settings              = get_site_option( $option_name );
+    //$use_network_settings  = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
+    //$is_network            = is_multisite();
+    //$update_network_option = true;
+    //if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
+        $settings = get_option( $option_name );
+    //   $update_network_option = false;
+    //}
+
+    if ( ! is_array( $settings ) ) {
+        $settings = array();
+    }
+
+    // Let's let devs alter that value coming in
+    $value = apply_filters( 'monsterinsights_update_option', $value, $key );
+
+    // Next let's try to update the value
+    $settings[ $key ] = $value;
+    $did_update = false;
+    //if ( $update_network_option ) {
+    //    $did_update = update_site_option( $option_name, $settings );
+    //} else {
+        $did_update = update_option( $option_name, $settings );
+    //}
+
+    // If it updated, let's update the global variable
+    if ( $did_update ){
+        global $monsterinsights_settings;
+        $monsterinsights_settings[ $key ] = $value;
+    }
+
+    return $did_update;
 }
 
- /**
- * Helper method for deleting a setting's value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+    /**
+     * Helper method for deleting a setting's value.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @param string $key   The setting key.
+     * @return boolean True if removed, false if not.
+     */
 function monsterinsights_delete_option( $key = '' ) {
-	// If no key, exit
-	if ( empty( $key ) ){
-		return false;
-	}
-
-	$option_name = monsterinsights_get_option_name();
-
-	// First let's grab the current settings
-
-	// if on network panel or if on single site using network settings
-	//$settings              = get_site_option( $option_name );
-	//$use_network_settings  = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
-	//$is_network            = is_multisite();
-	//$update_network_option = true;
-	//if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
-	   $settings = get_option( $option_name );
-	//   $update_network_option = false;
-	//}
-
-	// Next let's try to remove the key
-	if( isset( $settings[ $key ] ) ) {
-		unset( $settings[ $key ] );
-	}
-
-	$did_update = false;
-	//if ( $update_network_option ) {
-	//    $did_update = update_site_option( 'monsterinsights_settings', $settings );
-	//} else {
-		$did_update = update_option( $option_name, $settings );
-	//}
-
-	// If it updated, let's update the global variable
-	if ( $did_update ){
-		global $monsterinsights_settings;
-		$monsterinsights_settings = $settings;
-	}
-
-	return $did_update;
+    // If no key, exit
+    if ( empty( $key ) ){
+        return false;
+    }
+
+    $option_name = monsterinsights_get_option_name();
+
+    // First let's grab the current settings
+
+    // if on network panel or if on single site using network settings
+    //$settings              = get_site_option( $option_name );
+    //$use_network_settings  = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
+    //$is_network            = is_multisite();
+    //$update_network_option = true;
+    //if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
+        $settings = get_option( $option_name );
+    //   $update_network_option = false;
+    //}
+
+    // Next let's try to remove the key
+    if( isset( $settings[ $key ] ) ) {
+        unset( $settings[ $key ] );
+    }
+
+    $did_update = false;
+    //if ( $update_network_option ) {
+    //    $did_update = update_site_option( 'monsterinsights_settings', $settings );
+    //} else {
+        $did_update = update_option( $option_name, $settings );
+    //}
+
+    // If it updated, let's update the global variable
+    if ( $did_update ){
+        global $monsterinsights_settings;
+        $monsterinsights_settings = $settings;
+    }
+
+    return $did_update;
 }
 
- /**
- * Helper method for deleting multiple settings value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+    /**
+     * Helper method for deleting multiple settings value.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @param string $key   The setting key.
+     * @return boolean True if removed, false if not.
+     */
 function monsterinsights_delete_options( $keys = array() ) {
-	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
-		return false;
-	}
-
-	$option_name = monsterinsights_get_option_name();
-
-	// First let's grab the current settings
-
-	// if on network panel or if on single site using network settings
-	//$settings              = get_site_option( $option_name );
-	//$use_network_settings  = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
-	//$is_network            = is_multisite();
-	//$update_network_option = true;
-	//if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
-	   $settings = get_option( $option_name );
-	//   $update_network_option = false;
-	//}
-
-	// Next let's try to remove the keys
-	foreach ( $keys as $key ) {
-		if( isset( $settings[ $key ] ) ) {
-			unset( $settings[ $key ] );
-		}
-	}
-
-	$did_update = false;
-	//if ( $update_network_option ) {
-	//    $did_update = update_site_option( 'monsterinsights_settings', $settings );
-	//} else {
-		$did_update = update_option( $option_name, $settings );
-	//}
-
-	// If it updated, let's update the global variable
-	if ( $did_update ){
-		global $monsterinsights_settings;
-		$monsterinsights_settings = $settings;
-	}
-
-	return $did_update;
+    // If no keys, exit
+    if ( empty( $keys ) || ! is_array( $keys ) ){
+        return false;
+    }
+
+    $option_name = monsterinsights_get_option_name();
+
+    // First let's grab the current settings
+
+    // if on network panel or if on single site using network settings
+    //$settings              = get_site_option( $option_name );
+    //$use_network_settings  = ! empty( $use_network_settings['use_network_settings'] ) ? true : false;
+    //$is_network            = is_multisite();
+    //$update_network_option = true;
+    //if ( ! is_network_admin() && ! ( $is_network && $use_network_settings ) ) {
+        $settings = get_option( $option_name );
+    //   $update_network_option = false;
+    //}
+
+    // Next let's try to remove the keys
+    foreach ( $keys as $key ) {
+        if( isset( $settings[ $key ] ) ) {
+            unset( $settings[ $key ] );
+        }
+    }
+
+    $did_update = false;
+    //if ( $update_network_option ) {
+    //    $did_update = update_site_option( 'monsterinsights_settings', $settings );
+    //} else {
+        $did_update = update_option( $option_name, $settings );
+    //}
+
+    // If it updated, let's update the global variable
+    if ( $did_update ){
+        global $monsterinsights_settings;
+        $monsterinsights_settings = $settings;
+    }
+
+    return $did_update;
 }
 
 /**
@@ -285,27 +285,27 @@ 
  * @return string       The value of the setting.
  */
 function monsterinsights_get_license() {
-	$license = false;
-	if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
-		$license = array( 'key' => MONSTERINSIGHTS_LICENSE_KEY );
-	} else if ( is_multisite() && monsterinsights_is_network_active() ){
-		$network_license = get_site_option( 'monsterinsights_license' );
-		if ( ! empty( $network_license['key'] ) && is_string( $network_license['key'] ) && strlen( $network_license['key'] ) > 10 ) {
-			$license = $network_license;
-		} else {
-			$site_license = get_option( 'monsterinsights_license' );
-			if ( ! empty( $site_license['key'] ) && is_string( $site_license['key'] ) && strlen( $site_license['key'] ) > 10 ) {
-				$license = $site_license;
-			}
-		}
-	} else {
-		$site_license = get_option( 'monsterinsights_license' );
-		if ( ! empty( $site_license['key'] ) && is_string( $site_license['key'] ) && strlen( $site_license['key'] ) > 10 ) {
-			$license = $site_license;
-		}
-	}
-
-	return apply_filters( 'monsterinsights_license', $license );
+    $license = false;
+    if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
+        $license = array( 'key' => MONSTERINSIGHTS_LICENSE_KEY );
+    } else if ( is_multisite() && monsterinsights_is_network_active() ){
+        $network_license = get_site_option( 'monsterinsights_license' );
+        if ( ! empty( $network_license['key'] ) && is_string( $network_license['key'] ) && strlen( $network_license['key'] ) > 10 ) {
+            $license = $network_license;
+        } else {
+            $site_license = get_option( 'monsterinsights_license' );
+            if ( ! empty( $site_license['key'] ) && is_string( $site_license['key'] ) && strlen( $site_license['key'] ) > 10 ) {
+                $license = $site_license;
+            }
+        }
+    } else {
+        $site_license = get_option( 'monsterinsights_license' );
+        if ( ! empty( $site_license['key'] ) && is_string( $site_license['key'] ) && strlen( $site_license['key'] ) > 10 ) {
+            $license = $site_license;
+        }
+    }
+
+    return apply_filters( 'monsterinsights_license', $license );
 }
 
 /**
@@ -319,19 +319,19 @@ 
  * @return string       The value of the setting.
  */
 function monsterinsights_get_license_key() {
-	$license = false;
-	if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
-		$license = MONSTERINSIGHTS_LICENSE_KEY;
-	} else {
-		$license = monsterinsights_get_license();
-		if ( ! empty( $license['key'] ) && is_string( $license['key'] ) && strlen( $license['key'] ) > 10 ) {
-			$license = $license['key'];
-		} else {
-			$license = false;
-		}
-	}
-
-	return apply_filters( 'monsterinsights_license_key', $license );
+    $license = false;
+    if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
+        $license = MONSTERINSIGHTS_LICENSE_KEY;
+    } else {
+        $license = monsterinsights_get_license();
+        if ( ! empty( $license['key'] ) && is_string( $license['key'] ) && strlen( $license['key'] ) > 10 ) {
+            $license = $license['key'];
+        } else {
+            $license = false;
+        }
+    }
+
+    return apply_filters( 'monsterinsights_license_key', $license );
 }
 
 /**
@@ -345,36 +345,36 @@ 
  * @return boolean True if updated, false if not.
  */
 function monsterinsights_update_license_key( $license_key = false, $network = false, $override = false ) {
-	if ( ! $license_key || ! is_string( $license_key ) || ! strlen( $license_key ) > 10  ) {
-		return false;
-	}
-
-	if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
-		update_site_option( 'monsterinsights_license', $license_key );
-		return true;
-	} else {
-		update_option( 'monsterinsights_license', $license_key );
-		return true;
-	}
+    if ( ! $license_key || ! is_string( $license_key ) || ! strlen( $license_key ) > 10  ) {
+        return false;
+    }
+
+    if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
+        update_site_option( 'monsterinsights_license', $license_key );
+        return true;
+    } else {
+        update_option( 'monsterinsights_license', $license_key );
+        return true;
+    }
 }
 
- /**
- * Helper method for deleting the license key.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+    /**
+     * Helper method for deleting the license key.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @param string $key   The setting key.
+     * @return boolean True if removed, false if not.
+     */
 function monsterinsights_delete_license_key( $network = false, $override = false ) {
-	if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
-		delete_site_option( 'monsterinsights_license' );
-		return true;
-	} else {
-		delete_option( 'monsterinsights_license' );
-		return true;
-	}
+    if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
+        delete_site_option( 'monsterinsights_license' );
+        return true;
+    } else {
+        delete_option( 'monsterinsights_license' );
+        return true;
+    }
 }
 
 
@@ -387,14 +387,14 @@ 
  * @return string $type The user's license key type for MonsterInsights.
  */
 function monsterinsights_get_license_key_type() {
-	$type = false;
-	$license = monsterinsights_get_license();
-	if ( ! empty( $license['type'] ) && is_string( $license['type'] ) ) {
-		if ( in_array( $license['type'], array( 'master', 'pro', 'plus', 'basic' ) ) ) {
-			$type = $license['type'];
-		}
-	}
-	return $type;
+    $type = false;
+    $license = monsterinsights_get_license();
+    if ( ! empty( $license['type'] ) && is_string( $license['type'] ) ) {
+        if ( in_array( $license['type'], array( 'master', 'pro', 'plus', 'basic' ) ) ) {
+            $type = $license['type'];
+        }
+    }
+    return $type;
 }
 
 /**
@@ -406,16 +406,16 @@ 
  * @return bool True if there are license key errors, false otherwise.
  */
 function monsterinsights_get_license_key_errors() {
-	$errors = false;
-	$license = monsterinsights_get_license();
-	if ( ! empty( $license['type'] ) && is_string( $license['type'] ) && strlen( $license['type'] ) > 3 ) {
-		if ( ( isset( $license['is_expired'] )  && $license['is_expired'] ) 
-		  || ( isset( $license['is_disabled'] ) && $license['is_disabled'] )
-		  || ( isset( $license['is_invalid'] )  && $license['is_invalid'] ) ) {
-			$errors = true;
-		}
-	}
-	return $errors;
+    $errors = false;
+    $license = monsterinsights_get_license();
+    if ( ! empty( $license['type'] ) && is_string( $license['type'] ) && strlen( $license['type'] ) > 3 ) {
+        if ( ( isset( $license['is_expired'] )  && $license['is_expired'] ) 
+          || ( isset( $license['is_disabled'] ) && $license['is_disabled'] )
+          || ( isset( $license['is_invalid'] )  && $license['is_invalid'] ) ) {
+            $errors = true;
+        }
+    }
+    return $errors;
 }
 
 /**
@@ -429,46 +429,46 @@ 
  * @return string|false Return cleaned ua string if valid, else returns false.
  */
 function monsterinsights_is_valid_ua( $ua_code = '' ) {
-	$ua_code = (string) $ua_code; // Rare case, but let's make sure it never happens.
-	$ua_code = trim( $ua_code );
+    $ua_code = (string) $ua_code; // Rare case, but let's make sure it never happens.
+    $ua_code = trim( $ua_code );
 
-	if ( empty( $ua_code ) ) {
-		return '';
-	}
+    if ( empty( $ua_code ) ) {
+        return '';
+    }
 	
-	// Replace all type of dashes (n-dash, m-dash, minus) with normal dashes.
-	$ua_code = str_replace( array( '–', '—', '−' ), '-', $ua_code );
+    // Replace all type of dashes (n-dash, m-dash, minus) with normal dashes.
+    $ua_code = str_replace( array( '–', '—', '−' ), '-', $ua_code );
 	
-	if ( preg_match( "/^(UA|YT|MO)-\d{4,}-\d+$/", strval( $ua_code ) ) ) {
-		return $ua_code;
-	} else {
-		return '';
-	}
+    if ( preg_match( "/^(UA|YT|MO)-\d{4,}-\d+$/", strval( $ua_code ) ) ) {
+        return $ua_code;
+    } else {
+        return '';
+    }
 }
 
 function monsterinsights_get_option_name() {
-	//if ( monsterinsights_is_pro_version() ) {
-		return 'monsterinsights_settings';
-	//} else {
-	//	return 'monsterinsights_settings';
-	//}
+    //if ( monsterinsights_is_pro_version() ) {
+        return 'monsterinsights_settings';
+    //} else {
+    //	return 'monsterinsights_settings';
+    //}
 }
 
 function monsterinsights_export_settings() {
-	$settings = monsterinsights_get_options();
-	$exclude  = array( 
-				'analytics_profile',
-				'analytics_profile_code',
-				'analytics_profile_name',
-				'oauth_version',
-				'cron_last_run',
-				'monsterinsights_oauth_status',
-	);
-
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			unset( $settings[ $e ] );
-		}
-	}
-	return wp_json_encode( $settings );
+    $settings = monsterinsights_get_options();
+    $exclude  = array( 
+                'analytics_profile',
+                'analytics_profile_code',
+                'analytics_profile_name',
+                'oauth_version',
+                'cron_last_run',
+                'monsterinsights_oauth_status',
+    );
+
+    foreach ( $exclude as $e ) {
+        if ( ! empty( $settings[ $e ] ) ) {
+            unset( $settings[ $e ] );
+        }
+    }
+    return wp_json_encode( $settings );
 }
\ No newline at end of file

includes/helpers.php

Spacing +339 added lines, -339 removed lines

@@ -10,34 +10,34 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-function monsterinsights_debug_output( $var ) {
-	error_log( print_r( $var, true ) . "\n", 3, MONSTERINSIGHTS_PLUGIN_DIR . 'log.txt' );
+function monsterinsights_debug_output($var) {
+	error_log(print_r($var, true) . "\n", 3, MONSTERINSIGHTS_PLUGIN_DIR . 'log.txt');
 }
 
 function monsterinsights_is_page_reload() {
 	// Can't be a refresh without having a referrer
-	if ( ! isset( $_SERVER['HTTP_REFERER'] ) ) {
+	if ( ! isset($_SERVER['HTTP_REFERER'])) {
 		return false;
 	}
 
 	// IF the referrer is identical to the current page request, then it's a refresh
-	return ( parse_url( $_SERVER['HTTP_REFERER'], PHP_URL_PATH ) === parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) );
+	return (parse_url($_SERVER['HTTP_REFERER'], PHP_URL_PATH) === parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 }
 
 
 function monsterinsights_track_user() {
 	$user        = wp_get_current_user();
 	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
+	$roles = monsterinsights_get_option('ignore_users', array());
 
-	if ( ! empty( $roles ) && is_array( $roles ) ) {
-		foreach ( $roles as $role ) {
-			if ( is_string( $role ) ) {
-				if ( current_user_can( $role ) ) {
+	if ( ! empty($roles) && is_array($roles)) {
+		foreach ($roles as $role) {
+			if (is_string($role)) {
+				if (current_user_can($role)) {
 					$track_user = false;
 					break;
 				}
@@ -45,30 +45,30 @@ 
 		}
 	}
 
-	$track_super_admin = apply_filters( 'monsterinsights_track_super_admins', false );
-	if ( $track_super_admin === false && is_super_admin() ) {
+	$track_super_admin = apply_filters('monsterinsights_track_super_admins', false);
+	if ($track_super_admin === false && is_super_admin()) {
 		$track_user = false;
 	}
 	
 	// or if UA code is not entered
 	$ua_code = monsterinsights_get_ua();
-	if ( empty( $ua_code ) ) {
+	if (empty($ua_code)) {
 		$track_user = false;
 	}
 
-	return apply_filters( 'monsterinsights_track_user', $track_user, $user );
+	return apply_filters('monsterinsights_track_user', $track_user, $user);
 }
 
-function monsterinsights_get_client_id( $payment_id = false ) {
-	if ( is_object( $payment_id ) ) {
+function monsterinsights_get_client_id($payment_id = false) {
+	if (is_object($payment_id)) {
 		$payment_id = $payment_id->ID;
 	}
 	$user_cid    = monsterinsights_get_uuid();
-	$payment_cid = get_post_meta( $payment_id, '_yoast_gau_uuid', true );
+	$payment_cid = get_post_meta($payment_id, '_yoast_gau_uuid', true);
 
-	if ( ! empty( $payment_id ) && ! empty( $saved_cid ) ) {
+	if ( ! empty($payment_id) && ! empty($saved_cid)) {
 		return $saved_cid;
-	} else if ( ! empty( $user_cid ) ) {
+	} else if ( ! empty($user_cid)) {
 		return $user_cid;
 	} else {
 		return monsterinsights_generate_uuid();
@@ -85,7 +85,7 @@ 
  * @return bool|string False if cookie isn't set, GA UUID otherwise
  */
 function monsterinsights_get_uuid() {
-	if ( empty( $_COOKIE['_ga'] ) ) {
+	if (empty($_COOKIE['_ga'])) {
 		return false;
 	}
 	
@@ -98,10 +98,10 @@ 
 	 */
 
 	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
-	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
+	$cookie_parts = explode('.', $ga_cookie);
+	if (is_array($cookie_parts) && ! empty($cookie_parts[2]) && ! empty($cookie_parts[3])) {
 		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
-		if ( is_string( $uuid ) ) {
+		if (is_string($uuid)) {
 			return $uuid;
 		} else {
 			return false;
@@ -122,25 +122,25 @@ 
  */
 function monsterinsights_generate_uuid() {
 
-	return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+	return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
 
 		// 32 bits for "time_low"
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+		mt_rand(0, 0xffff), mt_rand(0, 0xffff),
 
 		// 16 bits for "time_mid"
-		mt_rand( 0, 0xffff ),
+		mt_rand(0, 0xffff),
 
 		// 16 bits for "time_hi_and_version",
 		// four most significant bits holds version number 4
-		mt_rand( 0, 0x0fff ) | 0x4000,
+		mt_rand(0, 0x0fff) | 0x4000,
 
 		// 16 bits, 8 bits for "clk_seq_hi_res",
 		// 8 bits for "clk_seq_low",
 		// two most significant bits holds zero and one for variant DCE1.1
-		mt_rand( 0, 0x3fff ) | 0x8000,
+		mt_rand(0, 0x3fff) | 0x8000,
 
 		// 48 bits for "node"
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+		mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
 	);
 }
 
@@ -151,28 +151,28 @@ 
  *
  * @return GA UUID or error code.
  */
-function monsterinsights_get_cookie( $debug = false ) {
-	if ( empty( $_COOKIE['_ga'] ) ) {
-		return ( $debug ) ? 'FCE' : false;
+function monsterinsights_get_cookie($debug = false) {
+	if (empty($_COOKIE['_ga'])) {
+		return ($debug) ? 'FCE' : false;
 	}
 	
 	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
-	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
+	$cookie_parts = explode('.', $ga_cookie);
+	if (is_array($cookie_parts) && ! empty($cookie_parts[2]) && ! empty($cookie_parts[3])) {
 		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
-		if ( is_string( $uuid ) ) {
+		if (is_string($uuid)) {
 			return $ga_cookie;
 		} else {
-			return ( $debug ) ? 'FA' : false;
+			return ($debug) ? 'FA' : false;
 		}
 	} else {
-		return ( $debug ) ? 'FAE' : false;
+		return ($debug) ? 'FAE' : false;
 	}
 }
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+	return rand(100000000, 999999999) . '.' . time();
 }
  
 
@@ -187,13 +187,13 @@ 
  *
  * @return int Hours between the two timestamps, rounded.
  */
-function monsterinsights_hours_between( $start, $stop = false ) {
-	if ( $stop === false ) {
+function monsterinsights_hours_between($start, $stop = false) {
+	if ($stop === false) {
 		$stop = time();
 	}
 
-	$diff = (int) abs( $stop -  $start );
-	$hours = round( $diff / HOUR_IN_SECONDS );
+	$diff = (int) abs($stop - $start);
+	$hours = round($diff / HOUR_IN_SECONDS);
 	return $hours;
 }
 
@@ -223,7 +223,7 @@ 
  * @return bool True if pro version.
  */
 function monsterinsights_is_pro_version() {
-	if ( class_exists( 'MonsterInsights' ) ) {
+	if (class_exists('MonsterInsights')) {
 		return true;
 	} else {
 		return false;
@@ -247,300 +247,300 @@ 
 	 *
 	 * @api array $all_roles
 	 */
-	$editable_roles = apply_filters( 'editable_roles', $all_roles );
+	$editable_roles = apply_filters('editable_roles', $all_roles);
 
-	foreach ( $editable_roles as $id => $name ) {
-		$roles[ $id ] = translate_user_role( $name['name'] );
+	foreach ($editable_roles as $id => $name) {
+		$roles[$id] = translate_user_role($name['name']);
 	}
 
 	return $roles;
 }
 
 /** Need to escape in advance of passing in $text. */
-function monsterinsights_get_message( $type = 'error', $text = '' ) {
+function monsterinsights_get_message($type = 'error', $text = '') {
 	$div = '';
-	if ( $type === 'error' || $type === 'alert' || $type === 'success' || $type === 'info' ) {
+	if ($type === 'error' || $type === 'alert' || $type === 'success' || $type === 'info') {
 		$base = MonsterInsights();
-		return $base->notices->display_inline_notice( 'monsterinsights_standard_notice', '', $text, $type, false, array( 'skip_message_escape' => true ) );
+		return $base->notices->display_inline_notice('monsterinsights_standard_notice', '', $text, $type, false, array('skip_message_escape' => true));
 	} else {
 		return '';
 	}
 }
 
 // Set cookie to expire in 2 years
-function monsterinsights_get_cookie_expiration_date( $time ) {
-	return date('D, j F Y H:i:s', time() + $time );
+function monsterinsights_get_cookie_expiration_date($time) {
+	return date('D, j F Y H:i:s', time() + $time);
 }
 
-function monsterinsights_string_ends_with( $string, $ending ) {
+function monsterinsights_string_ends_with($string, $ending) {
 	$strlen = strlen($string);
 	$endinglen = strlen($ending);
-	if ( $endinglen > $strlen ) {
+	if ($endinglen > $strlen) {
 		return false;
 	}
-	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
+	return substr_compare($string, $ending, $strlen - $endinglen, $endinglen) === 0;
 }
 
-function monsterinsights_string_starts_with( $string, $start ) {
-	return substr( $string, 0, strlen( $start ) ) === $start;
+function monsterinsights_string_starts_with($string, $start) {
+	return substr($string, 0, strlen($start)) === $start;
 }
 
-function monsterinsights_get_country_list( $translated = false ) {
-	if ( $translated ) {
+function monsterinsights_get_country_list($translated = false) {
+	if ($translated) {
 		$countries = array(
 			''   => '',
-			'US' => __( 'United States', 'google-analytics-for-wordpress' ),
-			'CA' => __( 'Canada', 'google-analytics-for-wordpress' ),
-			'GB' => __( 'United Kingdom', 'google-analytics-for-wordpress' ),
-			'AF' => __( 'Afghanistan', 'google-analytics-for-wordpress' ),
-			'AX' => __( 'Åland Islands', 'google-analytics-for-wordpress' ),
-			'AL' => __( 'Albania', 'google-analytics-for-wordpress' ),
-			'DZ' => __( 'Algeria', 'google-analytics-for-wordpress' ),
-			'AS' => __( 'American Samoa', 'google-analytics-for-wordpress' ),
-			'AD' => __( 'Andorra', 'google-analytics-for-wordpress' ),
-			'AO' => __( 'Angola', 'google-analytics-for-wordpress' ),
-			'AI' => __( 'Anguilla', 'google-analytics-for-wordpress' ),
-			'AQ' => __( 'Antarctica', 'google-analytics-for-wordpress' ),
-			'AG' => __( 'Antigua and Barbuda', 'google-analytics-for-wordpress' ),
-			'AR' => __( 'Argentina', 'google-analytics-for-wordpress' ),
-			'AM' => __( 'Armenia', 'google-analytics-for-wordpress' ),
-			'AW' => __( 'Aruba', 'google-analytics-for-wordpress' ),
-			'AU' => __( 'Australia', 'google-analytics-for-wordpress' ),
-			'AT' => __( 'Austria', 'google-analytics-for-wordpress' ),
-			'AZ' => __( 'Azerbaijan', 'google-analytics-for-wordpress' ),
-			'BS' => __( 'Bahamas', 'google-analytics-for-wordpress' ),
-			'BH' => __( 'Bahrain', 'google-analytics-for-wordpress' ),
-			'BD' => __( 'Bangladesh', 'google-analytics-for-wordpress' ),
-			'BB' => __( 'Barbados', 'google-analytics-for-wordpress' ),
-			'BY' => __( 'Belarus', 'google-analytics-for-wordpress' ),
-			'BE' => __( 'Belgium', 'google-analytics-for-wordpress' ),
-			'BZ' => __( 'Belize', 'google-analytics-for-wordpress' ),
-			'BJ' => __( 'Benin', 'google-analytics-for-wordpress' ),
-			'BM' => __( 'Bermuda', 'google-analytics-for-wordpress' ),
-			'BT' => __( 'Bhutan', 'google-analytics-for-wordpress' ),
-			'BO' => __( 'Bolivia', 'google-analytics-for-wordpress' ),
-			'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'google-analytics-for-wordpress' ),
-			'BA' => __( 'Bosnia and Herzegovina', 'google-analytics-for-wordpress' ),
-			'BW' => __( 'Botswana', 'google-analytics-for-wordpress' ),
-			'BV' => __( 'Bouvet Island', 'google-analytics-for-wordpress' ),
-			'BR' => __( 'Brazil', 'google-analytics-for-wordpress' ),
-			'IO' => __( 'British Indian Ocean Territory', 'google-analytics-for-wordpress' ),
-			'BN' => __( 'Brunei Darrussalam', 'google-analytics-for-wordpress' ),
-			'BG' => __( 'Bulgaria', 'google-analytics-for-wordpress' ),
-			'BF' => __( 'Burkina Faso', 'google-analytics-for-wordpress' ),
-			'BI' => __( 'Burundi', 'google-analytics-for-wordpress' ),
-			'KH' => __( 'Cambodia', 'google-analytics-for-wordpress' ),
-			'CM' => __( 'Cameroon', 'google-analytics-for-wordpress' ),
-			'CV' => __( 'Cape Verde', 'google-analytics-for-wordpress' ),
-			'KY' => __( 'Cayman Islands', 'google-analytics-for-wordpress' ),
-			'CF' => __( 'Central African Republic', 'google-analytics-for-wordpress' ),
-			'TD' => __( 'Chad', 'google-analytics-for-wordpress' ),
-			'CL' => __( 'Chile', 'google-analytics-for-wordpress' ),
-			'CN' => __( 'China', 'google-analytics-for-wordpress' ),
-			'CX' => __( 'Christmas Island', 'google-analytics-for-wordpress' ),
-			'CC' => __( 'Cocos Islands', 'google-analytics-for-wordpress' ),
-			'CO' => __( 'Colombia', 'google-analytics-for-wordpress' ),
-			'KM' => __( 'Comoros', 'google-analytics-for-wordpress' ),
-			'CD' => __( 'Congo, Democratic People\'s Republic', 'google-analytics-for-wordpress' ),
-			'CG' => __( 'Congo, Republic of', 'google-analytics-for-wordpress' ),
-			'CK' => __( 'Cook Islands', 'google-analytics-for-wordpress' ),
-			'CR' => __( 'Costa Rica', 'google-analytics-for-wordpress' ),
-			'CI' => __( 'Cote d\'Ivoire', 'google-analytics-for-wordpress' ),
-			'HR' => __( 'Croatia/Hrvatska', 'google-analytics-for-wordpress' ),
-			'CU' => __( 'Cuba', 'google-analytics-for-wordpress' ),
-			'CW' => __( 'CuraÇao', 'google-analytics-for-wordpress' ),
-			'CY' => __( 'Cyprus', 'google-analytics-for-wordpress' ),
-			'CZ' => __( 'Czechia', 'google-analytics-for-wordpress' ),
-			'DK' => __( 'Denmark', 'google-analytics-for-wordpress' ),
-			'DJ' => __( 'Djibouti', 'google-analytics-for-wordpress' ),
-			'DM' => __( 'Dominica', 'google-analytics-for-wordpress' ),
-			'DO' => __( 'Dominican Republic', 'google-analytics-for-wordpress' ),
-			'TP' => __( 'East Timor', 'google-analytics-for-wordpress' ),
-			'EC' => __( 'Ecuador', 'google-analytics-for-wordpress' ),
-			'EG' => __( 'Egypt', 'google-analytics-for-wordpress' ),
-			'GQ' => __( 'Equatorial Guinea', 'google-analytics-for-wordpress' ),
-			'SV' => __( 'El Salvador', 'google-analytics-for-wordpress' ),
-			'ER' => __( 'Eritrea', 'google-analytics-for-wordpress' ),
-			'EE' => __( 'Estonia', 'google-analytics-for-wordpress' ),
-			'ET' => __( 'Ethiopia', 'google-analytics-for-wordpress' ),
-			'FK' => __( 'Falkland Islands', 'google-analytics-for-wordpress' ),
-			'FO' => __( 'Faroe Islands', 'google-analytics-for-wordpress' ),
-			'FJ' => __( 'Fiji', 'google-analytics-for-wordpress' ),
-			'FI' => __( 'Finland', 'google-analytics-for-wordpress' ),
-			'FR' => __( 'France', 'google-analytics-for-wordpress' ),
-			'GF' => __( 'French Guiana', 'google-analytics-for-wordpress' ),
-			'PF' => __( 'French Polynesia', 'google-analytics-for-wordpress' ),
-			'TF' => __( 'French Southern Territories', 'google-analytics-for-wordpress' ),
-			'GA' => __( 'Gabon', 'google-analytics-for-wordpress' ),
-			'GM' => __( 'Gambia', 'google-analytics-for-wordpress' ),
-			'GE' => __( 'Georgia', 'google-analytics-for-wordpress' ),
-			'DE' => __( 'Germany', 'google-analytics-for-wordpress' ),
-			'GR' => __( 'Greece', 'google-analytics-for-wordpress' ),
-			'GH' => __( 'Ghana', 'google-analytics-for-wordpress' ),
-			'GI' => __( 'Gibraltar', 'google-analytics-for-wordpress' ),
-			'GL' => __( 'Greenland', 'google-analytics-for-wordpress' ),
-			'GD' => __( 'Grenada', 'google-analytics-for-wordpress' ),
-			'GP' => __( 'Guadeloupe', 'google-analytics-for-wordpress' ),
-			'GU' => __( 'Guam', 'google-analytics-for-wordpress' ),
-			'GT' => __( 'Guatemala', 'google-analytics-for-wordpress' ),
-			'GG' => __( 'Guernsey', 'google-analytics-for-wordpress' ),
-			'GN' => __( 'Guinea', 'google-analytics-for-wordpress' ),
-			'GW' => __( 'Guinea-Bissau', 'google-analytics-for-wordpress' ),
-			'GY' => __( 'Guyana', 'google-analytics-for-wordpress' ),
-			'HT' => __( 'Haiti', 'google-analytics-for-wordpress' ),
-			'HM' => __( 'Heard and McDonald Islands', 'google-analytics-for-wordpress' ),
-			'VA' => __( 'Holy See (City Vatican State)', 'google-analytics-for-wordpress' ),
-			'HN' => __( 'Honduras', 'google-analytics-for-wordpress' ),
-			'HK' => __( 'Hong Kong', 'google-analytics-for-wordpress' ),
-			'HU' => __( 'Hungary', 'google-analytics-for-wordpress' ),
-			'IS' => __( 'Iceland', 'google-analytics-for-wordpress' ),
-			'IN' => __( 'India', 'google-analytics-for-wordpress' ),
-			'ID' => __( 'Indonesia', 'google-analytics-for-wordpress' ),
-			'IR' => __( 'Iran', 'google-analytics-for-wordpress' ),
-			'IQ' => __( 'Iraq', 'google-analytics-for-wordpress' ),
-			'IE' => __( 'Ireland', 'google-analytics-for-wordpress' ),
-			'IM' => __( 'Isle of Man', 'google-analytics-for-wordpress' ),
-			'IL' => __( 'Israel', 'google-analytics-for-wordpress' ),
-			'IT' => __( 'Italy', 'google-analytics-for-wordpress' ),
-			'JM' => __( 'Jamaica', 'google-analytics-for-wordpress' ),
-			'JP' => __( 'Japan', 'google-analytics-for-wordpress' ),
-			'JE' => __( 'Jersey', 'google-analytics-for-wordpress' ),
-			'JO' => __( 'Jordan', 'google-analytics-for-wordpress' ),
-			'KZ' => __( 'Kazakhstan', 'google-analytics-for-wordpress' ),
-			'KE' => __( 'Kenya', 'google-analytics-for-wordpress' ),
-			'KI' => __( 'Kiribati', 'google-analytics-for-wordpress' ),
-			'KW' => __( 'Kuwait', 'google-analytics-for-wordpress' ),
-			'KG' => __( 'Kyrgyzstan', 'google-analytics-for-wordpress' ),
-			'LA' => __( 'Lao People\'s Democratic Republic', 'google-analytics-for-wordpress' ),
-			'LV' => __( 'Latvia', 'google-analytics-for-wordpress' ),
-			'LB' => __( 'Lebanon', 'google-analytics-for-wordpress' ),
-			'LS' => __( 'Lesotho', 'google-analytics-for-wordpress' ),
-			'LR' => __( 'Liberia', 'google-analytics-for-wordpress' ),
-			'LY' => __( 'Libyan Arab Jamahiriya', 'google-analytics-for-wordpress' ),
-			'LI' => __( 'Liechtenstein', 'google-analytics-for-wordpress' ),
-			'LT' => __( 'Lithuania', 'google-analytics-for-wordpress' ),
-			'LU' => __( 'Luxembourg', 'google-analytics-for-wordpress' ),
-			'MO' => __( 'Macau', 'google-analytics-for-wordpress' ),
-			'MK' => __( 'Macedonia', 'google-analytics-for-wordpress' ),
-			'MG' => __( 'Madagascar', 'google-analytics-for-wordpress' ),
-			'MW' => __( 'Malawi', 'google-analytics-for-wordpress' ),
-			'MY' => __( 'Malaysia', 'google-analytics-for-wordpress' ),
-			'MV' => __( 'Maldives', 'google-analytics-for-wordpress' ),
-			'ML' => __( 'Mali', 'google-analytics-for-wordpress' ),
-			'MT' => __( 'Malta', 'google-analytics-for-wordpress' ),
-			'MH' => __( 'Marshall Islands', 'google-analytics-for-wordpress' ),
-			'MQ' => __( 'Martinique', 'google-analytics-for-wordpress' ),
-			'MR' => __( 'Mauritania', 'google-analytics-for-wordpress' ),
-			'MU' => __( 'Mauritius', 'google-analytics-for-wordpress' ),
-			'YT' => __( 'Mayotte', 'google-analytics-for-wordpress' ),
-			'MX' => __( 'Mexico', 'google-analytics-for-wordpress' ),
-			'FM' => __( 'Micronesia', 'google-analytics-for-wordpress' ),
-			'MD' => __( 'Moldova, Republic of', 'google-analytics-for-wordpress' ),
-			'MC' => __( 'Monaco', 'google-analytics-for-wordpress' ),
-			'MN' => __( 'Mongolia', 'google-analytics-for-wordpress' ),
-			'ME' => __( 'Montenegro', 'google-analytics-for-wordpress' ),
-			'MS' => __( 'Montserrat', 'google-analytics-for-wordpress' ),
-			'MA' => __( 'Morocco', 'google-analytics-for-wordpress' ),
-			'MZ' => __( 'Mozambique', 'google-analytics-for-wordpress' ),
-			'MM' => __( 'Myanmar', 'google-analytics-for-wordpress' ),
-			'NA' => __( 'Namibia', 'google-analytics-for-wordpress' ),
-			'NR' => __( 'Nauru', 'google-analytics-for-wordpress' ),
-			'NP' => __( 'Nepal', 'google-analytics-for-wordpress' ),
-			'NL' => __( 'Netherlands', 'google-analytics-for-wordpress' ),
-			'AN' => __( 'Netherlands Antilles', 'google-analytics-for-wordpress' ),
-			'NC' => __( 'New Caledonia', 'google-analytics-for-wordpress' ),
-			'NZ' => __( 'New Zealand', 'google-analytics-for-wordpress' ),
-			'NI' => __( 'Nicaragua', 'google-analytics-for-wordpress' ),
-			'NE' => __( 'Niger', 'google-analytics-for-wordpress' ),
-			'NG' => __( 'Nigeria', 'google-analytics-for-wordpress' ),
-			'NU' => __( 'Niue', 'google-analytics-for-wordpress' ),
-			'NF' => __( 'Norfolk Island', 'google-analytics-for-wordpress' ),
-			'KP' => __( 'North Korea', 'google-analytics-for-wordpress' ),
-			'MP' => __( 'Northern Mariana Islands', 'google-analytics-for-wordpress' ),
-			'NO' => __( 'Norway', 'google-analytics-for-wordpress' ),
-			'OM' => __( 'Oman', 'google-analytics-for-wordpress' ),
-			'PK' => __( 'Pakistan', 'google-analytics-for-wordpress' ),
-			'PW' => __( 'Palau', 'google-analytics-for-wordpress' ),
-			'PS' => __( 'Palestinian Territories', 'google-analytics-for-wordpress' ),
-			'PA' => __( 'Panama', 'google-analytics-for-wordpress' ),
-			'PG' => __( 'Papua New Guinea', 'google-analytics-for-wordpress' ),
-			'PY' => __( 'Paraguay', 'google-analytics-for-wordpress' ),
-			'PE' => __( 'Peru', 'google-analytics-for-wordpress' ),
-			'PH' => __( 'Philippines', 'google-analytics-for-wordpress' ),
-			'PN' => __( 'Pitcairn Island', 'google-analytics-for-wordpress' ),
-			'PL' => __( 'Poland', 'google-analytics-for-wordpress' ),
-			'PT' => __( 'Portugal', 'google-analytics-for-wordpress' ),
-			'PR' => __( 'Puerto Rico', 'google-analytics-for-wordpress' ),
-			'QA' => __( 'Qatar', 'google-analytics-for-wordpress' ),
-			'XK' => __( 'Republic of Kosovo', 'google-analytics-for-wordpress' ),
-			'RE' => __( 'Reunion Island', 'google-analytics-for-wordpress' ),
-			'RO' => __( 'Romania', 'google-analytics-for-wordpress' ),
-			'RU' => __( 'Russian Federation', 'google-analytics-for-wordpress' ),
-			'RW' => __( 'Rwanda', 'google-analytics-for-wordpress' ),
-			'BL' => __( 'Saint Barthélemy', 'google-analytics-for-wordpress' ),
-			'SH' => __( 'Saint Helena', 'google-analytics-for-wordpress' ),
-			'KN' => __( 'Saint Kitts and Nevis', 'google-analytics-for-wordpress' ),
-			'LC' => __( 'Saint Lucia', 'google-analytics-for-wordpress' ),
-			'MF' => __( 'Saint Martin (French)', 'google-analytics-for-wordpress' ),
-			'SX' => __( 'Saint Martin (Dutch)', 'google-analytics-for-wordpress' ),
-			'PM' => __( 'Saint Pierre and Miquelon', 'google-analytics-for-wordpress' ),
-			'VC' => __( 'Saint Vincent and the Grenadines', 'google-analytics-for-wordpress' ),
-			'SM' => __( 'San Marino', 'google-analytics-for-wordpress' ),
-			'ST' => __( 'São Tomé and Príncipe', 'google-analytics-for-wordpress' ),
-			'SA' => __( 'Saudi Arabia', 'google-analytics-for-wordpress' ),
-			'SN' => __( 'Senegal', 'google-analytics-for-wordpress' ),
-			'RS' => __( 'Serbia', 'google-analytics-for-wordpress' ),
-			'SC' => __( 'Seychelles', 'google-analytics-for-wordpress' ),
-			'SL' => __( 'Sierra Leone', 'google-analytics-for-wordpress' ),
-			'SG' => __( 'Singapore', 'google-analytics-for-wordpress' ),
-			'SK' => __( 'Slovak Republic', 'google-analytics-for-wordpress' ),
-			'SI' => __( 'Slovenia', 'google-analytics-for-wordpress' ),
-			'SB' => __( 'Solomon Islands', 'google-analytics-for-wordpress' ),
-			'SO' => __( 'Somalia', 'google-analytics-for-wordpress' ),
-			'ZA' => __( 'South Africa', 'google-analytics-for-wordpress' ),
-			'GS' => __( 'South Georgia', 'google-analytics-for-wordpress' ),
-			'KR' => __( 'South Korea', 'google-analytics-for-wordpress' ),
-			'SS' => __( 'South Sudan', 'google-analytics-for-wordpress' ),
-			'ES' => __( 'Spain', 'google-analytics-for-wordpress' ),
-			'LK' => __( 'Sri Lanka', 'google-analytics-for-wordpress' ),
-			'SD' => __( 'Sudan', 'google-analytics-for-wordpress' ),
-			'SR' => __( 'Suriname', 'google-analytics-for-wordpress' ),
-			'SJ' => __( 'Svalbard and Jan Mayen Islands', 'google-analytics-for-wordpress' ),
-			'SZ' => __( 'Swaziland', 'google-analytics-for-wordpress' ),
-			'SE' => __( 'Sweden', 'google-analytics-for-wordpress' ),
-			'CH' => __( 'Switzerland', 'google-analytics-for-wordpress' ),
-			'SY' => __( 'Syrian Arab Republic', 'google-analytics-for-wordpress' ),
-			'TW' => __( 'Taiwan', 'google-analytics-for-wordpress' ),
-			'TJ' => __( 'Tajikistan', 'google-analytics-for-wordpress' ),
-			'TZ' => __( 'Tanzania', 'google-analytics-for-wordpress' ),
-			'TH' => __( 'Thailand', 'google-analytics-for-wordpress' ),
-			'TL' => __( 'Timor-Leste', 'google-analytics-for-wordpress' ),
-			'TG' => __( 'Togo', 'google-analytics-for-wordpress' ),
-			'TK' => __( 'Tokelau', 'google-analytics-for-wordpress' ),
-			'TO' => __( 'Tonga', 'google-analytics-for-wordpress' ),
-			'TT' => __( 'Trinidad and Tobago', 'google-analytics-for-wordpress' ),
-			'TN' => __( 'Tunisia', 'google-analytics-for-wordpress' ),
-			'TR' => __( 'Turkey', 'google-analytics-for-wordpress' ),
-			'TM' => __( 'Turkmenistan', 'google-analytics-for-wordpress' ),
-			'TC' => __( 'Turks and Caicos Islands', 'google-analytics-for-wordpress' ),
-			'TV' => __( 'Tuvalu', 'google-analytics-for-wordpress' ),
-			'UG' => __( 'Uganda', 'google-analytics-for-wordpress' ),
-			'UA' => __( 'Ukraine', 'google-analytics-for-wordpress' ),
-			'AE' => __( 'United Arab Emirates', 'google-analytics-for-wordpress' ),
-			'UY' => __( 'Uruguay', 'google-analytics-for-wordpress' ),
-			'UM' => __( 'US Minor Outlying Islands', 'google-analytics-for-wordpress' ),
-			'UZ' => __( 'Uzbekistan', 'google-analytics-for-wordpress' ),
-			'VU' => __( 'Vanuatu', 'google-analytics-for-wordpress' ),
-			'VE' => __( 'Venezuela', 'google-analytics-for-wordpress' ),
-			'VN' => __( 'Vietnam', 'google-analytics-for-wordpress' ),
-			'VG' => __( 'Virgin Islands (British)', 'google-analytics-for-wordpress' ),
-			'VI' => __( 'Virgin Islands (USA)', 'google-analytics-for-wordpress' ),
-			'WF' => __( 'Wallis and Futuna Islands', 'google-analytics-for-wordpress' ),
-			'EH' => __( 'Western Sahara', 'google-analytics-for-wordpress' ),
-			'WS' => __( 'Western Samoa', 'google-analytics-for-wordpress' ),
-			'YE' => __( 'Yemen', 'google-analytics-for-wordpress' ),
-			'ZM' => __( 'Zambia', 'google-analytics-for-wordpress' ),
-			'ZW' => __( 'Zimbabwe', 'google-analytics-for-wordpress' ),
+			'US' => __('United States', 'google-analytics-for-wordpress'),
+			'CA' => __('Canada', 'google-analytics-for-wordpress'),
+			'GB' => __('United Kingdom', 'google-analytics-for-wordpress'),
+			'AF' => __('Afghanistan', 'google-analytics-for-wordpress'),
+			'AX' => __('Åland Islands', 'google-analytics-for-wordpress'),
+			'AL' => __('Albania', 'google-analytics-for-wordpress'),
+			'DZ' => __('Algeria', 'google-analytics-for-wordpress'),
+			'AS' => __('American Samoa', 'google-analytics-for-wordpress'),
+			'AD' => __('Andorra', 'google-analytics-for-wordpress'),
+			'AO' => __('Angola', 'google-analytics-for-wordpress'),
+			'AI' => __('Anguilla', 'google-analytics-for-wordpress'),
+			'AQ' => __('Antarctica', 'google-analytics-for-wordpress'),
+			'AG' => __('Antigua and Barbuda', 'google-analytics-for-wordpress'),
+			'AR' => __('Argentina', 'google-analytics-for-wordpress'),
+			'AM' => __('Armenia', 'google-analytics-for-wordpress'),
+			'AW' => __('Aruba', 'google-analytics-for-wordpress'),
+			'AU' => __('Australia', 'google-analytics-for-wordpress'),
+			'AT' => __('Austria', 'google-analytics-for-wordpress'),
+			'AZ' => __('Azerbaijan', 'google-analytics-for-wordpress'),
+			'BS' => __('Bahamas', 'google-analytics-for-wordpress'),
+			'BH' => __('Bahrain', 'google-analytics-for-wordpress'),
+			'BD' => __('Bangladesh', 'google-analytics-for-wordpress'),
+			'BB' => __('Barbados', 'google-analytics-for-wordpress'),
+			'BY' => __('Belarus', 'google-analytics-for-wordpress'),
+			'BE' => __('Belgium', 'google-analytics-for-wordpress'),
+			'BZ' => __('Belize', 'google-analytics-for-wordpress'),
+			'BJ' => __('Benin', 'google-analytics-for-wordpress'),
+			'BM' => __('Bermuda', 'google-analytics-for-wordpress'),
+			'BT' => __('Bhutan', 'google-analytics-for-wordpress'),
+			'BO' => __('Bolivia', 'google-analytics-for-wordpress'),
+			'BQ' => __('Bonaire, Saint Eustatius and Saba', 'google-analytics-for-wordpress'),
+			'BA' => __('Bosnia and Herzegovina', 'google-analytics-for-wordpress'),
+			'BW' => __('Botswana', 'google-analytics-for-wordpress'),
+			'BV' => __('Bouvet Island', 'google-analytics-for-wordpress'),
+			'BR' => __('Brazil', 'google-analytics-for-wordpress'),
+			'IO' => __('British Indian Ocean Territory', 'google-analytics-for-wordpress'),
+			'BN' => __('Brunei Darrussalam', 'google-analytics-for-wordpress'),
+			'BG' => __('Bulgaria', 'google-analytics-for-wordpress'),
+			'BF' => __('Burkina Faso', 'google-analytics-for-wordpress'),
+			'BI' => __('Burundi', 'google-analytics-for-wordpress'),
+			'KH' => __('Cambodia', 'google-analytics-for-wordpress'),
+			'CM' => __('Cameroon', 'google-analytics-for-wordpress'),
+			'CV' => __('Cape Verde', 'google-analytics-for-wordpress'),
+			'KY' => __('Cayman Islands', 'google-analytics-for-wordpress'),
+			'CF' => __('Central African Republic', 'google-analytics-for-wordpress'),
+			'TD' => __('Chad', 'google-analytics-for-wordpress'),
+			'CL' => __('Chile', 'google-analytics-for-wordpress'),
+			'CN' => __('China', 'google-analytics-for-wordpress'),
+			'CX' => __('Christmas Island', 'google-analytics-for-wordpress'),
+			'CC' => __('Cocos Islands', 'google-analytics-for-wordpress'),
+			'CO' => __('Colombia', 'google-analytics-for-wordpress'),
+			'KM' => __('Comoros', 'google-analytics-for-wordpress'),
+			'CD' => __('Congo, Democratic People\'s Republic', 'google-analytics-for-wordpress'),
+			'CG' => __('Congo, Republic of', 'google-analytics-for-wordpress'),
+			'CK' => __('Cook Islands', 'google-analytics-for-wordpress'),
+			'CR' => __('Costa Rica', 'google-analytics-for-wordpress'),
+			'CI' => __('Cote d\'Ivoire', 'google-analytics-for-wordpress'),
+			'HR' => __('Croatia/Hrvatska', 'google-analytics-for-wordpress'),
+			'CU' => __('Cuba', 'google-analytics-for-wordpress'),
+			'CW' => __('CuraÇao', 'google-analytics-for-wordpress'),
+			'CY' => __('Cyprus', 'google-analytics-for-wordpress'),
+			'CZ' => __('Czechia', 'google-analytics-for-wordpress'),
+			'DK' => __('Denmark', 'google-analytics-for-wordpress'),
+			'DJ' => __('Djibouti', 'google-analytics-for-wordpress'),
+			'DM' => __('Dominica', 'google-analytics-for-wordpress'),
+			'DO' => __('Dominican Republic', 'google-analytics-for-wordpress'),
+			'TP' => __('East Timor', 'google-analytics-for-wordpress'),
+			'EC' => __('Ecuador', 'google-analytics-for-wordpress'),
+			'EG' => __('Egypt', 'google-analytics-for-wordpress'),
+			'GQ' => __('Equatorial Guinea', 'google-analytics-for-wordpress'),
+			'SV' => __('El Salvador', 'google-analytics-for-wordpress'),
+			'ER' => __('Eritrea', 'google-analytics-for-wordpress'),
+			'EE' => __('Estonia', 'google-analytics-for-wordpress'),
+			'ET' => __('Ethiopia', 'google-analytics-for-wordpress'),
+			'FK' => __('Falkland Islands', 'google-analytics-for-wordpress'),
+			'FO' => __('Faroe Islands', 'google-analytics-for-wordpress'),
+			'FJ' => __('Fiji', 'google-analytics-for-wordpress'),
+			'FI' => __('Finland', 'google-analytics-for-wordpress'),
+			'FR' => __('France', 'google-analytics-for-wordpress'),
+			'GF' => __('French Guiana', 'google-analytics-for-wordpress'),
+			'PF' => __('French Polynesia', 'google-analytics-for-wordpress'),
+			'TF' => __('French Southern Territories', 'google-analytics-for-wordpress'),
+			'GA' => __('Gabon', 'google-analytics-for-wordpress'),
+			'GM' => __('Gambia', 'google-analytics-for-wordpress'),
+			'GE' => __('Georgia', 'google-analytics-for-wordpress'),
+			'DE' => __('Germany', 'google-analytics-for-wordpress'),
+			'GR' => __('Greece', 'google-analytics-for-wordpress'),
+			'GH' => __('Ghana', 'google-analytics-for-wordpress'),
+			'GI' => __('Gibraltar', 'google-analytics-for-wordpress'),
+			'GL' => __('Greenland', 'google-analytics-for-wordpress'),
+			'GD' => __('Grenada', 'google-analytics-for-wordpress'),
+			'GP' => __('Guadeloupe', 'google-analytics-for-wordpress'),
+			'GU' => __('Guam', 'google-analytics-for-wordpress'),
+			'GT' => __('Guatemala', 'google-analytics-for-wordpress'),
+			'GG' => __('Guernsey', 'google-analytics-for-wordpress'),
+			'GN' => __('Guinea', 'google-analytics-for-wordpress'),
+			'GW' => __('Guinea-Bissau', 'google-analytics-for-wordpress'),
+			'GY' => __('Guyana', 'google-analytics-for-wordpress'),
+			'HT' => __('Haiti', 'google-analytics-for-wordpress'),
+			'HM' => __('Heard and McDonald Islands', 'google-analytics-for-wordpress'),
+			'VA' => __('Holy See (City Vatican State)', 'google-analytics-for-wordpress'),
+			'HN' => __('Honduras', 'google-analytics-for-wordpress'),
+			'HK' => __('Hong Kong', 'google-analytics-for-wordpress'),
+			'HU' => __('Hungary', 'google-analytics-for-wordpress'),
+			'IS' => __('Iceland', 'google-analytics-for-wordpress'),
+			'IN' => __('India', 'google-analytics-for-wordpress'),
+			'ID' => __('Indonesia', 'google-analytics-for-wordpress'),
+			'IR' => __('Iran', 'google-analytics-for-wordpress'),
+			'IQ' => __('Iraq', 'google-analytics-for-wordpress'),
+			'IE' => __('Ireland', 'google-analytics-for-wordpress'),
+			'IM' => __('Isle of Man', 'google-analytics-for-wordpress'),
+			'IL' => __('Israel', 'google-analytics-for-wordpress'),
+			'IT' => __('Italy', 'google-analytics-for-wordpress'),
+			'JM' => __('Jamaica', 'google-analytics-for-wordpress'),
+			'JP' => __('Japan', 'google-analytics-for-wordpress'),
+			'JE' => __('Jersey', 'google-analytics-for-wordpress'),
+			'JO' => __('Jordan', 'google-analytics-for-wordpress'),
+			'KZ' => __('Kazakhstan', 'google-analytics-for-wordpress'),
+			'KE' => __('Kenya', 'google-analytics-for-wordpress'),
+			'KI' => __('Kiribati', 'google-analytics-for-wordpress'),
+			'KW' => __('Kuwait', 'google-analytics-for-wordpress'),
+			'KG' => __('Kyrgyzstan', 'google-analytics-for-wordpress'),
+			'LA' => __('Lao People\'s Democratic Republic', 'google-analytics-for-wordpress'),
+			'LV' => __('Latvia', 'google-analytics-for-wordpress'),
+			'LB' => __('Lebanon', 'google-analytics-for-wordpress'),
+			'LS' => __('Lesotho', 'google-analytics-for-wordpress'),
+			'LR' => __('Liberia', 'google-analytics-for-wordpress'),
+			'LY' => __('Libyan Arab Jamahiriya', 'google-analytics-for-wordpress'),
+			'LI' => __('Liechtenstein', 'google-analytics-for-wordpress'),
+			'LT' => __('Lithuania', 'google-analytics-for-wordpress'),
+			'LU' => __('Luxembourg', 'google-analytics-for-wordpress'),
+			'MO' => __('Macau', 'google-analytics-for-wordpress'),
+			'MK' => __('Macedonia', 'google-analytics-for-wordpress'),
+			'MG' => __('Madagascar', 'google-analytics-for-wordpress'),
+			'MW' => __('Malawi', 'google-analytics-for-wordpress'),
+			'MY' => __('Malaysia', 'google-analytics-for-wordpress'),
+			'MV' => __('Maldives', 'google-analytics-for-wordpress'),
+			'ML' => __('Mali', 'google-analytics-for-wordpress'),
+			'MT' => __('Malta', 'google-analytics-for-wordpress'),
+			'MH' => __('Marshall Islands', 'google-analytics-for-wordpress'),
+			'MQ' => __('Martinique', 'google-analytics-for-wordpress'),
+			'MR' => __('Mauritania', 'google-analytics-for-wordpress'),
+			'MU' => __('Mauritius', 'google-analytics-for-wordpress'),
+			'YT' => __('Mayotte', 'google-analytics-for-wordpress'),
+			'MX' => __('Mexico', 'google-analytics-for-wordpress'),
+			'FM' => __('Micronesia', 'google-analytics-for-wordpress'),
+			'MD' => __('Moldova, Republic of', 'google-analytics-for-wordpress'),
+			'MC' => __('Monaco', 'google-analytics-for-wordpress'),
+			'MN' => __('Mongolia', 'google-analytics-for-wordpress'),
+			'ME' => __('Montenegro', 'google-analytics-for-wordpress'),
+			'MS' => __('Montserrat', 'google-analytics-for-wordpress'),
+			'MA' => __('Morocco', 'google-analytics-for-wordpress'),
+			'MZ' => __('Mozambique', 'google-analytics-for-wordpress'),
+			'MM' => __('Myanmar', 'google-analytics-for-wordpress'),
+			'NA' => __('Namibia', 'google-analytics-for-wordpress'),
+			'NR' => __('Nauru', 'google-analytics-for-wordpress'),
+			'NP' => __('Nepal', 'google-analytics-for-wordpress'),
+			'NL' => __('Netherlands', 'google-analytics-for-wordpress'),
+			'AN' => __('Netherlands Antilles', 'google-analytics-for-wordpress'),
+			'NC' => __('New Caledonia', 'google-analytics-for-wordpress'),
+			'NZ' => __('New Zealand', 'google-analytics-for-wordpress'),
+			'NI' => __('Nicaragua', 'google-analytics-for-wordpress'),
+			'NE' => __('Niger', 'google-analytics-for-wordpress'),
+			'NG' => __('Nigeria', 'google-analytics-for-wordpress'),
+			'NU' => __('Niue', 'google-analytics-for-wordpress'),
+			'NF' => __('Norfolk Island', 'google-analytics-for-wordpress'),
+			'KP' => __('North Korea', 'google-analytics-for-wordpress'),
+			'MP' => __('Northern Mariana Islands', 'google-analytics-for-wordpress'),
+			'NO' => __('Norway', 'google-analytics-for-wordpress'),
+			'OM' => __('Oman', 'google-analytics-for-wordpress'),
+			'PK' => __('Pakistan', 'google-analytics-for-wordpress'),
+			'PW' => __('Palau', 'google-analytics-for-wordpress'),
+			'PS' => __('Palestinian Territories', 'google-analytics-for-wordpress'),
+			'PA' => __('Panama', 'google-analytics-for-wordpress'),
+			'PG' => __('Papua New Guinea', 'google-analytics-for-wordpress'),
+			'PY' => __('Paraguay', 'google-analytics-for-wordpress'),
+			'PE' => __('Peru', 'google-analytics-for-wordpress'),
+			'PH' => __('Philippines', 'google-analytics-for-wordpress'),
+			'PN' => __('Pitcairn Island', 'google-analytics-for-wordpress'),
+			'PL' => __('Poland', 'google-analytics-for-wordpress'),
+			'PT' => __('Portugal', 'google-analytics-for-wordpress'),
+			'PR' => __('Puerto Rico', 'google-analytics-for-wordpress'),
+			'QA' => __('Qatar', 'google-analytics-for-wordpress'),
+			'XK' => __('Republic of Kosovo', 'google-analytics-for-wordpress'),
+			'RE' => __('Reunion Island', 'google-analytics-for-wordpress'),
+			'RO' => __('Romania', 'google-analytics-for-wordpress'),
+			'RU' => __('Russian Federation', 'google-analytics-for-wordpress'),
+			'RW' => __('Rwanda', 'google-analytics-for-wordpress'),
+			'BL' => __('Saint Barthélemy', 'google-analytics-for-wordpress'),
+			'SH' => __('Saint Helena', 'google-analytics-for-wordpress'),
+			'KN' => __('Saint Kitts and Nevis', 'google-analytics-for-wordpress'),
+			'LC' => __('Saint Lucia', 'google-analytics-for-wordpress'),
+			'MF' => __('Saint Martin (French)', 'google-analytics-for-wordpress'),
+			'SX' => __('Saint Martin (Dutch)', 'google-analytics-for-wordpress'),
+			'PM' => __('Saint Pierre and Miquelon', 'google-analytics-for-wordpress'),
+			'VC' => __('Saint Vincent and the Grenadines', 'google-analytics-for-wordpress'),
+			'SM' => __('San Marino', 'google-analytics-for-wordpress'),
+			'ST' => __('São Tomé and Príncipe', 'google-analytics-for-wordpress'),
+			'SA' => __('Saudi Arabia', 'google-analytics-for-wordpress'),
+			'SN' => __('Senegal', 'google-analytics-for-wordpress'),
+			'RS' => __('Serbia', 'google-analytics-for-wordpress'),
+			'SC' => __('Seychelles', 'google-analytics-for-wordpress'),
+			'SL' => __('Sierra Leone', 'google-analytics-for-wordpress'),
+			'SG' => __('Singapore', 'google-analytics-for-wordpress'),
+			'SK' => __('Slovak Republic', 'google-analytics-for-wordpress'),
+			'SI' => __('Slovenia', 'google-analytics-for-wordpress'),
+			'SB' => __('Solomon Islands', 'google-analytics-for-wordpress'),
+			'SO' => __('Somalia', 'google-analytics-for-wordpress'),
+			'ZA' => __('South Africa', 'google-analytics-for-wordpress'),
+			'GS' => __('South Georgia', 'google-analytics-for-wordpress'),
+			'KR' => __('South Korea', 'google-analytics-for-wordpress'),
+			'SS' => __('South Sudan', 'google-analytics-for-wordpress'),
+			'ES' => __('Spain', 'google-analytics-for-wordpress'),
+			'LK' => __('Sri Lanka', 'google-analytics-for-wordpress'),
+			'SD' => __('Sudan', 'google-analytics-for-wordpress'),
+			'SR' => __('Suriname', 'google-analytics-for-wordpress'),
+			'SJ' => __('Svalbard and Jan Mayen Islands', 'google-analytics-for-wordpress'),
+			'SZ' => __('Swaziland', 'google-analytics-for-wordpress'),
+			'SE' => __('Sweden', 'google-analytics-for-wordpress'),
+			'CH' => __('Switzerland', 'google-analytics-for-wordpress'),
+			'SY' => __('Syrian Arab Republic', 'google-analytics-for-wordpress'),
+			'TW' => __('Taiwan', 'google-analytics-for-wordpress'),
+			'TJ' => __('Tajikistan', 'google-analytics-for-wordpress'),
+			'TZ' => __('Tanzania', 'google-analytics-for-wordpress'),
+			'TH' => __('Thailand', 'google-analytics-for-wordpress'),
+			'TL' => __('Timor-Leste', 'google-analytics-for-wordpress'),
+			'TG' => __('Togo', 'google-analytics-for-wordpress'),
+			'TK' => __('Tokelau', 'google-analytics-for-wordpress'),
+			'TO' => __('Tonga', 'google-analytics-for-wordpress'),
+			'TT' => __('Trinidad and Tobago', 'google-analytics-for-wordpress'),
+			'TN' => __('Tunisia', 'google-analytics-for-wordpress'),
+			'TR' => __('Turkey', 'google-analytics-for-wordpress'),
+			'TM' => __('Turkmenistan', 'google-analytics-for-wordpress'),
+			'TC' => __('Turks and Caicos Islands', 'google-analytics-for-wordpress'),
+			'TV' => __('Tuvalu', 'google-analytics-for-wordpress'),
+			'UG' => __('Uganda', 'google-analytics-for-wordpress'),
+			'UA' => __('Ukraine', 'google-analytics-for-wordpress'),
+			'AE' => __('United Arab Emirates', 'google-analytics-for-wordpress'),
+			'UY' => __('Uruguay', 'google-analytics-for-wordpress'),
+			'UM' => __('US Minor Outlying Islands', 'google-analytics-for-wordpress'),
+			'UZ' => __('Uzbekistan', 'google-analytics-for-wordpress'),
+			'VU' => __('Vanuatu', 'google-analytics-for-wordpress'),
+			'VE' => __('Venezuela', 'google-analytics-for-wordpress'),
+			'VN' => __('Vietnam', 'google-analytics-for-wordpress'),
+			'VG' => __('Virgin Islands (British)', 'google-analytics-for-wordpress'),
+			'VI' => __('Virgin Islands (USA)', 'google-analytics-for-wordpress'),
+			'WF' => __('Wallis and Futuna Islands', 'google-analytics-for-wordpress'),
+			'EH' => __('Western Sahara', 'google-analytics-for-wordpress'),
+			'WS' => __('Western Samoa', 'google-analytics-for-wordpress'),
+			'YE' => __('Yemen', 'google-analytics-for-wordpress'),
+			'ZM' => __('Zambia', 'google-analytics-for-wordpress'),
+			'ZW' => __('Zimbabwe', 'google-analytics-for-wordpress'),
 		);
 	} else {
 		$countries = array(
@@ -806,15 +806,15 @@ 
 	$wp_seo_active = false; // @todo: improve this check. This is from old Yoast code.
 	
 	// Makes sure is_plugin_active is available when called from front end
-	include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-	if ( is_plugin_active( 'wordpress-seo/wp-seo.php' ) || is_plugin_active( 'wordpress-seo-premium/wp-seo-premium.php' ) ) {
+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');
+	if (is_plugin_active('wordpress-seo/wp-seo.php') || is_plugin_active('wordpress-seo-premium/wp-seo-premium.php')) {
 		$wp_seo_active = true;
 	}
 	return $wp_seo_active;
 }
 
 function monsterinsights_get_asset_version() {
-	if ( monsterinsights_is_debug_mode() ) {
+	if (monsterinsights_is_debug_mode()) {
 		return time();
 	} else {
 		return MONSTERINSIGHTS_VERSION;
@@ -823,30 +823,30 @@ 
 
 function monsterinsights_is_debug_mode() {
 	$debug_mode = false;
-	if ( defined( 'MONSTERINSIGHTS_DEBUG_MODE' ) && MONSTERINSIGHTS_DEBUG_MODE ) {
+	if (defined('MONSTERINSIGHTS_DEBUG_MODE') && MONSTERINSIGHTS_DEBUG_MODE) {
 		$debug_mode = true;
 	}
 	
-	if ( monsterinsights_get_option( 'debug_mode', false ) ) {
+	if (monsterinsights_get_option('debug_mode', false)) {
 		$debug_mode = true;
 	}
 	
-	return apply_filters( 'monsterinsights_is_debug_mode', $debug_mode );
+	return apply_filters('monsterinsights_is_debug_mode', $debug_mode);
 }
 
 function monsterinsights_is_network_active() {
-	if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-		require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+	if ( ! function_exists('is_plugin_active_for_network')) {
+		require_once(ABSPATH . '/wp-admin/includes/plugin.php');
 	}
 	 
-	if ( is_multisite() && is_plugin_active_for_network( plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ) ) ) {
+	if (is_multisite() && is_plugin_active_for_network(plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE))) {
 	   return true;
 	} else {
 		return false;
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists('remove_class_filter')) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -864,10 +864,10 @@ 
 	 *
 	 * @return bool Whether the function is removed.
 	 */
-	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
+	function remove_class_filter($tag, $class_name = '', $method_name = '', $priority = 10) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset($wp_filter[$tag])) return FALSE;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -876,33 +876,33 @@ 
 		 *
 		 * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
 		 */
-		if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-			$callbacks = &$wp_filter[ $tag ]->callbacks;
+		if (is_object($wp_filter[$tag]) && isset($wp_filter[$tag]->callbacks)) {
+			$callbacks = &$wp_filter[$tag]->callbacks;
 		} else {
-			$callbacks = &$wp_filter[ $tag ];
+			$callbacks = &$wp_filter[$tag];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset($callbacks[$priority]) || empty($callbacks[$priority])) return FALSE;
 		// Loop through each filter for the specified priority, looking for our class & method
-		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
+		foreach ((array) $callbacks[$priority] as $filter_id => $filter) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset($filter['function']) || ! is_array($filter['function'])) continue;
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object($filter['function'][0])) continue;
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ($filter['function'][1] !== $method_name) continue;
 			// Method matched, now let's check the Class
-			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
+			if (get_class($filter['function'][0]) === $class_name) {
 				// Now let's remove it from the array
-				unset( $callbacks[ $priority ][ $filter_id ] );
+				unset($callbacks[$priority][$filter_id]);
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if (empty($callbacks[$priority])) unset($callbacks[$priority]);
 				// and if the only filter for that tag, set the tag to an empty array
-				if ( empty( $callbacks ) ) $callbacks = array();
+				if (empty($callbacks)) $callbacks = array();
 				// If using WordPress older than 4.7
-				if ( ! is_object( $wp_filter[ $tag ] ) ) {
+				if ( ! is_object($wp_filter[$tag])) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
-					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
+					unset($GLOBALS['merged_filters'][$tag]);
 				}
 				return TRUE;
 			}
@@ -911,7 +911,7 @@ 
 	}
 } // End function exists
 
-if ( ! function_exists ( 'remove_class_action' ) ) {
+if ( ! function_exists('remove_class_action')) {
 	/**
 	 * Remove Class Action Without Access to Class Object
 	 *
@@ -929,7 +929,7 @@ 
 	 *
 	 * @return bool               Whether the function is removed.
 	 */
-	function remove_class_action( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
-		remove_class_filter( $tag, $class_name, $method_name, $priority );
+	function remove_class_action($tag, $class_name = '', $method_name = '', $priority = 10) {
+		remove_class_filter($tag, $class_name, $method_name, $priority);
 	}
 } // End function exists
\ No newline at end of file

Indentation +763 added lines, -763 removed lines

@@ -11,68 +11,68 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 function monsterinsights_debug_output( $var ) {
-	error_log( print_r( $var, true ) . "\n", 3, MONSTERINSIGHTS_PLUGIN_DIR . 'log.txt' );
+    error_log( print_r( $var, true ) . "\n", 3, MONSTERINSIGHTS_PLUGIN_DIR . 'log.txt' );
 }
 
 function monsterinsights_is_page_reload() {
-	// Can't be a refresh without having a referrer
-	if ( ! isset( $_SERVER['HTTP_REFERER'] ) ) {
-		return false;
-	}
+    // Can't be a refresh without having a referrer
+    if ( ! isset( $_SERVER['HTTP_REFERER'] ) ) {
+        return false;
+    }
 
-	// IF the referrer is identical to the current page request, then it's a refresh
-	return ( parse_url( $_SERVER['HTTP_REFERER'], PHP_URL_PATH ) === parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) );
+    // IF the referrer is identical to the current page request, then it's a refresh
+    return ( parse_url( $_SERVER['HTTP_REFERER'], PHP_URL_PATH ) === parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ) );
 }
 
 
 function monsterinsights_track_user() {
-	$user        = wp_get_current_user();
-	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
-
-	if ( ! empty( $roles ) && is_array( $roles ) ) {
-		foreach ( $roles as $role ) {
-			if ( is_string( $role ) ) {
-				if ( current_user_can( $role ) ) {
-					$track_user = false;
-					break;
-				}
-			}
-		}
-	}
-
-	$track_super_admin = apply_filters( 'monsterinsights_track_super_admins', false );
-	if ( $track_super_admin === false && is_super_admin() ) {
-		$track_user = false;
-	}
+    $user        = wp_get_current_user();
+    $track_user  = true;
+    $roles     = monsterinsights_get_option( 'ignore_users', array() );
+
+    if ( ! empty( $roles ) && is_array( $roles ) ) {
+        foreach ( $roles as $role ) {
+            if ( is_string( $role ) ) {
+                if ( current_user_can( $role ) ) {
+                    $track_user = false;
+                    break;
+                }
+            }
+        }
+    }
+
+    $track_super_admin = apply_filters( 'monsterinsights_track_super_admins', false );
+    if ( $track_super_admin === false && is_super_admin() ) {
+        $track_user = false;
+    }
 	
-	// or if UA code is not entered
-	$ua_code = monsterinsights_get_ua();
-	if ( empty( $ua_code ) ) {
-		$track_user = false;
-	}
+    // or if UA code is not entered
+    $ua_code = monsterinsights_get_ua();
+    if ( empty( $ua_code ) ) {
+        $track_user = false;
+    }
 
-	return apply_filters( 'monsterinsights_track_user', $track_user, $user );
+    return apply_filters( 'monsterinsights_track_user', $track_user, $user );
 }
 
 function monsterinsights_get_client_id( $payment_id = false ) {
-	if ( is_object( $payment_id ) ) {
-		$payment_id = $payment_id->ID;
-	}
-	$user_cid    = monsterinsights_get_uuid();
-	$payment_cid = get_post_meta( $payment_id, '_yoast_gau_uuid', true );
-
-	if ( ! empty( $payment_id ) && ! empty( $saved_cid ) ) {
-		return $saved_cid;
-	} else if ( ! empty( $user_cid ) ) {
-		return $user_cid;
-	} else {
-		return monsterinsights_generate_uuid();
-	}
+    if ( is_object( $payment_id ) ) {
+        $payment_id = $payment_id->ID;
+    }
+    $user_cid    = monsterinsights_get_uuid();
+    $payment_cid = get_post_meta( $payment_id, '_yoast_gau_uuid', true );
+
+    if ( ! empty( $payment_id ) && ! empty( $saved_cid ) ) {
+        return $saved_cid;
+    } else if ( ! empty( $user_cid ) ) {
+        return $user_cid;
+    } else {
+        return monsterinsights_generate_uuid();
+    }
 }
 
 /**
@@ -85,30 +85,30 @@ 
  * @return bool|string False if cookie isn't set, GA UUID otherwise
  */
 function monsterinsights_get_uuid() {
-	if ( empty( $_COOKIE['_ga'] ) ) {
-		return false;
-	}
+    if ( empty( $_COOKIE['_ga'] ) ) {
+        return false;
+    }
 	
-	/** 
-	 * Example cookie formats:
-	 *
-	 * GA1.2.XXXXXXX.YYYYY
-	 * _ga=1.2.XXXXXXX.YYYYYY -- We want the XXXXXXX.YYYYYY part
-	 * 
-	 */
-
-	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
-	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
-		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
-		if ( is_string( $uuid ) ) {
-			return $uuid;
-		} else {
-			return false;
-		}
-	} else {
-		return false;
-	}
+    /** 
+     * Example cookie formats:
+     *
+     * GA1.2.XXXXXXX.YYYYY
+     * _ga=1.2.XXXXXXX.YYYYYY -- We want the XXXXXXX.YYYYYY part
+     * 
+     */
+
+    $ga_cookie    = $_COOKIE['_ga'];
+    $cookie_parts = explode('.', $ga_cookie );
+    if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
+        $uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
+        if ( is_string( $uuid ) ) {
+            return $uuid;
+        } else {
+            return false;
+        }
+    } else {
+        return false;
+    }
 }
 
 
@@ -122,26 +122,26 @@ 
  */
 function monsterinsights_generate_uuid() {
 
-	return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+    return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
 
-		// 32 bits for "time_low"
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
+        // 32 bits for "time_low"
+        mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
 
-		// 16 bits for "time_mid"
-		mt_rand( 0, 0xffff ),
+        // 16 bits for "time_mid"
+        mt_rand( 0, 0xffff ),
 
-		// 16 bits for "time_hi_and_version",
-		// four most significant bits holds version number 4
-		mt_rand( 0, 0x0fff ) | 0x4000,
+        // 16 bits for "time_hi_and_version",
+        // four most significant bits holds version number 4
+        mt_rand( 0, 0x0fff ) | 0x4000,
 
-		// 16 bits, 8 bits for "clk_seq_hi_res",
-		// 8 bits for "clk_seq_low",
-		// two most significant bits holds zero and one for variant DCE1.1
-		mt_rand( 0, 0x3fff ) | 0x8000,
+        // 16 bits, 8 bits for "clk_seq_hi_res",
+        // 8 bits for "clk_seq_low",
+        // two most significant bits holds zero and one for variant DCE1.1
+        mt_rand( 0, 0x3fff ) | 0x8000,
 
-		// 48 bits for "node"
-		mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-	);
+        // 48 bits for "node"
+        mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
+    );
 }
 
 /**
@@ -152,27 +152,27 @@ 
  * @return GA UUID or error code.
  */
 function monsterinsights_get_cookie( $debug = false ) {
-	if ( empty( $_COOKIE['_ga'] ) ) {
-		return ( $debug ) ? 'FCE' : false;
-	}
+    if ( empty( $_COOKIE['_ga'] ) ) {
+        return ( $debug ) ? 'FCE' : false;
+    }
 	
-	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
-	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
-		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
-		if ( is_string( $uuid ) ) {
-			return $ga_cookie;
-		} else {
-			return ( $debug ) ? 'FA' : false;
-		}
-	} else {
-		return ( $debug ) ? 'FAE' : false;
-	}
+    $ga_cookie    = $_COOKIE['_ga'];
+    $cookie_parts = explode('.', $ga_cookie );
+    if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
+        $uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
+        if ( is_string( $uuid ) ) {
+            return $ga_cookie;
+        } else {
+            return ( $debug ) ? 'FA' : false;
+        }
+    } else {
+        return ( $debug ) ? 'FAE' : false;
+    }
 }
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+    return rand(100000000,999999999) . '.' . time();
 }
  
 
@@ -188,13 +188,13 @@ 
  * @return int Hours between the two timestamps, rounded.
  */
 function monsterinsights_hours_between( $start, $stop = false ) {
-	if ( $stop === false ) {
-		$stop = time();
-	}
+    if ( $stop === false ) {
+        $stop = time();
+    }
 
-	$diff = (int) abs( $stop -  $start );
-	$hours = round( $diff / HOUR_IN_SECONDS );
-	return $hours;
+    $diff = (int) abs( $stop -  $start );
+    $hours = round( $diff / HOUR_IN_SECONDS );
+    return $hours;
 }
 
 /**
@@ -223,11 +223,11 @@ 
  * @return bool True if pro version.
  */
 function monsterinsights_is_pro_version() {
-	if ( class_exists( 'MonsterInsights' ) ) {
-		return true;
-	} else {
-		return false;
-	}
+    if ( class_exists( 'MonsterInsights' ) ) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 
@@ -237,699 +237,699 @@ 
  * @return array
  */
 function monsterinsights_get_roles() {
-	global $wp_roles;
+    global $wp_roles;
 
-	$all_roles = $wp_roles->roles;
-	$roles     = array();
+    $all_roles = $wp_roles->roles;
+    $roles     = array();
 
-	/**
-	 * Filter: 'editable_roles' - Allows filtering of the roles shown within the plugin (and elsewhere in WP as it's a WP filter)
-	 *
-	 * @api array $all_roles
-	 */
-	$editable_roles = apply_filters( 'editable_roles', $all_roles );
+    /**
+     * Filter: 'editable_roles' - Allows filtering of the roles shown within the plugin (and elsewhere in WP as it's a WP filter)
+     *
+     * @api array $all_roles
+     */
+    $editable_roles = apply_filters( 'editable_roles', $all_roles );
 
-	foreach ( $editable_roles as $id => $name ) {
-		$roles[ $id ] = translate_user_role( $name['name'] );
-	}
+    foreach ( $editable_roles as $id => $name ) {
+        $roles[ $id ] = translate_user_role( $name['name'] );
+    }
 
-	return $roles;
+    return $roles;
 }
 
 /** Need to escape in advance of passing in $text. */
 function monsterinsights_get_message( $type = 'error', $text = '' ) {
-	$div = '';
-	if ( $type === 'error' || $type === 'alert' || $type === 'success' || $type === 'info' ) {
-		$base = MonsterInsights();
-		return $base->notices->display_inline_notice( 'monsterinsights_standard_notice', '', $text, $type, false, array( 'skip_message_escape' => true ) );
-	} else {
-		return '';
-	}
+    $div = '';
+    if ( $type === 'error' || $type === 'alert' || $type === 'success' || $type === 'info' ) {
+        $base = MonsterInsights();
+        return $base->notices->display_inline_notice( 'monsterinsights_standard_notice', '', $text, $type, false, array( 'skip_message_escape' => true ) );
+    } else {
+        return '';
+    }
 }
 
 // Set cookie to expire in 2 years
 function monsterinsights_get_cookie_expiration_date( $time ) {
-	return date('D, j F Y H:i:s', time() + $time );
+    return date('D, j F Y H:i:s', time() + $time );
 }
 
 function monsterinsights_string_ends_with( $string, $ending ) {
-	$strlen = strlen($string);
-	$endinglen = strlen($ending);
-	if ( $endinglen > $strlen ) {
-		return false;
-	}
-	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
+    $strlen = strlen($string);
+    $endinglen = strlen($ending);
+    if ( $endinglen > $strlen ) {
+        return false;
+    }
+    return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
 }
 
 function monsterinsights_string_starts_with( $string, $start ) {
-	return substr( $string, 0, strlen( $start ) ) === $start;
+    return substr( $string, 0, strlen( $start ) ) === $start;
 }
 
 function monsterinsights_get_country_list( $translated = false ) {
-	if ( $translated ) {
-		$countries = array(
-			''   => '',
-			'US' => __( 'United States', 'google-analytics-for-wordpress' ),
-			'CA' => __( 'Canada', 'google-analytics-for-wordpress' ),
-			'GB' => __( 'United Kingdom', 'google-analytics-for-wordpress' ),
-			'AF' => __( 'Afghanistan', 'google-analytics-for-wordpress' ),
-			'AX' => __( 'Åland Islands', 'google-analytics-for-wordpress' ),
-			'AL' => __( 'Albania', 'google-analytics-for-wordpress' ),
-			'DZ' => __( 'Algeria', 'google-analytics-for-wordpress' ),
-			'AS' => __( 'American Samoa', 'google-analytics-for-wordpress' ),
-			'AD' => __( 'Andorra', 'google-analytics-for-wordpress' ),
-			'AO' => __( 'Angola', 'google-analytics-for-wordpress' ),
-			'AI' => __( 'Anguilla', 'google-analytics-for-wordpress' ),
-			'AQ' => __( 'Antarctica', 'google-analytics-for-wordpress' ),
-			'AG' => __( 'Antigua and Barbuda', 'google-analytics-for-wordpress' ),
-			'AR' => __( 'Argentina', 'google-analytics-for-wordpress' ),
-			'AM' => __( 'Armenia', 'google-analytics-for-wordpress' ),
-			'AW' => __( 'Aruba', 'google-analytics-for-wordpress' ),
-			'AU' => __( 'Australia', 'google-analytics-for-wordpress' ),
-			'AT' => __( 'Austria', 'google-analytics-for-wordpress' ),
-			'AZ' => __( 'Azerbaijan', 'google-analytics-for-wordpress' ),
-			'BS' => __( 'Bahamas', 'google-analytics-for-wordpress' ),
-			'BH' => __( 'Bahrain', 'google-analytics-for-wordpress' ),
-			'BD' => __( 'Bangladesh', 'google-analytics-for-wordpress' ),
-			'BB' => __( 'Barbados', 'google-analytics-for-wordpress' ),
-			'BY' => __( 'Belarus', 'google-analytics-for-wordpress' ),
-			'BE' => __( 'Belgium', 'google-analytics-for-wordpress' ),
-			'BZ' => __( 'Belize', 'google-analytics-for-wordpress' ),
-			'BJ' => __( 'Benin', 'google-analytics-for-wordpress' ),
-			'BM' => __( 'Bermuda', 'google-analytics-for-wordpress' ),
-			'BT' => __( 'Bhutan', 'google-analytics-for-wordpress' ),
-			'BO' => __( 'Bolivia', 'google-analytics-for-wordpress' ),
-			'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'google-analytics-for-wordpress' ),
-			'BA' => __( 'Bosnia and Herzegovina', 'google-analytics-for-wordpress' ),
-			'BW' => __( 'Botswana', 'google-analytics-for-wordpress' ),
-			'BV' => __( 'Bouvet Island', 'google-analytics-for-wordpress' ),
-			'BR' => __( 'Brazil', 'google-analytics-for-wordpress' ),
-			'IO' => __( 'British Indian Ocean Territory', 'google-analytics-for-wordpress' ),
-			'BN' => __( 'Brunei Darrussalam', 'google-analytics-for-wordpress' ),
-			'BG' => __( 'Bulgaria', 'google-analytics-for-wordpress' ),
-			'BF' => __( 'Burkina Faso', 'google-analytics-for-wordpress' ),
-			'BI' => __( 'Burundi', 'google-analytics-for-wordpress' ),
-			'KH' => __( 'Cambodia', 'google-analytics-for-wordpress' ),
-			'CM' => __( 'Cameroon', 'google-analytics-for-wordpress' ),
-			'CV' => __( 'Cape Verde', 'google-analytics-for-wordpress' ),
-			'KY' => __( 'Cayman Islands', 'google-analytics-for-wordpress' ),
-			'CF' => __( 'Central African Republic', 'google-analytics-for-wordpress' ),
-			'TD' => __( 'Chad', 'google-analytics-for-wordpress' ),
-			'CL' => __( 'Chile', 'google-analytics-for-wordpress' ),
-			'CN' => __( 'China', 'google-analytics-for-wordpress' ),
-			'CX' => __( 'Christmas Island', 'google-analytics-for-wordpress' ),
-			'CC' => __( 'Cocos Islands', 'google-analytics-for-wordpress' ),
-			'CO' => __( 'Colombia', 'google-analytics-for-wordpress' ),
-			'KM' => __( 'Comoros', 'google-analytics-for-wordpress' ),
-			'CD' => __( 'Congo, Democratic People\'s Republic', 'google-analytics-for-wordpress' ),
-			'CG' => __( 'Congo, Republic of', 'google-analytics-for-wordpress' ),
-			'CK' => __( 'Cook Islands', 'google-analytics-for-wordpress' ),
-			'CR' => __( 'Costa Rica', 'google-analytics-for-wordpress' ),
-			'CI' => __( 'Cote d\'Ivoire', 'google-analytics-for-wordpress' ),
-			'HR' => __( 'Croatia/Hrvatska', 'google-analytics-for-wordpress' ),
-			'CU' => __( 'Cuba', 'google-analytics-for-wordpress' ),
-			'CW' => __( 'CuraÇao', 'google-analytics-for-wordpress' ),
-			'CY' => __( 'Cyprus', 'google-analytics-for-wordpress' ),
-			'CZ' => __( 'Czechia', 'google-analytics-for-wordpress' ),
-			'DK' => __( 'Denmark', 'google-analytics-for-wordpress' ),
-			'DJ' => __( 'Djibouti', 'google-analytics-for-wordpress' ),
-			'DM' => __( 'Dominica', 'google-analytics-for-wordpress' ),
-			'DO' => __( 'Dominican Republic', 'google-analytics-for-wordpress' ),
-			'TP' => __( 'East Timor', 'google-analytics-for-wordpress' ),
-			'EC' => __( 'Ecuador', 'google-analytics-for-wordpress' ),
-			'EG' => __( 'Egypt', 'google-analytics-for-wordpress' ),
-			'GQ' => __( 'Equatorial Guinea', 'google-analytics-for-wordpress' ),
-			'SV' => __( 'El Salvador', 'google-analytics-for-wordpress' ),
-			'ER' => __( 'Eritrea', 'google-analytics-for-wordpress' ),
-			'EE' => __( 'Estonia', 'google-analytics-for-wordpress' ),
-			'ET' => __( 'Ethiopia', 'google-analytics-for-wordpress' ),
-			'FK' => __( 'Falkland Islands', 'google-analytics-for-wordpress' ),
-			'FO' => __( 'Faroe Islands', 'google-analytics-for-wordpress' ),
-			'FJ' => __( 'Fiji', 'google-analytics-for-wordpress' ),
-			'FI' => __( 'Finland', 'google-analytics-for-wordpress' ),
-			'FR' => __( 'France', 'google-analytics-for-wordpress' ),
-			'GF' => __( 'French Guiana', 'google-analytics-for-wordpress' ),
-			'PF' => __( 'French Polynesia', 'google-analytics-for-wordpress' ),
-			'TF' => __( 'French Southern Territories', 'google-analytics-for-wordpress' ),
-			'GA' => __( 'Gabon', 'google-analytics-for-wordpress' ),
-			'GM' => __( 'Gambia', 'google-analytics-for-wordpress' ),
-			'GE' => __( 'Georgia', 'google-analytics-for-wordpress' ),
-			'DE' => __( 'Germany', 'google-analytics-for-wordpress' ),
-			'GR' => __( 'Greece', 'google-analytics-for-wordpress' ),
-			'GH' => __( 'Ghana', 'google-analytics-for-wordpress' ),
-			'GI' => __( 'Gibraltar', 'google-analytics-for-wordpress' ),
-			'GL' => __( 'Greenland', 'google-analytics-for-wordpress' ),
-			'GD' => __( 'Grenada', 'google-analytics-for-wordpress' ),
-			'GP' => __( 'Guadeloupe', 'google-analytics-for-wordpress' ),
-			'GU' => __( 'Guam', 'google-analytics-for-wordpress' ),
-			'GT' => __( 'Guatemala', 'google-analytics-for-wordpress' ),
-			'GG' => __( 'Guernsey', 'google-analytics-for-wordpress' ),
-			'GN' => __( 'Guinea', 'google-analytics-for-wordpress' ),
-			'GW' => __( 'Guinea-Bissau', 'google-analytics-for-wordpress' ),
-			'GY' => __( 'Guyana', 'google-analytics-for-wordpress' ),
-			'HT' => __( 'Haiti', 'google-analytics-for-wordpress' ),
-			'HM' => __( 'Heard and McDonald Islands', 'google-analytics-for-wordpress' ),
-			'VA' => __( 'Holy See (City Vatican State)', 'google-analytics-for-wordpress' ),
-			'HN' => __( 'Honduras', 'google-analytics-for-wordpress' ),
-			'HK' => __( 'Hong Kong', 'google-analytics-for-wordpress' ),
-			'HU' => __( 'Hungary', 'google-analytics-for-wordpress' ),
-			'IS' => __( 'Iceland', 'google-analytics-for-wordpress' ),
-			'IN' => __( 'India', 'google-analytics-for-wordpress' ),
-			'ID' => __( 'Indonesia', 'google-analytics-for-wordpress' ),
-			'IR' => __( 'Iran', 'google-analytics-for-wordpress' ),
-			'IQ' => __( 'Iraq', 'google-analytics-for-wordpress' ),
-			'IE' => __( 'Ireland', 'google-analytics-for-wordpress' ),
-			'IM' => __( 'Isle of Man', 'google-analytics-for-wordpress' ),
-			'IL' => __( 'Israel', 'google-analytics-for-wordpress' ),
-			'IT' => __( 'Italy', 'google-analytics-for-wordpress' ),
-			'JM' => __( 'Jamaica', 'google-analytics-for-wordpress' ),
-			'JP' => __( 'Japan', 'google-analytics-for-wordpress' ),
-			'JE' => __( 'Jersey', 'google-analytics-for-wordpress' ),
-			'JO' => __( 'Jordan', 'google-analytics-for-wordpress' ),
-			'KZ' => __( 'Kazakhstan', 'google-analytics-for-wordpress' ),
-			'KE' => __( 'Kenya', 'google-analytics-for-wordpress' ),
-			'KI' => __( 'Kiribati', 'google-analytics-for-wordpress' ),
-			'KW' => __( 'Kuwait', 'google-analytics-for-wordpress' ),
-			'KG' => __( 'Kyrgyzstan', 'google-analytics-for-wordpress' ),
-			'LA' => __( 'Lao People\'s Democratic Republic', 'google-analytics-for-wordpress' ),
-			'LV' => __( 'Latvia', 'google-analytics-for-wordpress' ),
-			'LB' => __( 'Lebanon', 'google-analytics-for-wordpress' ),
-			'LS' => __( 'Lesotho', 'google-analytics-for-wordpress' ),
-			'LR' => __( 'Liberia', 'google-analytics-for-wordpress' ),
-			'LY' => __( 'Libyan Arab Jamahiriya', 'google-analytics-for-wordpress' ),
-			'LI' => __( 'Liechtenstein', 'google-analytics-for-wordpress' ),
-			'LT' => __( 'Lithuania', 'google-analytics-for-wordpress' ),
-			'LU' => __( 'Luxembourg', 'google-analytics-for-wordpress' ),
-			'MO' => __( 'Macau', 'google-analytics-for-wordpress' ),
-			'MK' => __( 'Macedonia', 'google-analytics-for-wordpress' ),
-			'MG' => __( 'Madagascar', 'google-analytics-for-wordpress' ),
-			'MW' => __( 'Malawi', 'google-analytics-for-wordpress' ),
-			'MY' => __( 'Malaysia', 'google-analytics-for-wordpress' ),
-			'MV' => __( 'Maldives', 'google-analytics-for-wordpress' ),
-			'ML' => __( 'Mali', 'google-analytics-for-wordpress' ),
-			'MT' => __( 'Malta', 'google-analytics-for-wordpress' ),
-			'MH' => __( 'Marshall Islands', 'google-analytics-for-wordpress' ),
-			'MQ' => __( 'Martinique', 'google-analytics-for-wordpress' ),
-			'MR' => __( 'Mauritania', 'google-analytics-for-wordpress' ),
-			'MU' => __( 'Mauritius', 'google-analytics-for-wordpress' ),
-			'YT' => __( 'Mayotte', 'google-analytics-for-wordpress' ),
-			'MX' => __( 'Mexico', 'google-analytics-for-wordpress' ),
-			'FM' => __( 'Micronesia', 'google-analytics-for-wordpress' ),
-			'MD' => __( 'Moldova, Republic of', 'google-analytics-for-wordpress' ),
-			'MC' => __( 'Monaco', 'google-analytics-for-wordpress' ),
-			'MN' => __( 'Mongolia', 'google-analytics-for-wordpress' ),
-			'ME' => __( 'Montenegro', 'google-analytics-for-wordpress' ),
-			'MS' => __( 'Montserrat', 'google-analytics-for-wordpress' ),
-			'MA' => __( 'Morocco', 'google-analytics-for-wordpress' ),
-			'MZ' => __( 'Mozambique', 'google-analytics-for-wordpress' ),
-			'MM' => __( 'Myanmar', 'google-analytics-for-wordpress' ),
-			'NA' => __( 'Namibia', 'google-analytics-for-wordpress' ),
-			'NR' => __( 'Nauru', 'google-analytics-for-wordpress' ),
-			'NP' => __( 'Nepal', 'google-analytics-for-wordpress' ),
-			'NL' => __( 'Netherlands', 'google-analytics-for-wordpress' ),
-			'AN' => __( 'Netherlands Antilles', 'google-analytics-for-wordpress' ),
-			'NC' => __( 'New Caledonia', 'google-analytics-for-wordpress' ),
-			'NZ' => __( 'New Zealand', 'google-analytics-for-wordpress' ),
-			'NI' => __( 'Nicaragua', 'google-analytics-for-wordpress' ),
-			'NE' => __( 'Niger', 'google-analytics-for-wordpress' ),
-			'NG' => __( 'Nigeria', 'google-analytics-for-wordpress' ),
-			'NU' => __( 'Niue', 'google-analytics-for-wordpress' ),
-			'NF' => __( 'Norfolk Island', 'google-analytics-for-wordpress' ),
-			'KP' => __( 'North Korea', 'google-analytics-for-wordpress' ),
-			'MP' => __( 'Northern Mariana Islands', 'google-analytics-for-wordpress' ),
-			'NO' => __( 'Norway', 'google-analytics-for-wordpress' ),
-			'OM' => __( 'Oman', 'google-analytics-for-wordpress' ),
-			'PK' => __( 'Pakistan', 'google-analytics-for-wordpress' ),
-			'PW' => __( 'Palau', 'google-analytics-for-wordpress' ),
-			'PS' => __( 'Palestinian Territories', 'google-analytics-for-wordpress' ),
-			'PA' => __( 'Panama', 'google-analytics-for-wordpress' ),
-			'PG' => __( 'Papua New Guinea', 'google-analytics-for-wordpress' ),
-			'PY' => __( 'Paraguay', 'google-analytics-for-wordpress' ),
-			'PE' => __( 'Peru', 'google-analytics-for-wordpress' ),
-			'PH' => __( 'Philippines', 'google-analytics-for-wordpress' ),
-			'PN' => __( 'Pitcairn Island', 'google-analytics-for-wordpress' ),
-			'PL' => __( 'Poland', 'google-analytics-for-wordpress' ),
-			'PT' => __( 'Portugal', 'google-analytics-for-wordpress' ),
-			'PR' => __( 'Puerto Rico', 'google-analytics-for-wordpress' ),
-			'QA' => __( 'Qatar', 'google-analytics-for-wordpress' ),
-			'XK' => __( 'Republic of Kosovo', 'google-analytics-for-wordpress' ),
-			'RE' => __( 'Reunion Island', 'google-analytics-for-wordpress' ),
-			'RO' => __( 'Romania', 'google-analytics-for-wordpress' ),
-			'RU' => __( 'Russian Federation', 'google-analytics-for-wordpress' ),
-			'RW' => __( 'Rwanda', 'google-analytics-for-wordpress' ),
-			'BL' => __( 'Saint Barthélemy', 'google-analytics-for-wordpress' ),
-			'SH' => __( 'Saint Helena', 'google-analytics-for-wordpress' ),
-			'KN' => __( 'Saint Kitts and Nevis', 'google-analytics-for-wordpress' ),
-			'LC' => __( 'Saint Lucia', 'google-analytics-for-wordpress' ),
-			'MF' => __( 'Saint Martin (French)', 'google-analytics-for-wordpress' ),
-			'SX' => __( 'Saint Martin (Dutch)', 'google-analytics-for-wordpress' ),
-			'PM' => __( 'Saint Pierre and Miquelon', 'google-analytics-for-wordpress' ),
-			'VC' => __( 'Saint Vincent and the Grenadines', 'google-analytics-for-wordpress' ),
-			'SM' => __( 'San Marino', 'google-analytics-for-wordpress' ),
-			'ST' => __( 'São Tomé and Príncipe', 'google-analytics-for-wordpress' ),
-			'SA' => __( 'Saudi Arabia', 'google-analytics-for-wordpress' ),
-			'SN' => __( 'Senegal', 'google-analytics-for-wordpress' ),
-			'RS' => __( 'Serbia', 'google-analytics-for-wordpress' ),
-			'SC' => __( 'Seychelles', 'google-analytics-for-wordpress' ),
-			'SL' => __( 'Sierra Leone', 'google-analytics-for-wordpress' ),
-			'SG' => __( 'Singapore', 'google-analytics-for-wordpress' ),
-			'SK' => __( 'Slovak Republic', 'google-analytics-for-wordpress' ),
-			'SI' => __( 'Slovenia', 'google-analytics-for-wordpress' ),
-			'SB' => __( 'Solomon Islands', 'google-analytics-for-wordpress' ),
-			'SO' => __( 'Somalia', 'google-analytics-for-wordpress' ),
-			'ZA' => __( 'South Africa', 'google-analytics-for-wordpress' ),
-			'GS' => __( 'South Georgia', 'google-analytics-for-wordpress' ),
-			'KR' => __( 'South Korea', 'google-analytics-for-wordpress' ),
-			'SS' => __( 'South Sudan', 'google-analytics-for-wordpress' ),
-			'ES' => __( 'Spain', 'google-analytics-for-wordpress' ),
-			'LK' => __( 'Sri Lanka', 'google-analytics-for-wordpress' ),
-			'SD' => __( 'Sudan', 'google-analytics-for-wordpress' ),
-			'SR' => __( 'Suriname', 'google-analytics-for-wordpress' ),
-			'SJ' => __( 'Svalbard and Jan Mayen Islands', 'google-analytics-for-wordpress' ),
-			'SZ' => __( 'Swaziland', 'google-analytics-for-wordpress' ),
-			'SE' => __( 'Sweden', 'google-analytics-for-wordpress' ),
-			'CH' => __( 'Switzerland', 'google-analytics-for-wordpress' ),
-			'SY' => __( 'Syrian Arab Republic', 'google-analytics-for-wordpress' ),
-			'TW' => __( 'Taiwan', 'google-analytics-for-wordpress' ),
-			'TJ' => __( 'Tajikistan', 'google-analytics-for-wordpress' ),
-			'TZ' => __( 'Tanzania', 'google-analytics-for-wordpress' ),
-			'TH' => __( 'Thailand', 'google-analytics-for-wordpress' ),
-			'TL' => __( 'Timor-Leste', 'google-analytics-for-wordpress' ),
-			'TG' => __( 'Togo', 'google-analytics-for-wordpress' ),
-			'TK' => __( 'Tokelau', 'google-analytics-for-wordpress' ),
-			'TO' => __( 'Tonga', 'google-analytics-for-wordpress' ),
-			'TT' => __( 'Trinidad and Tobago', 'google-analytics-for-wordpress' ),
-			'TN' => __( 'Tunisia', 'google-analytics-for-wordpress' ),
-			'TR' => __( 'Turkey', 'google-analytics-for-wordpress' ),
-			'TM' => __( 'Turkmenistan', 'google-analytics-for-wordpress' ),
-			'TC' => __( 'Turks and Caicos Islands', 'google-analytics-for-wordpress' ),
-			'TV' => __( 'Tuvalu', 'google-analytics-for-wordpress' ),
-			'UG' => __( 'Uganda', 'google-analytics-for-wordpress' ),
-			'UA' => __( 'Ukraine', 'google-analytics-for-wordpress' ),
-			'AE' => __( 'United Arab Emirates', 'google-analytics-for-wordpress' ),
-			'UY' => __( 'Uruguay', 'google-analytics-for-wordpress' ),
-			'UM' => __( 'US Minor Outlying Islands', 'google-analytics-for-wordpress' ),
-			'UZ' => __( 'Uzbekistan', 'google-analytics-for-wordpress' ),
-			'VU' => __( 'Vanuatu', 'google-analytics-for-wordpress' ),
-			'VE' => __( 'Venezuela', 'google-analytics-for-wordpress' ),
-			'VN' => __( 'Vietnam', 'google-analytics-for-wordpress' ),
-			'VG' => __( 'Virgin Islands (British)', 'google-analytics-for-wordpress' ),
-			'VI' => __( 'Virgin Islands (USA)', 'google-analytics-for-wordpress' ),
-			'WF' => __( 'Wallis and Futuna Islands', 'google-analytics-for-wordpress' ),
-			'EH' => __( 'Western Sahara', 'google-analytics-for-wordpress' ),
-			'WS' => __( 'Western Samoa', 'google-analytics-for-wordpress' ),
-			'YE' => __( 'Yemen', 'google-analytics-for-wordpress' ),
-			'ZM' => __( 'Zambia', 'google-analytics-for-wordpress' ),
-			'ZW' => __( 'Zimbabwe', 'google-analytics-for-wordpress' ),
-		);
-	} else {
-		$countries = array(
-			''   => '',
-			'US' => 'United States',
-			'CA' => 'Canada',
-			'GB' => 'United Kingdom',
-			'AF' => 'Afghanistan',
-			'AX' => 'Åland Islands',
-			'AL' => 'Albania',
-			'DZ' => 'Algeria',
-			'AS' => 'American Samoa',
-			'AD' => 'Andorra',
-			'AO' => 'Angola',
-			'AI' => 'Anguilla',
-			'AQ' => 'Antarctica',
-			'AG' => 'Antigua and Barbuda',
-			'AR' => 'Argentina',
-			'AM' => 'Armenia',
-			'AW' => 'Aruba',
-			'AU' => 'Australia',
-			'AT' => 'Austria',
-			'AZ' => 'Azerbaijan',
-			'BS' => 'Bahamas',
-			'BH' => 'Bahrain',
-			'BD' => 'Bangladesh',
-			'BB' => 'Barbados',
-			'BY' => 'Belarus',
-			'BE' => 'Belgium',
-			'BZ' => 'Belize',
-			'BJ' => 'Benin',
-			'BM' => 'Bermuda',
-			'BT' => 'Bhutan',
-			'BO' => 'Bolivia',
-			'BQ' => 'Bonaire, Saint Eustatius and Saba',
-			'BA' => 'Bosnia and Herzegovina',
-			'BW' => 'Botswana',
-			'BV' => 'Bouvet Island',
-			'BR' => 'Brazil',
-			'IO' => 'British Indian Ocean Territory',
-			'BN' => 'Brunei Darrussalam',
-			'BG' => 'Bulgaria',
-			'BF' => 'Burkina Faso',
-			'BI' => 'Burundi',
-			'KH' => 'Cambodia',
-			'CM' => 'Cameroon',
-			'CV' => 'Cape Verde',
-			'KY' => 'Cayman Islands',
-			'CF' => 'Central African Republic',
-			'TD' => 'Chad',
-			'CL' => 'Chile',
-			'CN' => 'China',
-			'CX' => 'Christmas Island',
-			'CC' => 'Cocos Islands',
-			'CO' => 'Colombia',
-			'KM' => 'Comoros',
-			'CD' => 'Congo, Democratic People\'s Republic',
-			'CG' => 'Congo, Republic of',
-			'CK' => 'Cook Islands',
-			'CR' => 'Costa Rica',
-			'CI' => 'Cote d\'Ivoire',
-			'HR' => 'Croatia/Hrvatska',
-			'CU' => 'Cuba',
-			'CW' => 'CuraÇao',
-			'CY' => 'Cyprus',
-			'CZ' => 'Czechia',
-			'DK' => 'Denmark',
-			'DJ' => 'Djibouti',
-			'DM' => 'Dominica',
-			'DO' => 'Dominican Republic',
-			'TP' => 'East Timor',
-			'EC' => 'Ecuador',
-			'EG' => 'Egypt',
-			'GQ' => 'Equatorial Guinea',
-			'SV' => 'El Salvador',
-			'ER' => 'Eritrea',
-			'EE' => 'Estonia',
-			'ET' => 'Ethiopia',
-			'FK' => 'Falkland Islands',
-			'FO' => 'Faroe Islands',
-			'FJ' => 'Fiji',
-			'FI' => 'Finland',
-			'FR' => 'France',
-			'GF' => 'French Guiana',
-			'PF' => 'French Polynesia',
-			'TF' => 'French Southern Territories',
-			'GA' => 'Gabon',
-			'GM' => 'Gambia',
-			'GE' => 'Georgia',
-			'DE' => 'Germany',
-			'GR' => 'Greece',
-			'GH' => 'Ghana',
-			'GI' => 'Gibraltar',
-			'GL' => 'Greenland',
-			'GD' => 'Grenada',
-			'GP' => 'Guadeloupe',
-			'GU' => 'Guam',
-			'GT' => 'Guatemala',
-			'GG' => 'Guernsey',
-			'GN' => 'Guinea',
-			'GW' => 'Guinea-Bissau',
-			'GY' => 'Guyana',
-			'HT' => 'Haiti',
-			'HM' => 'Heard and McDonald Islands',
-			'VA' => 'Holy See (City Vatican State)',
-			'HN' => 'Honduras',
-			'HK' => 'Hong Kong',
-			'HU' => 'Hungary',
-			'IS' => 'Iceland',
-			'IN' => 'India',
-			'ID' => 'Indonesia',
-			'IR' => 'Iran',
-			'IQ' => 'Iraq',
-			'IE' => 'Ireland',
-			'IM' => 'Isle of Man',
-			'IL' => 'Israel',
-			'IT' => 'Italy',
-			'JM' => 'Jamaica',
-			'JP' => 'Japan',
-			'JE' => 'Jersey',
-			'JO' => 'Jordan',
-			'KZ' => 'Kazakhstan',
-			'KE' => 'Kenya',
-			'KI' => 'Kiribati',
-			'KW' => 'Kuwait',
-			'KG' => 'Kyrgyzstan',
-			'LA' => 'Lao People\'s Democratic Republic',
-			'LV' => 'Latvia',
-			'LB' => 'Lebanon',
-			'LS' => 'Lesotho',
-			'LR' => 'Liberia',
-			'LY' => 'Libyan Arab Jamahiriya',
-			'LI' => 'Liechtenstein',
-			'LT' => 'Lithuania',
-			'LU' => 'Luxembourg',
-			'MO' => 'Macau',
-			'MK' => 'Macedonia',
-			'MG' => 'Madagascar',
-			'MW' => 'Malawi',
-			'MY' => 'Malaysia',
-			'MV' => 'Maldives',
-			'ML' => 'Mali',
-			'MT' => 'Malta',
-			'MH' => 'Marshall Islands',
-			'MQ' => 'Martinique',
-			'MR' => 'Mauritania',
-			'MU' => 'Mauritius',
-			'YT' => 'Mayotte',
-			'MX' => 'Mexico',
-			'FM' => 'Micronesia',
-			'MD' => 'Moldova, Republic of',
-			'MC' => 'Monaco',
-			'MN' => 'Mongolia',
-			'ME' => 'Montenegro',
-			'MS' => 'Montserrat',
-			'MA' => 'Morocco',
-			'MZ' => 'Mozambique',
-			'MM' => 'Myanmar',
-			'NA' => 'Namibia',
-			'NR' => 'Nauru',
-			'NP' => 'Nepal',
-			'NL' => 'Netherlands',
-			'AN' => 'Netherlands Antilles',
-			'NC' => 'New Caledonia',
-			'NZ' => 'New Zealand',
-			'NI' => 'Nicaragua',
-			'NE' => 'Niger',
-			'NG' => 'Nigeria',
-			'NU' => 'Niue',
-			'NF' => 'Norfolk Island',
-			'KP' => 'North Korea',
-			'MP' => 'Northern Mariana Islands',
-			'NO' => 'Norway',
-			'OM' => 'Oman',
-			'PK' => 'Pakistan',
-			'PW' => 'Palau',
-			'PS' => 'Palestinian Territories',
-			'PA' => 'Panama',
-			'PG' => 'Papua New Guinea',
-			'PY' => 'Paraguay',
-			'PE' => 'Peru',
-			'PH' => 'Philippines',
-			'PN' => 'Pitcairn Island',
-			'PL' => 'Poland',
-			'PT' => 'Portugal',
-			'PR' => 'Puerto Rico',
-			'QA' => 'Qatar',
-			'XK' => 'Republic of Kosovo',
-			'RE' => 'Reunion Island',
-			'RO' => 'Romania',
-			'RU' => 'Russian Federation',
-			'RW' => 'Rwanda',
-			'BL' => 'Saint Barthélemy',
-			'SH' => 'Saint Helena',
-			'KN' => 'Saint Kitts and Nevis',
-			'LC' => 'Saint Lucia',
-			'MF' => 'Saint Martin (French)',
-			'SX' => 'Saint Martin (Dutch)',
-			'PM' => 'Saint Pierre and Miquelon',
-			'VC' => 'Saint Vincent and the Grenadines',
-			'SM' => 'San Marino',
-			'ST' => 'São Tomé and Príncipe',
-			'SA' => 'Saudi Arabia',
-			'SN' => 'Senegal',
-			'RS' => 'Serbia',
-			'SC' => 'Seychelles',
-			'SL' => 'Sierra Leone',
-			'SG' => 'Singapore',
-			'SK' => 'Slovak Republic',
-			'SI' => 'Slovenia',
-			'SB' => 'Solomon Islands',
-			'SO' => 'Somalia',
-			'ZA' => 'South Africa',
-			'GS' => 'South Georgia',
-			'KR' => 'South Korea',
-			'SS' => 'South Sudan',
-			'ES' => 'Spain',
-			'LK' => 'Sri Lanka',
-			'SD' => 'Sudan',
-			'SR' => 'Suriname',
-			'SJ' => 'Svalbard and Jan Mayen Islands',
-			'SZ' => 'Swaziland',
-			'SE' => 'Sweden',
-			'CH' => 'Switzerland',
-			'SY' => 'Syrian Arab Republic',
-			'TW' => 'Taiwan',
-			'TJ' => 'Tajikistan',
-			'TZ' => 'Tanzania',
-			'TH' => 'Thailand',
-			'TL' => 'Timor-Leste',
-			'TG' => 'Togo',
-			'TK' => 'Tokelau',
-			'TO' => 'Tonga',
-			'TT' => 'Trinidad and Tobago',
-			'TN' => 'Tunisia',
-			'TR' => 'Turkey',
-			'TM' => 'Turkmenistan',
-			'TC' => 'Turks and Caicos Islands',
-			'TV' => 'Tuvalu',
-			'UG' => 'Uganda',
-			'UA' => 'Ukraine',
-			'AE' => 'United Arab Emirates',
-			'UY' => 'Uruguay',
-			'UM' => 'US Minor Outlying Islands',
-			'UZ' => 'Uzbekistan',
-			'VU' => 'Vanuatu',
-			'VE' => 'Venezuela',
-			'VN' => 'Vietnam',
-			'VG' => 'Virgin Islands (British)',
-			'VI' => 'Virgin Islands (USA)',
-			'WF' => 'Wallis and Futuna Islands',
-			'EH' => 'Western Sahara',
-			'WS' => 'Western Samoa',
-			'YE' => 'Yemen',
-			'ZM' => 'Zambia',
-			'ZW' => 'Zimbabwe',
-		);		
-	}
-	return $countries;
+    if ( $translated ) {
+        $countries = array(
+            ''   => '',
+            'US' => __( 'United States', 'google-analytics-for-wordpress' ),
+            'CA' => __( 'Canada', 'google-analytics-for-wordpress' ),
+            'GB' => __( 'United Kingdom', 'google-analytics-for-wordpress' ),
+            'AF' => __( 'Afghanistan', 'google-analytics-for-wordpress' ),
+            'AX' => __( 'Åland Islands', 'google-analytics-for-wordpress' ),
+            'AL' => __( 'Albania', 'google-analytics-for-wordpress' ),
+            'DZ' => __( 'Algeria', 'google-analytics-for-wordpress' ),
+            'AS' => __( 'American Samoa', 'google-analytics-for-wordpress' ),
+            'AD' => __( 'Andorra', 'google-analytics-for-wordpress' ),
+            'AO' => __( 'Angola', 'google-analytics-for-wordpress' ),
+            'AI' => __( 'Anguilla', 'google-analytics-for-wordpress' ),
+            'AQ' => __( 'Antarctica', 'google-analytics-for-wordpress' ),
+            'AG' => __( 'Antigua and Barbuda', 'google-analytics-for-wordpress' ),
+            'AR' => __( 'Argentina', 'google-analytics-for-wordpress' ),
+            'AM' => __( 'Armenia', 'google-analytics-for-wordpress' ),
+            'AW' => __( 'Aruba', 'google-analytics-for-wordpress' ),
+            'AU' => __( 'Australia', 'google-analytics-for-wordpress' ),
+            'AT' => __( 'Austria', 'google-analytics-for-wordpress' ),
+            'AZ' => __( 'Azerbaijan', 'google-analytics-for-wordpress' ),
+            'BS' => __( 'Bahamas', 'google-analytics-for-wordpress' ),
+            'BH' => __( 'Bahrain', 'google-analytics-for-wordpress' ),
+            'BD' => __( 'Bangladesh', 'google-analytics-for-wordpress' ),
+            'BB' => __( 'Barbados', 'google-analytics-for-wordpress' ),
+            'BY' => __( 'Belarus', 'google-analytics-for-wordpress' ),
+            'BE' => __( 'Belgium', 'google-analytics-for-wordpress' ),
+            'BZ' => __( 'Belize', 'google-analytics-for-wordpress' ),
+            'BJ' => __( 'Benin', 'google-analytics-for-wordpress' ),
+            'BM' => __( 'Bermuda', 'google-analytics-for-wordpress' ),
+            'BT' => __( 'Bhutan', 'google-analytics-for-wordpress' ),
+            'BO' => __( 'Bolivia', 'google-analytics-for-wordpress' ),
+            'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'google-analytics-for-wordpress' ),
+            'BA' => __( 'Bosnia and Herzegovina', 'google-analytics-for-wordpress' ),
+            'BW' => __( 'Botswana', 'google-analytics-for-wordpress' ),
+            'BV' => __( 'Bouvet Island', 'google-analytics-for-wordpress' ),
+            'BR' => __( 'Brazil', 'google-analytics-for-wordpress' ),
+            'IO' => __( 'British Indian Ocean Territory', 'google-analytics-for-wordpress' ),
+            'BN' => __( 'Brunei Darrussalam', 'google-analytics-for-wordpress' ),
+            'BG' => __( 'Bulgaria', 'google-analytics-for-wordpress' ),
+            'BF' => __( 'Burkina Faso', 'google-analytics-for-wordpress' ),
+            'BI' => __( 'Burundi', 'google-analytics-for-wordpress' ),
+            'KH' => __( 'Cambodia', 'google-analytics-for-wordpress' ),
+            'CM' => __( 'Cameroon', 'google-analytics-for-wordpress' ),
+            'CV' => __( 'Cape Verde', 'google-analytics-for-wordpress' ),
+            'KY' => __( 'Cayman Islands', 'google-analytics-for-wordpress' ),
+            'CF' => __( 'Central African Republic', 'google-analytics-for-wordpress' ),
+            'TD' => __( 'Chad', 'google-analytics-for-wordpress' ),
+            'CL' => __( 'Chile', 'google-analytics-for-wordpress' ),
+            'CN' => __( 'China', 'google-analytics-for-wordpress' ),
+            'CX' => __( 'Christmas Island', 'google-analytics-for-wordpress' ),
+            'CC' => __( 'Cocos Islands', 'google-analytics-for-wordpress' ),
+            'CO' => __( 'Colombia', 'google-analytics-for-wordpress' ),
+            'KM' => __( 'Comoros', 'google-analytics-for-wordpress' ),
+            'CD' => __( 'Congo, Democratic People\'s Republic', 'google-analytics-for-wordpress' ),
+            'CG' => __( 'Congo, Republic of', 'google-analytics-for-wordpress' ),
+            'CK' => __( 'Cook Islands', 'google-analytics-for-wordpress' ),
+            'CR' => __( 'Costa Rica', 'google-analytics-for-wordpress' ),
+            'CI' => __( 'Cote d\'Ivoire', 'google-analytics-for-wordpress' ),
+            'HR' => __( 'Croatia/Hrvatska', 'google-analytics-for-wordpress' ),
+            'CU' => __( 'Cuba', 'google-analytics-for-wordpress' ),
+            'CW' => __( 'CuraÇao', 'google-analytics-for-wordpress' ),
+            'CY' => __( 'Cyprus', 'google-analytics-for-wordpress' ),
+            'CZ' => __( 'Czechia', 'google-analytics-for-wordpress' ),
+            'DK' => __( 'Denmark', 'google-analytics-for-wordpress' ),
+            'DJ' => __( 'Djibouti', 'google-analytics-for-wordpress' ),
+            'DM' => __( 'Dominica', 'google-analytics-for-wordpress' ),
+            'DO' => __( 'Dominican Republic', 'google-analytics-for-wordpress' ),
+            'TP' => __( 'East Timor', 'google-analytics-for-wordpress' ),
+            'EC' => __( 'Ecuador', 'google-analytics-for-wordpress' ),
+            'EG' => __( 'Egypt', 'google-analytics-for-wordpress' ),
+            'GQ' => __( 'Equatorial Guinea', 'google-analytics-for-wordpress' ),
+            'SV' => __( 'El Salvador', 'google-analytics-for-wordpress' ),
+            'ER' => __( 'Eritrea', 'google-analytics-for-wordpress' ),
+            'EE' => __( 'Estonia', 'google-analytics-for-wordpress' ),
+            'ET' => __( 'Ethiopia', 'google-analytics-for-wordpress' ),
+            'FK' => __( 'Falkland Islands', 'google-analytics-for-wordpress' ),
+            'FO' => __( 'Faroe Islands', 'google-analytics-for-wordpress' ),
+            'FJ' => __( 'Fiji', 'google-analytics-for-wordpress' ),
+            'FI' => __( 'Finland', 'google-analytics-for-wordpress' ),
+            'FR' => __( 'France', 'google-analytics-for-wordpress' ),
+            'GF' => __( 'French Guiana', 'google-analytics-for-wordpress' ),
+            'PF' => __( 'French Polynesia', 'google-analytics-for-wordpress' ),
+            'TF' => __( 'French Southern Territories', 'google-analytics-for-wordpress' ),
+            'GA' => __( 'Gabon', 'google-analytics-for-wordpress' ),
+            'GM' => __( 'Gambia', 'google-analytics-for-wordpress' ),
+            'GE' => __( 'Georgia', 'google-analytics-for-wordpress' ),
+            'DE' => __( 'Germany', 'google-analytics-for-wordpress' ),
+            'GR' => __( 'Greece', 'google-analytics-for-wordpress' ),
+            'GH' => __( 'Ghana', 'google-analytics-for-wordpress' ),
+            'GI' => __( 'Gibraltar', 'google-analytics-for-wordpress' ),
+            'GL' => __( 'Greenland', 'google-analytics-for-wordpress' ),
+            'GD' => __( 'Grenada', 'google-analytics-for-wordpress' ),
+            'GP' => __( 'Guadeloupe', 'google-analytics-for-wordpress' ),
+            'GU' => __( 'Guam', 'google-analytics-for-wordpress' ),
+            'GT' => __( 'Guatemala', 'google-analytics-for-wordpress' ),
+            'GG' => __( 'Guernsey', 'google-analytics-for-wordpress' ),
+            'GN' => __( 'Guinea', 'google-analytics-for-wordpress' ),
+            'GW' => __( 'Guinea-Bissau', 'google-analytics-for-wordpress' ),
+            'GY' => __( 'Guyana', 'google-analytics-for-wordpress' ),
+            'HT' => __( 'Haiti', 'google-analytics-for-wordpress' ),
+            'HM' => __( 'Heard and McDonald Islands', 'google-analytics-for-wordpress' ),
+            'VA' => __( 'Holy See (City Vatican State)', 'google-analytics-for-wordpress' ),
+            'HN' => __( 'Honduras', 'google-analytics-for-wordpress' ),
+            'HK' => __( 'Hong Kong', 'google-analytics-for-wordpress' ),
+            'HU' => __( 'Hungary', 'google-analytics-for-wordpress' ),
+            'IS' => __( 'Iceland', 'google-analytics-for-wordpress' ),
+            'IN' => __( 'India', 'google-analytics-for-wordpress' ),
+            'ID' => __( 'Indonesia', 'google-analytics-for-wordpress' ),
+            'IR' => __( 'Iran', 'google-analytics-for-wordpress' ),
+            'IQ' => __( 'Iraq', 'google-analytics-for-wordpress' ),
+            'IE' => __( 'Ireland', 'google-analytics-for-wordpress' ),
+            'IM' => __( 'Isle of Man', 'google-analytics-for-wordpress' ),
+            'IL' => __( 'Israel', 'google-analytics-for-wordpress' ),
+            'IT' => __( 'Italy', 'google-analytics-for-wordpress' ),
+            'JM' => __( 'Jamaica', 'google-analytics-for-wordpress' ),
+            'JP' => __( 'Japan', 'google-analytics-for-wordpress' ),
+            'JE' => __( 'Jersey', 'google-analytics-for-wordpress' ),
+            'JO' => __( 'Jordan', 'google-analytics-for-wordpress' ),
+            'KZ' => __( 'Kazakhstan', 'google-analytics-for-wordpress' ),
+            'KE' => __( 'Kenya', 'google-analytics-for-wordpress' ),
+            'KI' => __( 'Kiribati', 'google-analytics-for-wordpress' ),
+            'KW' => __( 'Kuwait', 'google-analytics-for-wordpress' ),
+            'KG' => __( 'Kyrgyzstan', 'google-analytics-for-wordpress' ),
+            'LA' => __( 'Lao People\'s Democratic Republic', 'google-analytics-for-wordpress' ),
+            'LV' => __( 'Latvia', 'google-analytics-for-wordpress' ),
+            'LB' => __( 'Lebanon', 'google-analytics-for-wordpress' ),
+            'LS' => __( 'Lesotho', 'google-analytics-for-wordpress' ),
+            'LR' => __( 'Liberia', 'google-analytics-for-wordpress' ),
+            'LY' => __( 'Libyan Arab Jamahiriya', 'google-analytics-for-wordpress' ),
+            'LI' => __( 'Liechtenstein', 'google-analytics-for-wordpress' ),
+            'LT' => __( 'Lithuania', 'google-analytics-for-wordpress' ),
+            'LU' => __( 'Luxembourg', 'google-analytics-for-wordpress' ),
+            'MO' => __( 'Macau', 'google-analytics-for-wordpress' ),
+            'MK' => __( 'Macedonia', 'google-analytics-for-wordpress' ),
+            'MG' => __( 'Madagascar', 'google-analytics-for-wordpress' ),
+            'MW' => __( 'Malawi', 'google-analytics-for-wordpress' ),
+            'MY' => __( 'Malaysia', 'google-analytics-for-wordpress' ),
+            'MV' => __( 'Maldives', 'google-analytics-for-wordpress' ),
+            'ML' => __( 'Mali', 'google-analytics-for-wordpress' ),
+            'MT' => __( 'Malta', 'google-analytics-for-wordpress' ),
+            'MH' => __( 'Marshall Islands', 'google-analytics-for-wordpress' ),
+            'MQ' => __( 'Martinique', 'google-analytics-for-wordpress' ),
+            'MR' => __( 'Mauritania', 'google-analytics-for-wordpress' ),
+            'MU' => __( 'Mauritius', 'google-analytics-for-wordpress' ),
+            'YT' => __( 'Mayotte', 'google-analytics-for-wordpress' ),
+            'MX' => __( 'Mexico', 'google-analytics-for-wordpress' ),
+            'FM' => __( 'Micronesia', 'google-analytics-for-wordpress' ),
+            'MD' => __( 'Moldova, Republic of', 'google-analytics-for-wordpress' ),
+            'MC' => __( 'Monaco', 'google-analytics-for-wordpress' ),
+            'MN' => __( 'Mongolia', 'google-analytics-for-wordpress' ),
+            'ME' => __( 'Montenegro', 'google-analytics-for-wordpress' ),
+            'MS' => __( 'Montserrat', 'google-analytics-for-wordpress' ),
+            'MA' => __( 'Morocco', 'google-analytics-for-wordpress' ),
+            'MZ' => __( 'Mozambique', 'google-analytics-for-wordpress' ),
+            'MM' => __( 'Myanmar', 'google-analytics-for-wordpress' ),
+            'NA' => __( 'Namibia', 'google-analytics-for-wordpress' ),
+            'NR' => __( 'Nauru', 'google-analytics-for-wordpress' ),
+            'NP' => __( 'Nepal', 'google-analytics-for-wordpress' ),
+            'NL' => __( 'Netherlands', 'google-analytics-for-wordpress' ),
+            'AN' => __( 'Netherlands Antilles', 'google-analytics-for-wordpress' ),
+            'NC' => __( 'New Caledonia', 'google-analytics-for-wordpress' ),
+            'NZ' => __( 'New Zealand', 'google-analytics-for-wordpress' ),
+            'NI' => __( 'Nicaragua', 'google-analytics-for-wordpress' ),
+            'NE' => __( 'Niger', 'google-analytics-for-wordpress' ),
+            'NG' => __( 'Nigeria', 'google-analytics-for-wordpress' ),
+            'NU' => __( 'Niue', 'google-analytics-for-wordpress' ),
+            'NF' => __( 'Norfolk Island', 'google-analytics-for-wordpress' ),
+            'KP' => __( 'North Korea', 'google-analytics-for-wordpress' ),
+            'MP' => __( 'Northern Mariana Islands', 'google-analytics-for-wordpress' ),
+            'NO' => __( 'Norway', 'google-analytics-for-wordpress' ),
+            'OM' => __( 'Oman', 'google-analytics-for-wordpress' ),
+            'PK' => __( 'Pakistan', 'google-analytics-for-wordpress' ),
+            'PW' => __( 'Palau', 'google-analytics-for-wordpress' ),
+            'PS' => __( 'Palestinian Territories', 'google-analytics-for-wordpress' ),
+            'PA' => __( 'Panama', 'google-analytics-for-wordpress' ),
+            'PG' => __( 'Papua New Guinea', 'google-analytics-for-wordpress' ),
+            'PY' => __( 'Paraguay', 'google-analytics-for-wordpress' ),
+            'PE' => __( 'Peru', 'google-analytics-for-wordpress' ),
+            'PH' => __( 'Philippines', 'google-analytics-for-wordpress' ),
+            'PN' => __( 'Pitcairn Island', 'google-analytics-for-wordpress' ),
+            'PL' => __( 'Poland', 'google-analytics-for-wordpress' ),
+            'PT' => __( 'Portugal', 'google-analytics-for-wordpress' ),
+            'PR' => __( 'Puerto Rico', 'google-analytics-for-wordpress' ),
+            'QA' => __( 'Qatar', 'google-analytics-for-wordpress' ),
+            'XK' => __( 'Republic of Kosovo', 'google-analytics-for-wordpress' ),
+            'RE' => __( 'Reunion Island', 'google-analytics-for-wordpress' ),
+            'RO' => __( 'Romania', 'google-analytics-for-wordpress' ),
+            'RU' => __( 'Russian Federation', 'google-analytics-for-wordpress' ),
+            'RW' => __( 'Rwanda', 'google-analytics-for-wordpress' ),
+            'BL' => __( 'Saint Barthélemy', 'google-analytics-for-wordpress' ),
+            'SH' => __( 'Saint Helena', 'google-analytics-for-wordpress' ),
+            'KN' => __( 'Saint Kitts and Nevis', 'google-analytics-for-wordpress' ),
+            'LC' => __( 'Saint Lucia', 'google-analytics-for-wordpress' ),
+            'MF' => __( 'Saint Martin (French)', 'google-analytics-for-wordpress' ),
+            'SX' => __( 'Saint Martin (Dutch)', 'google-analytics-for-wordpress' ),
+            'PM' => __( 'Saint Pierre and Miquelon', 'google-analytics-for-wordpress' ),
+            'VC' => __( 'Saint Vincent and the Grenadines', 'google-analytics-for-wordpress' ),
+            'SM' => __( 'San Marino', 'google-analytics-for-wordpress' ),
+            'ST' => __( 'São Tomé and Príncipe', 'google-analytics-for-wordpress' ),
+            'SA' => __( 'Saudi Arabia', 'google-analytics-for-wordpress' ),
+            'SN' => __( 'Senegal', 'google-analytics-for-wordpress' ),
+            'RS' => __( 'Serbia', 'google-analytics-for-wordpress' ),
+            'SC' => __( 'Seychelles', 'google-analytics-for-wordpress' ),
+            'SL' => __( 'Sierra Leone', 'google-analytics-for-wordpress' ),
+            'SG' => __( 'Singapore', 'google-analytics-for-wordpress' ),
+            'SK' => __( 'Slovak Republic', 'google-analytics-for-wordpress' ),
+            'SI' => __( 'Slovenia', 'google-analytics-for-wordpress' ),
+            'SB' => __( 'Solomon Islands', 'google-analytics-for-wordpress' ),
+            'SO' => __( 'Somalia', 'google-analytics-for-wordpress' ),
+            'ZA' => __( 'South Africa', 'google-analytics-for-wordpress' ),
+            'GS' => __( 'South Georgia', 'google-analytics-for-wordpress' ),
+            'KR' => __( 'South Korea', 'google-analytics-for-wordpress' ),
+            'SS' => __( 'South Sudan', 'google-analytics-for-wordpress' ),
+            'ES' => __( 'Spain', 'google-analytics-for-wordpress' ),
+            'LK' => __( 'Sri Lanka', 'google-analytics-for-wordpress' ),
+            'SD' => __( 'Sudan', 'google-analytics-for-wordpress' ),
+            'SR' => __( 'Suriname', 'google-analytics-for-wordpress' ),
+            'SJ' => __( 'Svalbard and Jan Mayen Islands', 'google-analytics-for-wordpress' ),
+            'SZ' => __( 'Swaziland', 'google-analytics-for-wordpress' ),
+            'SE' => __( 'Sweden', 'google-analytics-for-wordpress' ),
+            'CH' => __( 'Switzerland', 'google-analytics-for-wordpress' ),
+            'SY' => __( 'Syrian Arab Republic', 'google-analytics-for-wordpress' ),
+            'TW' => __( 'Taiwan', 'google-analytics-for-wordpress' ),
+            'TJ' => __( 'Tajikistan', 'google-analytics-for-wordpress' ),
+            'TZ' => __( 'Tanzania', 'google-analytics-for-wordpress' ),
+            'TH' => __( 'Thailand', 'google-analytics-for-wordpress' ),
+            'TL' => __( 'Timor-Leste', 'google-analytics-for-wordpress' ),
+            'TG' => __( 'Togo', 'google-analytics-for-wordpress' ),
+            'TK' => __( 'Tokelau', 'google-analytics-for-wordpress' ),
+            'TO' => __( 'Tonga', 'google-analytics-for-wordpress' ),
+            'TT' => __( 'Trinidad and Tobago', 'google-analytics-for-wordpress' ),
+            'TN' => __( 'Tunisia', 'google-analytics-for-wordpress' ),
+            'TR' => __( 'Turkey', 'google-analytics-for-wordpress' ),
+            'TM' => __( 'Turkmenistan', 'google-analytics-for-wordpress' ),
+            'TC' => __( 'Turks and Caicos Islands', 'google-analytics-for-wordpress' ),
+            'TV' => __( 'Tuvalu', 'google-analytics-for-wordpress' ),
+            'UG' => __( 'Uganda', 'google-analytics-for-wordpress' ),
+            'UA' => __( 'Ukraine', 'google-analytics-for-wordpress' ),
+            'AE' => __( 'United Arab Emirates', 'google-analytics-for-wordpress' ),
+            'UY' => __( 'Uruguay', 'google-analytics-for-wordpress' ),
+            'UM' => __( 'US Minor Outlying Islands', 'google-analytics-for-wordpress' ),
+            'UZ' => __( 'Uzbekistan', 'google-analytics-for-wordpress' ),
+            'VU' => __( 'Vanuatu', 'google-analytics-for-wordpress' ),
+            'VE' => __( 'Venezuela', 'google-analytics-for-wordpress' ),
+            'VN' => __( 'Vietnam', 'google-analytics-for-wordpress' ),
+            'VG' => __( 'Virgin Islands (British)', 'google-analytics-for-wordpress' ),
+            'VI' => __( 'Virgin Islands (USA)', 'google-analytics-for-wordpress' ),
+            'WF' => __( 'Wallis and Futuna Islands', 'google-analytics-for-wordpress' ),
+            'EH' => __( 'Western Sahara', 'google-analytics-for-wordpress' ),
+            'WS' => __( 'Western Samoa', 'google-analytics-for-wordpress' ),
+            'YE' => __( 'Yemen', 'google-analytics-for-wordpress' ),
+            'ZM' => __( 'Zambia', 'google-analytics-for-wordpress' ),
+            'ZW' => __( 'Zimbabwe', 'google-analytics-for-wordpress' ),
+        );
+    } else {
+        $countries = array(
+            ''   => '',
+            'US' => 'United States',
+            'CA' => 'Canada',
+            'GB' => 'United Kingdom',
+            'AF' => 'Afghanistan',
+            'AX' => 'Åland Islands',
+            'AL' => 'Albania',
+            'DZ' => 'Algeria',
+            'AS' => 'American Samoa',
+            'AD' => 'Andorra',
+            'AO' => 'Angola',
+            'AI' => 'Anguilla',
+            'AQ' => 'Antarctica',
+            'AG' => 'Antigua and Barbuda',
+            'AR' => 'Argentina',
+            'AM' => 'Armenia',
+            'AW' => 'Aruba',
+            'AU' => 'Australia',
+            'AT' => 'Austria',
+            'AZ' => 'Azerbaijan',
+            'BS' => 'Bahamas',
+            'BH' => 'Bahrain',
+            'BD' => 'Bangladesh',
+            'BB' => 'Barbados',
+            'BY' => 'Belarus',
+            'BE' => 'Belgium',
+            'BZ' => 'Belize',
+            'BJ' => 'Benin',
+            'BM' => 'Bermuda',
+            'BT' => 'Bhutan',
+            'BO' => 'Bolivia',
+            'BQ' => 'Bonaire, Saint Eustatius and Saba',
+            'BA' => 'Bosnia and Herzegovina',
+            'BW' => 'Botswana',
+            'BV' => 'Bouvet Island',
+            'BR' => 'Brazil',
+            'IO' => 'British Indian Ocean Territory',
+            'BN' => 'Brunei Darrussalam',
+            'BG' => 'Bulgaria',
+            'BF' => 'Burkina Faso',
+            'BI' => 'Burundi',
+            'KH' => 'Cambodia',
+            'CM' => 'Cameroon',
+            'CV' => 'Cape Verde',
+            'KY' => 'Cayman Islands',
+            'CF' => 'Central African Republic',
+            'TD' => 'Chad',
+            'CL' => 'Chile',
+            'CN' => 'China',
+            'CX' => 'Christmas Island',
+            'CC' => 'Cocos Islands',
+            'CO' => 'Colombia',
+            'KM' => 'Comoros',
+            'CD' => 'Congo, Democratic People\'s Republic',
+            'CG' => 'Congo, Republic of',
+            'CK' => 'Cook Islands',
+            'CR' => 'Costa Rica',
+            'CI' => 'Cote d\'Ivoire',
+            'HR' => 'Croatia/Hrvatska',
+            'CU' => 'Cuba',
+            'CW' => 'CuraÇao',
+            'CY' => 'Cyprus',
+            'CZ' => 'Czechia',
+            'DK' => 'Denmark',
+            'DJ' => 'Djibouti',
+            'DM' => 'Dominica',
+            'DO' => 'Dominican Republic',
+            'TP' => 'East Timor',
+            'EC' => 'Ecuador',
+            'EG' => 'Egypt',
+            'GQ' => 'Equatorial Guinea',
+            'SV' => 'El Salvador',
+            'ER' => 'Eritrea',
+            'EE' => 'Estonia',
+            'ET' => 'Ethiopia',
+            'FK' => 'Falkland Islands',
+            'FO' => 'Faroe Islands',
+            'FJ' => 'Fiji',
+            'FI' => 'Finland',
+            'FR' => 'France',
+            'GF' => 'French Guiana',
+            'PF' => 'French Polynesia',
+            'TF' => 'French Southern Territories',
+            'GA' => 'Gabon',
+            'GM' => 'Gambia',
+            'GE' => 'Georgia',
+            'DE' => 'Germany',
+            'GR' => 'Greece',
+            'GH' => 'Ghana',
+            'GI' => 'Gibraltar',
+            'GL' => 'Greenland',
+            'GD' => 'Grenada',
+            'GP' => 'Guadeloupe',
+            'GU' => 'Guam',
+            'GT' => 'Guatemala',
+            'GG' => 'Guernsey',
+            'GN' => 'Guinea',
+            'GW' => 'Guinea-Bissau',
+            'GY' => 'Guyana',
+            'HT' => 'Haiti',
+            'HM' => 'Heard and McDonald Islands',
+            'VA' => 'Holy See (City Vatican State)',
+            'HN' => 'Honduras',
+            'HK' => 'Hong Kong',
+            'HU' => 'Hungary',
+            'IS' => 'Iceland',
+            'IN' => 'India',
+            'ID' => 'Indonesia',
+            'IR' => 'Iran',
+            'IQ' => 'Iraq',
+            'IE' => 'Ireland',
+            'IM' => 'Isle of Man',
+            'IL' => 'Israel',
+            'IT' => 'Italy',
+            'JM' => 'Jamaica',
+            'JP' => 'Japan',
+            'JE' => 'Jersey',
+            'JO' => 'Jordan',
+            'KZ' => 'Kazakhstan',
+            'KE' => 'Kenya',
+            'KI' => 'Kiribati',
+            'KW' => 'Kuwait',
+            'KG' => 'Kyrgyzstan',
+            'LA' => 'Lao People\'s Democratic Republic',
+            'LV' => 'Latvia',
+            'LB' => 'Lebanon',
+            'LS' => 'Lesotho',
+            'LR' => 'Liberia',
+            'LY' => 'Libyan Arab Jamahiriya',
+            'LI' => 'Liechtenstein',
+            'LT' => 'Lithuania',
+            'LU' => 'Luxembourg',
+            'MO' => 'Macau',
+            'MK' => 'Macedonia',
+            'MG' => 'Madagascar',
+            'MW' => 'Malawi',
+            'MY' => 'Malaysia',
+            'MV' => 'Maldives',
+            'ML' => 'Mali',
+            'MT' => 'Malta',
+            'MH' => 'Marshall Islands',
+            'MQ' => 'Martinique',
+            'MR' => 'Mauritania',
+            'MU' => 'Mauritius',
+            'YT' => 'Mayotte',
+            'MX' => 'Mexico',
+            'FM' => 'Micronesia',
+            'MD' => 'Moldova, Republic of',
+            'MC' => 'Monaco',
+            'MN' => 'Mongolia',
+            'ME' => 'Montenegro',
+            'MS' => 'Montserrat',
+            'MA' => 'Morocco',
+            'MZ' => 'Mozambique',
+            'MM' => 'Myanmar',
+            'NA' => 'Namibia',
+            'NR' => 'Nauru',
+            'NP' => 'Nepal',
+            'NL' => 'Netherlands',
+            'AN' => 'Netherlands Antilles',
+            'NC' => 'New Caledonia',
+            'NZ' => 'New Zealand',
+            'NI' => 'Nicaragua',
+            'NE' => 'Niger',
+            'NG' => 'Nigeria',
+            'NU' => 'Niue',
+            'NF' => 'Norfolk Island',
+            'KP' => 'North Korea',
+            'MP' => 'Northern Mariana Islands',
+            'NO' => 'Norway',
+            'OM' => 'Oman',
+            'PK' => 'Pakistan',
+            'PW' => 'Palau',
+            'PS' => 'Palestinian Territories',
+            'PA' => 'Panama',
+            'PG' => 'Papua New Guinea',
+            'PY' => 'Paraguay',
+            'PE' => 'Peru',
+            'PH' => 'Philippines',
+            'PN' => 'Pitcairn Island',
+            'PL' => 'Poland',
+            'PT' => 'Portugal',
+            'PR' => 'Puerto Rico',
+            'QA' => 'Qatar',
+            'XK' => 'Republic of Kosovo',
+            'RE' => 'Reunion Island',
+            'RO' => 'Romania',
+            'RU' => 'Russian Federation',
+            'RW' => 'Rwanda',
+            'BL' => 'Saint Barthélemy',
+            'SH' => 'Saint Helena',
+            'KN' => 'Saint Kitts and Nevis',
+            'LC' => 'Saint Lucia',
+            'MF' => 'Saint Martin (French)',
+            'SX' => 'Saint Martin (Dutch)',
+            'PM' => 'Saint Pierre and Miquelon',
+            'VC' => 'Saint Vincent and the Grenadines',
+            'SM' => 'San Marino',
+            'ST' => 'São Tomé and Príncipe',
+            'SA' => 'Saudi Arabia',
+            'SN' => 'Senegal',
+            'RS' => 'Serbia',
+            'SC' => 'Seychelles',
+            'SL' => 'Sierra Leone',
+            'SG' => 'Singapore',
+            'SK' => 'Slovak Republic',
+            'SI' => 'Slovenia',
+            'SB' => 'Solomon Islands',
+            'SO' => 'Somalia',
+            'ZA' => 'South Africa',
+            'GS' => 'South Georgia',
+            'KR' => 'South Korea',
+            'SS' => 'South Sudan',
+            'ES' => 'Spain',
+            'LK' => 'Sri Lanka',
+            'SD' => 'Sudan',
+            'SR' => 'Suriname',
+            'SJ' => 'Svalbard and Jan Mayen Islands',
+            'SZ' => 'Swaziland',
+            'SE' => 'Sweden',
+            'CH' => 'Switzerland',
+            'SY' => 'Syrian Arab Republic',
+            'TW' => 'Taiwan',
+            'TJ' => 'Tajikistan',
+            'TZ' => 'Tanzania',
+            'TH' => 'Thailand',
+            'TL' => 'Timor-Leste',
+            'TG' => 'Togo',
+            'TK' => 'Tokelau',
+            'TO' => 'Tonga',
+            'TT' => 'Trinidad and Tobago',
+            'TN' => 'Tunisia',
+            'TR' => 'Turkey',
+            'TM' => 'Turkmenistan',
+            'TC' => 'Turks and Caicos Islands',
+            'TV' => 'Tuvalu',
+            'UG' => 'Uganda',
+            'UA' => 'Ukraine',
+            'AE' => 'United Arab Emirates',
+            'UY' => 'Uruguay',
+            'UM' => 'US Minor Outlying Islands',
+            'UZ' => 'Uzbekistan',
+            'VU' => 'Vanuatu',
+            'VE' => 'Venezuela',
+            'VN' => 'Vietnam',
+            'VG' => 'Virgin Islands (British)',
+            'VI' => 'Virgin Islands (USA)',
+            'WF' => 'Wallis and Futuna Islands',
+            'EH' => 'Western Sahara',
+            'WS' => 'Western Samoa',
+            'YE' => 'Yemen',
+            'ZM' => 'Zambia',
+            'ZW' => 'Zimbabwe',
+        );		
+    }
+    return $countries;
 }
 
 function monsterinsights_is_wp_seo_active( ) {
-	$wp_seo_active = false; // @todo: improve this check. This is from old Yoast code.
+    $wp_seo_active = false; // @todo: improve this check. This is from old Yoast code.
 	
-	// Makes sure is_plugin_active is available when called from front end
-	include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-	if ( is_plugin_active( 'wordpress-seo/wp-seo.php' ) || is_plugin_active( 'wordpress-seo-premium/wp-seo-premium.php' ) ) {
-		$wp_seo_active = true;
-	}
-	return $wp_seo_active;
+    // Makes sure is_plugin_active is available when called from front end
+    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+    if ( is_plugin_active( 'wordpress-seo/wp-seo.php' ) || is_plugin_active( 'wordpress-seo-premium/wp-seo-premium.php' ) ) {
+        $wp_seo_active = true;
+    }
+    return $wp_seo_active;
 }
 
 function monsterinsights_get_asset_version() {
-	if ( monsterinsights_is_debug_mode() ) {
-		return time();
-	} else {
-		return MONSTERINSIGHTS_VERSION;
-	}
+    if ( monsterinsights_is_debug_mode() ) {
+        return time();
+    } else {
+        return MONSTERINSIGHTS_VERSION;
+    }
 }
 
 function monsterinsights_is_debug_mode() {
-	$debug_mode = false;
-	if ( defined( 'MONSTERINSIGHTS_DEBUG_MODE' ) && MONSTERINSIGHTS_DEBUG_MODE ) {
-		$debug_mode = true;
-	}
+    $debug_mode = false;
+    if ( defined( 'MONSTERINSIGHTS_DEBUG_MODE' ) && MONSTERINSIGHTS_DEBUG_MODE ) {
+        $debug_mode = true;
+    }
 	
-	if ( monsterinsights_get_option( 'debug_mode', false ) ) {
-		$debug_mode = true;
-	}
+    if ( monsterinsights_get_option( 'debug_mode', false ) ) {
+        $debug_mode = true;
+    }
 	
-	return apply_filters( 'monsterinsights_is_debug_mode', $debug_mode );
+    return apply_filters( 'monsterinsights_is_debug_mode', $debug_mode );
 }
 
 function monsterinsights_is_network_active() {
-	if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-		require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
-	}
+    if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
+        require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+    }
 	 
-	if ( is_multisite() && is_plugin_active_for_network( plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ) ) ) {
-	   return true;
-	} else {
-		return false;
-	}
+    if ( is_multisite() && is_plugin_active_for_network( plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ) ) ) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 if ( ! function_exists ( 'remove_class_filter' ) ) {
-	/**
-	 * Remove Class Filter Without Access to Class Object
-	 *
-	 * In order to use the core WordPress remove_filter() on a filter added with the callback
-	 * to a class, you either have to have access to that class object, or it has to be a call
-	 * to a static method.  This method allows you to remove filters with a callback to a class
-	 * you don't have access to.
-	 *
-	 * Works with WordPress 1.2 - 4.7+
-	 *
-	 * @param string $tag         Filter to remove
-	 * @param string $class_name  Class name for the filter's callback
-	 * @param string $method_name Method name for the filter's callback
-	 * @param int    $priority    Priority of the filter (default 10)
-	 *
-	 * @return bool Whether the function is removed.
-	 */
-	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
-		global $wp_filter;
-		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
-		/**
-		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
-		 * a simple array, rather it is an object that implements the ArrayAccess interface.
-		 *
-		 * To be backwards compatible, we set $callbacks equal to the correct array as a reference (so $wp_filter is updated)
-		 *
-		 * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
-		 */
-		if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-			$callbacks = &$wp_filter[ $tag ]->callbacks;
-		} else {
-			$callbacks = &$wp_filter[ $tag ];
-		}
-		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
-		// Loop through each filter for the specified priority, looking for our class & method
-		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
-			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
-			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
-			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
-			// Method matched, now let's check the Class
-			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
-				// Now let's remove it from the array
-				unset( $callbacks[ $priority ][ $filter_id ] );
-				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
-				// and if the only filter for that tag, set the tag to an empty array
-				if ( empty( $callbacks ) ) $callbacks = array();
-				// If using WordPress older than 4.7
-				if ( ! is_object( $wp_filter[ $tag ] ) ) {
-					// Remove this filter from merged_filters, which specifies if filters have been sorted
-					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
-				}
-				return TRUE;
-			}
-		}
-		return FALSE;
-	}
+    /**
+     * Remove Class Filter Without Access to Class Object
+     *
+     * In order to use the core WordPress remove_filter() on a filter added with the callback
+     * to a class, you either have to have access to that class object, or it has to be a call
+     * to a static method.  This method allows you to remove filters with a callback to a class
+     * you don't have access to.
+     *
+     * Works with WordPress 1.2 - 4.7+
+     *
+     * @param string $tag         Filter to remove
+     * @param string $class_name  Class name for the filter's callback
+     * @param string $method_name Method name for the filter's callback
+     * @param int    $priority    Priority of the filter (default 10)
+     *
+     * @return bool Whether the function is removed.
+     */
+    function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
+        global $wp_filter;
+        // Check that filter actually exists first
+        if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+        /**
+         * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
+         * a simple array, rather it is an object that implements the ArrayAccess interface.
+         *
+         * To be backwards compatible, we set $callbacks equal to the correct array as a reference (so $wp_filter is updated)
+         *
+         * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
+         */
+        if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
+            $callbacks = &$wp_filter[ $tag ]->callbacks;
+        } else {
+            $callbacks = &$wp_filter[ $tag ];
+        }
+        // Exit if there aren't any callbacks for specified priority
+        if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+        // Loop through each filter for the specified priority, looking for our class & method
+        foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
+            // Filter should always be an array - array( $this, 'method' ), if not goto next
+            if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+            // If first value in array is not an object, it can't be a class
+            if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+            // Method doesn't match the one we're looking for, goto next
+            if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+            // Method matched, now let's check the Class
+            if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
+                // Now let's remove it from the array
+                unset( $callbacks[ $priority ][ $filter_id ] );
+                // and if it was the only filter in that priority, unset that priority
+                if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+                // and if the only filter for that tag, set the tag to an empty array
+                if ( empty( $callbacks ) ) $callbacks = array();
+                // If using WordPress older than 4.7
+                if ( ! is_object( $wp_filter[ $tag ] ) ) {
+                    // Remove this filter from merged_filters, which specifies if filters have been sorted
+                    unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
+                }
+                return TRUE;
+            }
+        }
+        return FALSE;
+    }
 } // End function exists
 
 if ( ! function_exists ( 'remove_class_action' ) ) {
-	/**
-	 * Remove Class Action Without Access to Class Object
-	 *
-	 * In order to use the core WordPress remove_action() on an action added with the callback
-	 * to a class, you either have to have access to that class object, or it has to be a call
-	 * to a static method.  This method allows you to remove actions with a callback to a class
-	 * you don't have access to.
-	 *
-	 * Works with WordPress 1.2 - 4.7+
-	 *
-	 * @param string $tag         Action to remove
-	 * @param string $class_name  Class name for the action's callback
-	 * @param string $method_name Method name for the action's callback
-	 * @param int    $priority    Priority of the action (default 10)
-	 *
-	 * @return bool               Whether the function is removed.
-	 */
-	function remove_class_action( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
-		remove_class_filter( $tag, $class_name, $method_name, $priority );
-	}
+    /**
+     * Remove Class Action Without Access to Class Object
+     *
+     * In order to use the core WordPress remove_action() on an action added with the callback
+     * to a class, you either have to have access to that class object, or it has to be a call
+     * to a static method.  This method allows you to remove actions with a callback to a class
+     * you don't have access to.
+     *
+     * Works with WordPress 1.2 - 4.7+
+     *
+     * @param string $tag         Action to remove
+     * @param string $class_name  Class name for the action's callback
+     * @param string $method_name Method name for the action's callback
+     * @param int    $priority    Priority of the action (default 10)
+     *
+     * @return bool               Whether the function is removed.
+     */
+    function remove_class_action( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
+        remove_class_filter( $tag, $class_name, $method_name, $priority );
+    }
 } // End function exists
\ No newline at end of file

Braces +21 added lines, -7 removed lines

@@ -867,7 +867,9 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[ $tag ] ) ) {
+		    return FALSE;
+		}
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -882,23 +884,35 @@ 
 			$callbacks = &$wp_filter[ $tag ];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) {
+		    return FALSE;
+		}
 		// Loop through each filter for the specified priority, looking for our class & method
 		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) {
+			    continue;
+			}
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) {
+			    continue;
+			}
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter[ 'function' ][ 1 ] !== $method_name ) {
+			    continue;
+			}
 			// Method matched, now let's check the Class
 			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
 				// Now let's remove it from the array
 				unset( $callbacks[ $priority ][ $filter_id ] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[ $priority ] ) ) {
+				    unset( $callbacks[ $priority ] );
+				}
 				// and if the only filter for that tag, set the tag to an empty array
-				if ( empty( $callbacks ) ) $callbacks = array();
+				if ( empty( $callbacks ) ) {
+				    $callbacks = array();
+				}
 				// If using WordPress older than 4.7
 				if ( ! is_object( $wp_filter[ $tag ] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted

includes/frontend/frontend.php

Spacing +31 added lines, -31 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -28,47 +28,47 @@ 
  */
 function monsterinsights_tracking_script( ) {
 
-    $tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
+    $tracking_mode = monsterinsights_get_option('tracking_mode', 'analytics');
 
-    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/class-tracking-abstract.php';
+    require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/class-tracking-abstract.php';
     $mode = '';
 
-    if ( is_preview() ) {
+    if (is_preview()) {
         $mode = 'preview';
-    } else if ( ! monsterinsights_track_user() ) {
+    } else if ( ! monsterinsights_track_user()) {
         $mode = 'disabled';
-    } else if ( $tracking_mode === 'analytics' ) {
+    } else if ($tracking_mode === 'analytics') {
         $mode = 'analytics';
-    } else if ( $tracking_mode === 'ga' ) {
+    } else if ($tracking_mode === 'ga') {
         $mode = 'ga';
     } else {
         //$mode = apply_filters( 'monsterinsights_custom_tracking_name', 'name-of-method' );
     }
 
-    do_action( 'monsterinsights_tracking_before_' . $mode );
-    do_action( 'monsterinsights_tracking_before', $mode );
+    do_action('monsterinsights_tracking_before_' . $mode);
+    do_action('monsterinsights_tracking_before', $mode);
 
-    switch ( $mode ) {
+    switch ($mode) {
         case 'preview':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
+            require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/tracking/class-tracking-preview.php';
             $tracking = new MonsterInsights_Tracking_Preview();
             echo $tracking->frontend_output();
             break;
 
         case 'disabled':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-disabled.php';
+            require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/tracking/class-tracking-disabled.php';
             $tracking = new MonsterInsights_Tracking_Disabled();
             echo $tracking->frontend_output();
             break;
 
         case 'analytics':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
+            require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/tracking/class-tracking-analytics.php';
             $tracking = new MonsterInsights_Tracking_Analytics();
             echo $tracking->frontend_output();
             break;
 
         case 'ga':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-ga.php';
+            require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/tracking/class-tracking-ga.php';
             $tracking = new MonsterInsights_Tracking_GA();
             echo $tracking->frontend_output();
             break;
@@ -78,10 +78,10 @@ 
             break;
     }
 
-    do_action( 'monsterinsights_tracking_after_' . $mode );
-    do_action( 'monsterinsights_tracking_after', $mode );
+    do_action('monsterinsights_tracking_after_' . $mode);
+    do_action('monsterinsights_tracking_after', $mode);
 }
-add_action( 'wp_head', 'monsterinsights_tracking_script', 6 );
+add_action('wp_head', 'monsterinsights_tracking_script', 6);
 //add_action( 'login_head', 'monsterinsights_tracking_script', 6 );
 
 /**
@@ -97,21 +97,21 @@ 
  * @return array Array of the options to use.
  */
 function monsterinsights_events_tracking( ) {
-    $events_mode   = monsterinsights_get_option( 'events_mode', false );
-    $tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
+    $events_mode   = monsterinsights_get_option('events_mode', false);
+    $tracking_mode = monsterinsights_get_option('tracking_mode', 'analytics');
     $track_user    = monsterinsights_track_user();
 
-    if ( $track_user && $events_mode === 'php' && ( $tracking_mode === 'ga' || $tracking_mode === 'analytics' ) ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-events-php.php';
+    if ($track_user && $events_mode === 'php' && ($tracking_mode === 'ga' || $tracking_mode === 'analytics')) {
+        require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/events/class-events-php.php';
         new MonsterInsights_Events_PHP();
-    } else if ( $track_user && $events_mode === 'js' && $tracking_mode === 'analytics' ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-events-js.php';
+    } else if ($track_user && $events_mode === 'js' && $tracking_mode === 'analytics') {
+        require_once plugin_dir_path(MONSTERINSIGHTS_PLUGIN_FILE) . 'includes/frontend/events/class-events-js.php';
         new MonsterInsights_Events_JS();
     } else {
         // User is in the disabled group or events mode is off
     }
 }
-add_action( 'template_redirect', 'monsterinsights_events_tracking', 9 );
+add_action('template_redirect', 'monsterinsights_events_tracking', 9);
 
 /**
  * Add the UTM source parameters in the RSS feeds to track traffic.
@@ -123,22 +123,22 @@ 
  *
  * @return string The new link for the RSS feed.
  */
-function monsterinsights_rss_link_tagger( $guid ) {
+function monsterinsights_rss_link_tagger($guid) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
-        if ( is_feed() ) {
-            if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
+    if (monsterinsights_get_option('tag_links_in_rss', false)) {
+        if (is_feed()) {
+            if (monsterinsights_get_option('allow_anchor', false)) {
                 $delimiter = '#';
             } else {
                 $delimiter = '?';
-                if ( strpos( $guid, $delimiter ) > 0 ) {
+                if (strpos($guid, $delimiter) > 0) {
                     $delimiter = '&';
                 }
             }
-            return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
+            return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode($post->post_name);
         }
     }
     return $guid;
 }
-add_filter( 'the_permalink_rss', 'monsterinsights_rss_link_tagger', 99 );
\ No newline at end of file
+add_filter('the_permalink_rss', 'monsterinsights_rss_link_tagger', 99);
\ No newline at end of file

includes/frontend/tracking/class-tracking-analytics.php

Spacing +47 added lines, -47 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,94 +71,94 @@ 
 		global $wp_query;
 		$options = array();
 
-		if ( monsterinsights_get_ua_to_output() ) {
+		if (monsterinsights_get_ua_to_output()) {
 			$ua_code = monsterinsights_get_ua_to_output();
 		} else {
 			return $options;
 		}
 
 		$domain = 'auto'; // Default domain value
-		if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
-			$domain = esc_attr( monsterinsights_get_option( 'subdomain_tracking', '' ) );
+		if (monsterinsights_get_option('subdomain_tracking', false)) {
+			$domain = esc_attr(monsterinsights_get_option('subdomain_tracking', ''));
 		}
 
-		$allow_linker = monsterinsights_get_option( 'add_allow_linker', false );
-		$allow_anchor = monsterinsights_get_option( 'allow_anchor', false );
+		$allow_linker = monsterinsights_get_option('add_allow_linker', false);
+		$allow_anchor = monsterinsights_get_option('allow_anchor', false);
 
 
 		$create = array();
-		if ( $allow_anchor ) {
+		if ($allow_anchor) {
 			$create['allowAnchor'] = true;
 		}
 
-		if ( $allow_linker ) {
+		if ($allow_linker) {
 			$create['allowLinker'] = true;
 		}
 
-		$create = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_create', $create );
+		$create = apply_filters('monsterinsights_frontend_tracking_options_analytics_create', $create);
 
-		if ( $create && ! empty( $create ) && is_array( $create ) ) {
-			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+		if ($create && ! empty($create) && is_array($create)) {
+			$create = json_encode($create);
+			$create = str_replace('"', "'", $create);
+			$options['create'] = "'create', '" . esc_js($ua_code) . "', '" . esc_js($domain) . "', " . $create;
 		} else {
-			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
+			$options['create'] = "'create', '" . esc_js($ua_code) . "', '" . esc_js($domain) . "'";
 		}
 
 		$options['forceSSL'] = "'set', 'forceSSL', true";
 
-		if ( monsterinsights_get_option( 'custom_code', false ) ) {
+		if (monsterinsights_get_option('custom_code', false)) {
 			// Add custom code to the view
 			$options['custom_code'] = array(
 				'type'  => 'custom_code',
-				'value' => stripslashes( monsterinsights_get_option( 'custom_code', '' ) ),
+				'value' => stripslashes(monsterinsights_get_option('custom_code', '')),
 			);
 		}
 
 		// Anonymous data
-		if ( monsterinsights_get_option( 'anonymize_ips', false ) ) {
+		if (monsterinsights_get_option('anonymize_ips', false)) {
 			$options['anonymize_ips'] = "'set', 'anonymizeIp', true";
 		}
 
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', $options );
+		$options = apply_filters('monsterinsights_frontend_tracking_options_analytics_before_scripts', $options);
 
 		// add demographics
-		if ( monsterinsights_get_option( 'demographics', false ) ) {
+		if (monsterinsights_get_option('demographics', false)) {
 			$options['demographics'] = "'require', 'displayfeatures'";
 		}
 
 		// Check for Enhanced link attribution
-		if ( monsterinsights_get_option( 'enhanced_link_attribution', false ) ) {
+		if (monsterinsights_get_option('enhanced_link_attribution', false)) {
 			$options['enhanced_link_attribution'] = "'require', 'linkid', 'linkid.js'";
 		}
 
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_pageview', $options );
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
+		$options = apply_filters('monsterinsights_frontend_tracking_options_analytics_before_pageview', $options);
+		$options = apply_filters('monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version);
 
-		if ( is_404() ) {
-			if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
+		if (is_404()) {
+			if (monsterinsights_get_option('hash_tracking', false)) {
 				$options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer";
 			} else {
 				$options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
 			}
-		} else if ( $wp_query->is_search ) {
+		} else if ($wp_query->is_search) {
 			$pushstr = "'send','pageview','/?s=";
-			if ( (int) $wp_query->found_posts === 0 ) {
-				$options['send'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
-			} else if ( (int) $wp_query->found_posts === 1 ) {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
-			} else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
+			if ((int) $wp_query->found_posts === 0) {
+				$options['send'] = $pushstr . 'no-results:' . rawurlencode($wp_query->query_vars['s']) . "&cat=no-results'";
+			} else if ((int) $wp_query->found_posts === 1) {
+				$options['send'] = $pushstr . rawurlencode($wp_query->query_vars['s']) . "&cat=1-result'";
+			} else if ($wp_query->found_posts > 1 && $wp_query->found_posts < 6) {
+				$options['send'] = $pushstr . rawurlencode($wp_query->query_vars['s']) . "&cat=2-5-results'";
 			} else {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
+				$options['send'] = $pushstr . rawurlencode($wp_query->query_vars['s']) . "&cat=plus-5-results'";
 			}
-		} else if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
+		} else if (monsterinsights_get_option('hash_tracking', false)) {
 			$options['send'] = "'send','pageview', location.pathname + location.search + location.hash";
 		} else {
 			$options['send'] = "'send','pageview'";
 		}
 
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_end', $options );
+		$options = apply_filters('monsterinsights_frontend_tracking_options_analytics_end', $options);
 		return $options;
 	}
 
@@ -176,19 +176,19 @@ 
 	 */
 	public function frontend_output( ) {
 		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
-		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src     = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+		$is_debug_mode  = monsterinsights_is_debug_mode();
+		$src = apply_filters('monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js');
+		if (current_user_can('manage_options') && $is_debug_mode) {
+			$src = apply_filters('monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js');
 		}
-		$compat  = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
+		$compat  = monsterinsights_get_option('gatracker_compatibility_mode', false);
 		$compat  = $compat ? 'window.ga = __gaTracker;' : '';
 		ob_start();
 		?>
 <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using Analytics tracking - https://www.monsterinsights.com/ -->
-<?php if ( monsterinsights_get_ua() ) { ?>
+<?php if (monsterinsights_get_ua()) { ?>
 <script type="text/javascript" data-cfasync="false">
-	<?php if ( $this->should_do_optout() ) { ?>
+	<?php if ($this->should_do_optout()) { ?>
 	var disableStr = 'ga-disable-<?php echo monsterinsights_get_ua(); ?>';
 
 	/* Function to detect opted out users */
@@ -213,15 +213,15 @@ 
 	})(window,document,'script','<?php echo $src; ?>','__gaTracker');
 
 <?php
-if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
+if (current_user_can('manage_options') && $is_debug_mode) {
 	echo 'window.ga_debug = {trace: true};';
 }
 echo $compat;
-if ( count( $options ) >= 1 ) {
-	foreach ( $options as $item ) {
-		if ( ! is_array( $item ) ) {
+if (count($options) >= 1) {
+	foreach ($options as $item) {
+		if ( ! is_array($item)) {
 			echo '	__gaTracker(' . $item . ");\n";
-		} else if ( ! empty ( $item['value'] ) ) {
+		} else if ( ! empty ($item['value'])) {
 			echo '	' . $item['value'] . "\n";
 		}
 	}
@@ -239,6 +239,6 @@ 
 	}
 
 	public function should_do_optout() {
-		return ! ( defined( 'MI_NO_TRACKING_OPTOUT' ) && MI_NO_TRACKING_OPTOUT );
+		return ! (defined('MI_NO_TRACKING_OPTOUT') && MI_NO_TRACKING_OPTOUT);
 	}
 }

Indentation +186 added lines, -186 removed lines

@@ -10,181 +10,181 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class MonsterInsights_Tracking_Analytics extends MonsterInsights_Tracking_Abstract {
 
-	/**
-	 * Holds the base class object.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var object $base Base class object.
-	 */
-	public $base;
+    /**
+     * Holds the base class object.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var object $base Base class object.
+     */
+    public $base;
 	
-	/**
-	 * Holds the name of the tracking type.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $name Name of the tracking type.
-	 */
-	public $name = 'analytics';
-
-	/**
-	 * Version of the tracking class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $version Version of the tracking class.
-	 */
-	public $version = '1.0.0';
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 */
-	public function __construct() {
-		$this->base = MonsterInsights();
-	}
-
-	/**
-	 * Get frontend tracking options.
-	 *
-	 * This function is used to return an array of parameters
-	 * for the frontend_output() function to output. These are 
-	 * generally dimensions and turned on GA features.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return array Array of the options to use.
-	 */
-	public function frontend_tracking_options( ) {
-		global $wp_query;
-		$options = array();
-
-		if ( monsterinsights_get_ua_to_output() ) {
-			$ua_code = monsterinsights_get_ua_to_output();
-		} else {
-			return $options;
-		}
-
-		$domain = 'auto'; // Default domain value
-		if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
-			$domain = esc_attr( monsterinsights_get_option( 'subdomain_tracking', '' ) );
-		}
-
-		$allow_linker = monsterinsights_get_option( 'add_allow_linker', false );
-		$allow_anchor = monsterinsights_get_option( 'allow_anchor', false );
-
-
-		$create = array();
-		if ( $allow_anchor ) {
-			$create['allowAnchor'] = true;
-		}
-
-		if ( $allow_linker ) {
-			$create['allowLinker'] = true;
-		}
-
-		$create = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_create', $create );
-
-		if ( $create && ! empty( $create ) && is_array( $create ) ) {
-			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
-		} else {
-			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
-		}
-
-		$options['forceSSL'] = "'set', 'forceSSL', true";
-
-		if ( monsterinsights_get_option( 'custom_code', false ) ) {
-			// Add custom code to the view
-			$options['custom_code'] = array(
-				'type'  => 'custom_code',
-				'value' => stripslashes( monsterinsights_get_option( 'custom_code', '' ) ),
-			);
-		}
-
-		// Anonymous data
-		if ( monsterinsights_get_option( 'anonymize_ips', false ) ) {
-			$options['anonymize_ips'] = "'set', 'anonymizeIp', true";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', $options );
-
-		// add demographics
-		if ( monsterinsights_get_option( 'demographics', false ) ) {
-			$options['demographics'] = "'require', 'displayfeatures'";
-		}
-
-		// Check for Enhanced link attribution
-		if ( monsterinsights_get_option( 'enhanced_link_attribution', false ) ) {
-			$options['enhanced_link_attribution'] = "'require', 'linkid', 'linkid.js'";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_pageview', $options );
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
-
-		if ( is_404() ) {
-			if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
-				$options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer";
-			} else {
-				$options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
-			}
-		} else if ( $wp_query->is_search ) {
-			$pushstr = "'send','pageview','/?s=";
-			if ( (int) $wp_query->found_posts === 0 ) {
-				$options['send'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
-			} else if ( (int) $wp_query->found_posts === 1 ) {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
-			} else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
-			} else {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
-			}
-		} else if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
-			$options['send'] = "'send','pageview', location.pathname + location.search + location.hash";
-		} else {
-			$options['send'] = "'send','pageview'";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_end', $options );
-		return $options;
-	}
-
-	/**
-	 * Get frontend output.
-	 *
-	 * This function is used to return the Javascript
-	 * to output in the head of the page for the given
-	 * tracking method.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return string Javascript to output.
-	 */
-	public function frontend_output( ) {
-		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
-		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src     = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
-		}
-		$compat  = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
-		$compat  = $compat ? 'window.ga = __gaTracker;' : '';
-		ob_start();
-		?>
+    /**
+     * Holds the name of the tracking type.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $name Name of the tracking type.
+     */
+    public $name = 'analytics';
+
+    /**
+     * Version of the tracking class.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $version Version of the tracking class.
+     */
+    public $version = '1.0.0';
+
+    /**
+     * Primary class constructor.
+     *
+     * @since 6.0.0
+     * @access public
+     */
+    public function __construct() {
+        $this->base = MonsterInsights();
+    }
+
+    /**
+     * Get frontend tracking options.
+     *
+     * This function is used to return an array of parameters
+     * for the frontend_output() function to output. These are 
+     * generally dimensions and turned on GA features.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return array Array of the options to use.
+     */
+    public function frontend_tracking_options( ) {
+        global $wp_query;
+        $options = array();
+
+        if ( monsterinsights_get_ua_to_output() ) {
+            $ua_code = monsterinsights_get_ua_to_output();
+        } else {
+            return $options;
+        }
+
+        $domain = 'auto'; // Default domain value
+        if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
+            $domain = esc_attr( monsterinsights_get_option( 'subdomain_tracking', '' ) );
+        }
+
+        $allow_linker = monsterinsights_get_option( 'add_allow_linker', false );
+        $allow_anchor = monsterinsights_get_option( 'allow_anchor', false );
+
+
+        $create = array();
+        if ( $allow_anchor ) {
+            $create['allowAnchor'] = true;
+        }
+
+        if ( $allow_linker ) {
+            $create['allowLinker'] = true;
+        }
+
+        $create = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_create', $create );
+
+        if ( $create && ! empty( $create ) && is_array( $create ) ) {
+            $create = json_encode( $create );
+            $create = str_replace( '"', "'",  $create );
+            $options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+        } else {
+            $options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
+        }
+
+        $options['forceSSL'] = "'set', 'forceSSL', true";
+
+        if ( monsterinsights_get_option( 'custom_code', false ) ) {
+            // Add custom code to the view
+            $options['custom_code'] = array(
+                'type'  => 'custom_code',
+                'value' => stripslashes( monsterinsights_get_option( 'custom_code', '' ) ),
+            );
+        }
+
+        // Anonymous data
+        if ( monsterinsights_get_option( 'anonymize_ips', false ) ) {
+            $options['anonymize_ips'] = "'set', 'anonymizeIp', true";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', $options );
+
+        // add demographics
+        if ( monsterinsights_get_option( 'demographics', false ) ) {
+            $options['demographics'] = "'require', 'displayfeatures'";
+        }
+
+        // Check for Enhanced link attribution
+        if ( monsterinsights_get_option( 'enhanced_link_attribution', false ) ) {
+            $options['enhanced_link_attribution'] = "'require', 'linkid', 'linkid.js'";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_pageview', $options );
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
+
+        if ( is_404() ) {
+            if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
+                $options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer";
+            } else {
+                $options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
+            }
+        } else if ( $wp_query->is_search ) {
+            $pushstr = "'send','pageview','/?s=";
+            if ( (int) $wp_query->found_posts === 0 ) {
+                $options['send'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
+            } else if ( (int) $wp_query->found_posts === 1 ) {
+                $options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
+            } else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
+                $options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
+            } else {
+                $options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
+            }
+        } else if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
+            $options['send'] = "'send','pageview', location.pathname + location.search + location.hash";
+        } else {
+            $options['send'] = "'send','pageview'";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_end', $options );
+        return $options;
+    }
+
+    /**
+     * Get frontend output.
+     *
+     * This function is used to return the Javascript
+     * to output in the head of the page for the given
+     * tracking method.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return string Javascript to output.
+     */
+    public function frontend_output( ) {
+        $options        = $this->frontend_tracking_options();
+        $is_debug_mode  =  monsterinsights_is_debug_mode();
+        $src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
+        if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
+            $src     = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+        }
+        $compat  = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
+        $compat  = $compat ? 'window.ga = __gaTracker;' : '';
+        ob_start();
+        ?>
 <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using Analytics tracking - https://www.monsterinsights.com/ -->
 <?php if ( monsterinsights_get_ua() ) { ?>
 <script type="text/javascript" data-cfasync="false">
@@ -214,17 +214,17 @@ 
 
 <?php
 if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-	echo 'window.ga_debug = {trace: true};';
+    echo 'window.ga_debug = {trace: true};';
 }
 echo $compat;
 if ( count( $options ) >= 1 ) {
-	foreach ( $options as $item ) {
-		if ( ! is_array( $item ) ) {
-			echo '	__gaTracker(' . $item . ");\n";
-		} else if ( ! empty ( $item['value'] ) ) {
-			echo '	' . $item['value'] . "\n";
-		}
-	}
+    foreach ( $options as $item ) {
+        if ( ! is_array( $item ) ) {
+            echo '	__gaTracker(' . $item . ");\n";
+        } else if ( ! empty ( $item['value'] ) ) {
+            echo '	' . $item['value'] . "\n";
+        }
+    }
 }
 ?>
 </script>
@@ -233,12 +233,12 @@ 
 <?php } ?>
 <!-- / Google Analytics by MonsterInsights -->
 <?php
-		$output = ob_get_contents();
-		ob_end_clean();
-		return $output;
-	}
-
-	public function should_do_optout() {
-		return ! ( defined( 'MI_NO_TRACKING_OPTOUT' ) && MI_NO_TRACKING_OPTOUT );
-	}
+        $output = ob_get_contents();
+        ob_end_clean();
+        return $output;
+    }
+
+    public function should_do_optout() {
+        return ! ( defined( 'MI_NO_TRACKING_OPTOUT' ) && MI_NO_TRACKING_OPTOUT );
+    }
 }

includes/frontend/tracking/class-tracking-preview.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -84,9 +84,9 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
-        $output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->';
+        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION . ' - https://www.monsterinsights.com/ -->';
+        $output .= '<!-- ' . esc_html__("You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress') . ' -->';
+        $output .= '<!-- / Google Analytics by MonsterInsights -->';
         return $output;
     }
 }
\ No newline at end of file

includes/frontend/tracking/class-tracking-disabled.php

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -84,14 +84,14 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = PHP_EOL . '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->' . PHP_EOL;
+        $output = PHP_EOL . '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION . ' - https://www.monsterinsights.com/ -->' . PHP_EOL;
 
-        if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-            $output .=  '<!-- ' . sprintf( esc_html__( '@Webmaster, normally you will find the Google Analytics tracking code here, but you are in the disabled user groups. To change this, navigate to Insights %1$s Settings %1$s Ignore Users', 'google-analytics-for-wordpress' ), '->' ) . ' -->' . PHP_EOL;
+        if (current_user_can('monsterinsights_save_settings')) {
+            $output .= '<!-- ' . sprintf(esc_html__('@Webmaster, normally you will find the Google Analytics tracking code here, but you are in the disabled user groups. To change this, navigate to Insights %1$s Settings %1$s Ignore Users', 'google-analytics-for-wordpress'), '->') . ' -->' . PHP_EOL;
         } else {
-            $output .=  '<!-- ' . esc_html__( 'Normally you will find the Google Analytics tracking code here, but the webmaster disabled your user group.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+            $output .= '<!-- ' . esc_html__('Normally you will find the Google Analytics tracking code here, but the webmaster disabled your user group.', 'google-analytics-for-wordpress') . ' -->' . PHP_EOL;
         }
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->' . PHP_EOL . PHP_EOL;
+        $output .= '<!-- / Google Analytics by MonsterInsights -->' . PHP_EOL . PHP_EOL;
         return $output;
     }
 }
\ No newline at end of file

includes/frontend/tracking/class-tracking-ga.php

Spacing +30 added lines, -30 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,65 +71,65 @@ 
 		global $wp_query;
 		$options = array();
 
-		if ( monsterinsights_get_ua_to_output() ) {
+		if (monsterinsights_get_ua_to_output()) {
 			$options['_setAccount'] = "'_setAccount', '" . monsterinsights_get_ua_to_output() . "'";
 		} else {
 			return $options;
 		}
 
-		if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
-			$options['_setDomainName'] = "'_setDomainName', '" . esc_js( monsterinsights_get_option( 'subdomain_tracking', '' ) ) . "'";
+		if (monsterinsights_get_option('subdomain_tracking', false)) {
+			$options['_setDomainName'] = "'_setDomainName', '" . esc_js(monsterinsights_get_option('subdomain_tracking', '')) . "'";
 		}
 
-		if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
+		if (monsterinsights_get_option('allow_anchor', false)) {
 			$options['_setAllowAnchor'] = "'_setAllowAnchor', true";
 		}
 
-		if ( monsterinsights_get_option( 'add_allow_linker', false ) ) {
+		if (monsterinsights_get_option('add_allow_linker', false)) {
 			$options['_setAllowLinker'] = "'_setAllowLinker', true";
 		}
 
 		// SSL data
 		$options['_forceSSL'] = "'_gat._forceSSL'";
 
-		if ( monsterinsights_get_option( 'custom_code', false ) ) {
+		if (monsterinsights_get_option('custom_code', false)) {
 			// Add custom code to the view
 			$options['custom_code'] = array(
 				'type'  => 'custom_code',
-				'value' => esc_js( stripslashes( monsterinsights_get_option( 'custom_code', '' ) ) ),
+				'value' => esc_js(stripslashes(monsterinsights_get_option('custom_code', ''))),
 			);
 		}
 
 		// Anonymous data
-		if ( monsterinsights_get_option( 'anonymize_ips', false ) && ! monsterinsights_get_option( 'allowhash', false ) ) {
+		if (monsterinsights_get_option('anonymize_ips', false) && ! monsterinsights_get_option('allowhash', false)) {
 			$options['anonymize_ips'] = "'_gat._anonymizeIp'";
 		}
 
-		if ( monsterinsights_get_option( 'allowhash', false ) ) {
+		if (monsterinsights_get_option('allowhash', false)) {
 			$options['allowhash'] = "'_gat._anonymizeIp',true";
 		}
 
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_ga_before_pageview', $options );
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
+		$options = apply_filters('monsterinsights_frontend_tracking_options_ga_before_pageview', $options);
+		$options = apply_filters('monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version);
 
-		if ( is_404() ) {
+		if (is_404()) {
 			$options['_trackPageview'] = "'_trackPageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
-		} else if ( $wp_query->is_search ) {
+		} else if ($wp_query->is_search) {
 			$pushstr = "'_trackPageview','/?s=";
-			if ( (int) $wp_query->found_posts === 0 ) {
-				$options['_trackPageview'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
-			} else if ( (int) $wp_query->found_posts === 1 ) {
-				$options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
-			} else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
-				$options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
+			if ((int) $wp_query->found_posts === 0) {
+				$options['_trackPageview'] = $pushstr . 'no-results:' . rawurlencode($wp_query->query_vars['s']) . "&cat=no-results'";
+			} else if ((int) $wp_query->found_posts === 1) {
+				$options['_trackPageview'] = $pushstr . rawurlencode($wp_query->query_vars['s']) . "&cat=1-result'";
+			} else if ($wp_query->found_posts > 1 && $wp_query->found_posts < 6) {
+				$options['_trackPageview'] = $pushstr . rawurlencode($wp_query->query_vars['s']) . "&cat=2-5-results'";
 			} else {
-				$options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
+				$options['_trackPageview'] = $pushstr . rawurlencode($wp_query->query_vars['s']) . "&cat=plus-5-results'";
 			}
 		} else {
 			$options['_trackPageview'] = "'_trackPageview'";
 		}
 
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_ga_end', $options );
+		$options = apply_filters('monsterinsights_frontend_tracking_options_ga_end', $options);
 		return $options;
 	}
 
@@ -147,21 +147,21 @@ 
 	 */
 	public function frontend_output( ) {
 		 $options = $this->frontend_tracking_options();
-		 $src     = apply_filters( 'monsterinsights_frontend_output_ga_src', "('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n" );
+		 $src     = apply_filters('monsterinsights_frontend_output_ga_src', "('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n");
 		 ob_start();
 		 ?>
  <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using ga.js tracking - https://www.monsterinsights.com/ -->
-<?php if ( monsterinsights_get_ua() ) { ?>
+<?php if (monsterinsights_get_ua()) { ?>
 <script type="text/javascript" data-cfasync="false">
 
 		var _gaq = _gaq || [];
 	<?php
-	if ( count( $options ) >= 1 ) {
-		foreach ( $options as $item ) {
-			if ( ! is_array( $item ) ) {
+	if (count($options) >= 1) {
+		foreach ($options as $item) {
+			if ( ! is_array($item)) {
 				echo '  _gaq.push([' . $item . "]);\n";
-			} else if ( isset( $item['value'] ) ) {
-				echo '  '.$item['value'] . "\n";
+			} else if (isset($item['value'])) {
+				echo '  ' . $item['value'] . "\n";
 			}
 		}
 	}
@@ -171,7 +171,7 @@ 
 			var ga = document.createElement('script');
 			ga.type = 'text/javascript';
 			ga.async = true;
-			ga.src = <?php echo $src;?>
+			ga.src = <?php echo $src; ?>
 			var s = document.getElementsByTagName('script')[0];
 			s.parentNode.insertBefore(ga, s);
 		})();

Indentation +149 added lines, -149 removed lines

@@ -10,162 +10,162 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class MonsterInsights_Tracking_GA extends MonsterInsights_Tracking_Abstract {
 
-	/**
-	 * Holds the base class object.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var object $base Base class object.
-	 */
-	public $base;
+    /**
+     * Holds the base class object.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var object $base Base class object.
+     */
+    public $base;
 	
-	/**
-	 * Holds the name of the tracking type.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $name Name of the tracking type.
-	 */
-	public $name = 'ga';
-
-	/**
-	 * Version of the tracking class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $version Version of the tracking class.
-	 */
-	public $version = '1.0.0';
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 */
-	public function __construct() {
-		$this->base = MonsterInsights();
-	}
-
-	/**
-	 * Get frontend tracking options.
-	 *
-	 * This function is used to return an array of parameters
-	 * for the frontend_output() function to output. These are 
-	 * generally dimensions and turned on GA features.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return array Array of the options to use.
-	 */
-	public function frontend_tracking_options( ) {
-		global $wp_query;
-		$options = array();
-
-		if ( monsterinsights_get_ua_to_output() ) {
-			$options['_setAccount'] = "'_setAccount', '" . monsterinsights_get_ua_to_output() . "'";
-		} else {
-			return $options;
-		}
-
-		if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
-			$options['_setDomainName'] = "'_setDomainName', '" . esc_js( monsterinsights_get_option( 'subdomain_tracking', '' ) ) . "'";
-		}
-
-		if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
-			$options['_setAllowAnchor'] = "'_setAllowAnchor', true";
-		}
-
-		if ( monsterinsights_get_option( 'add_allow_linker', false ) ) {
-			$options['_setAllowLinker'] = "'_setAllowLinker', true";
-		}
-
-		// SSL data
-		$options['_forceSSL'] = "'_gat._forceSSL'";
-
-		if ( monsterinsights_get_option( 'custom_code', false ) ) {
-			// Add custom code to the view
-			$options['custom_code'] = array(
-				'type'  => 'custom_code',
-				'value' => esc_js( stripslashes( monsterinsights_get_option( 'custom_code', '' ) ) ),
-			);
-		}
-
-		// Anonymous data
-		if ( monsterinsights_get_option( 'anonymize_ips', false ) && ! monsterinsights_get_option( 'allowhash', false ) ) {
-			$options['anonymize_ips'] = "'_gat._anonymizeIp'";
-		}
-
-		if ( monsterinsights_get_option( 'allowhash', false ) ) {
-			$options['allowhash'] = "'_gat._anonymizeIp',true";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_ga_before_pageview', $options );
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
-
-		if ( is_404() ) {
-			$options['_trackPageview'] = "'_trackPageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
-		} else if ( $wp_query->is_search ) {
-			$pushstr = "'_trackPageview','/?s=";
-			if ( (int) $wp_query->found_posts === 0 ) {
-				$options['_trackPageview'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
-			} else if ( (int) $wp_query->found_posts === 1 ) {
-				$options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
-			} else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
-				$options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
-			} else {
-				$options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
-			}
-		} else {
-			$options['_trackPageview'] = "'_trackPageview'";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_ga_end', $options );
-		return $options;
-	}
-
-	/**
-	 * Get frontend output.
-	 *
-	 * This function is used to return the Javascript
-	 * to output in the head of the page for the given
-	 * tracking method.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return string Javascript to output.
-	 */
-	public function frontend_output( ) {
-		 $options = $this->frontend_tracking_options();
-		 $src     = apply_filters( 'monsterinsights_frontend_output_ga_src', "('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n" );
-		 ob_start();
-		 ?>
+    /**
+     * Holds the name of the tracking type.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $name Name of the tracking type.
+     */
+    public $name = 'ga';
+
+    /**
+     * Version of the tracking class.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $version Version of the tracking class.
+     */
+    public $version = '1.0.0';
+
+    /**
+     * Primary class constructor.
+     *
+     * @since 6.0.0
+     * @access public
+     */
+    public function __construct() {
+        $this->base = MonsterInsights();
+    }
+
+    /**
+     * Get frontend tracking options.
+     *
+     * This function is used to return an array of parameters
+     * for the frontend_output() function to output. These are 
+     * generally dimensions and turned on GA features.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return array Array of the options to use.
+     */
+    public function frontend_tracking_options( ) {
+        global $wp_query;
+        $options = array();
+
+        if ( monsterinsights_get_ua_to_output() ) {
+            $options['_setAccount'] = "'_setAccount', '" . monsterinsights_get_ua_to_output() . "'";
+        } else {
+            return $options;
+        }
+
+        if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
+            $options['_setDomainName'] = "'_setDomainName', '" . esc_js( monsterinsights_get_option( 'subdomain_tracking', '' ) ) . "'";
+        }
+
+        if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
+            $options['_setAllowAnchor'] = "'_setAllowAnchor', true";
+        }
+
+        if ( monsterinsights_get_option( 'add_allow_linker', false ) ) {
+            $options['_setAllowLinker'] = "'_setAllowLinker', true";
+        }
+
+        // SSL data
+        $options['_forceSSL'] = "'_gat._forceSSL'";
+
+        if ( monsterinsights_get_option( 'custom_code', false ) ) {
+            // Add custom code to the view
+            $options['custom_code'] = array(
+                'type'  => 'custom_code',
+                'value' => esc_js( stripslashes( monsterinsights_get_option( 'custom_code', '' ) ) ),
+            );
+        }
+
+        // Anonymous data
+        if ( monsterinsights_get_option( 'anonymize_ips', false ) && ! monsterinsights_get_option( 'allowhash', false ) ) {
+            $options['anonymize_ips'] = "'_gat._anonymizeIp'";
+        }
+
+        if ( monsterinsights_get_option( 'allowhash', false ) ) {
+            $options['allowhash'] = "'_gat._anonymizeIp',true";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_ga_before_pageview', $options );
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
+
+        if ( is_404() ) {
+            $options['_trackPageview'] = "'_trackPageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
+        } else if ( $wp_query->is_search ) {
+            $pushstr = "'_trackPageview','/?s=";
+            if ( (int) $wp_query->found_posts === 0 ) {
+                $options['_trackPageview'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
+            } else if ( (int) $wp_query->found_posts === 1 ) {
+                $options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
+            } else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
+                $options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
+            } else {
+                $options['_trackPageview'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
+            }
+        } else {
+            $options['_trackPageview'] = "'_trackPageview'";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_ga_end', $options );
+        return $options;
+    }
+
+    /**
+     * Get frontend output.
+     *
+     * This function is used to return the Javascript
+     * to output in the head of the page for the given
+     * tracking method.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return string Javascript to output.
+     */
+    public function frontend_output( ) {
+            $options = $this->frontend_tracking_options();
+            $src     = apply_filters( 'monsterinsights_frontend_output_ga_src', "('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n" );
+            ob_start();
+            ?>
  <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using ga.js tracking - https://www.monsterinsights.com/ -->
 <?php if ( monsterinsights_get_ua() ) { ?>
 <script type="text/javascript" data-cfasync="false">
 
 		var _gaq = _gaq || [];
 	<?php
-	if ( count( $options ) >= 1 ) {
-		foreach ( $options as $item ) {
-			if ( ! is_array( $item ) ) {
-				echo '  _gaq.push([' . $item . "]);\n";
-			} else if ( isset( $item['value'] ) ) {
-				echo '  '.$item['value'] . "\n";
-			}
-		}
-	}
-	?>
+    if ( count( $options ) >= 1 ) {
+        foreach ( $options as $item ) {
+            if ( ! is_array( $item ) ) {
+                echo '  _gaq.push([' . $item . "]);\n";
+            } else if ( isset( $item['value'] ) ) {
+                echo '  '.$item['value'] . "\n";
+            }
+        }
+    }
+    ?>
 
 		(function () {
 			var ga = document.createElement('script');
@@ -181,8 +181,8 @@ 
 <?php } ?>
 <!-- / Google Analytics by MonsterInsights -->
 <?php
-		$output = ob_get_contents();
-		ob_end_clean();
-		return $output;
-	}
+        $output = ob_get_contents();
+        ob_end_clean();
+        return $output;
+    }
 }

includes/frontend/class-tracking-abstract.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 

Indentation +1 added lines, -1 removed lines

@@ -84,6 +84,6 @@
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-         return "<!-- MonsterInsights Abstract Tracking class -->";
+            return "<!-- MonsterInsights Abstract Tracking class -->";
     }
 }
\ No newline at end of file