awesomemotive / google-analytics-for-wordpress

includes/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 //Nothing to see here
 
-header( 'HTTP/1.0 403 Forbidden' );
\ No newline at end of file
+header('HTTP/1.0 403 Forbidden');
\ No newline at end of file

includes/measurement-protocol.php

Indentation +113 added lines, -113 removed lines

@@ -1,149 +1,149 @@
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+  exit; // Exit if accessed directly
 }
 
 function monsterinsights_get_mp_api_url( ) {
-	if ( monsterinsights_is_debug_mode() ) {
-		return 'https://www.google-analytics.com/debug/collect';
-	} else {
-		return 'https://ssl.google-analytics.com/collect';
-	}
+  if ( monsterinsights_is_debug_mode() ) {
+    return 'https://www.google-analytics.com/debug/collect';
+  } else {
+    return 'https://ssl.google-analytics.com/collect';
+  }
 }
 
 function monsterinsights_mp_api_call( $args = array() ) {
-	$user_agent = '';
-	if ( ! empty( $args['user-agent'] ) ) {
-		$user_agent = $args['user-agent'];
-		unset( $args['user-agent'] );
-	}
-
-	$payment_id = 0;
-	if ( ! empty( $args['payment_id'] ) ) {
-		$payment_id = $args['payment_id'];
-		unset( $args['payment_id'] );
-	}
-
-	$defaults = array(
-		't'  => 'event', // Required: Hit type
-		'ec' => '',      // Optional: Event category
-		'ea' => '', 	 // Optional: Event Action
-		'el' => '', 	 // Optional: Event Label
-		'ev' => null, 	 // Optional: Event Value
-	);
-
-	$body  = array_merge( $defaults , $args );
-
-	// We want to get the user's IP address when possible
-	$ip     = '';
-	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) && ! filter_var( $_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP ) === false ) {
-		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) && ! filter_var( $_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) === false ) {
-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	} else {
-		$ip = $_SERVER['REMOTE_ADDR'];
-	}
-
-	// If possible, let's get the user's language
-	$user_language = isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) ? explode( ',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) : array();
-	$user_language = reset( $user_language );
-	$user_language = sanitize_text_field( $user_language );
-
-	$default_body = array(
-		// Required: Version
-		'v'   => '1',
+  $user_agent = '';
+  if ( ! empty( $args['user-agent'] ) ) {
+    $user_agent = $args['user-agent'];
+    unset( $args['user-agent'] );
+  }
+
+  $payment_id = 0;
+  if ( ! empty( $args['payment_id'] ) ) {
+    $payment_id = $args['payment_id'];
+    unset( $args['payment_id'] );
+  }
+
+  $defaults = array(
+    't'  => 'event', // Required: Hit type
+    'ec' => '',      // Optional: Event category
+    'ea' => '', 	 // Optional: Event Action
+    'el' => '', 	 // Optional: Event Label
+    'ev' => null, 	 // Optional: Event Value
+  );
+
+  $body  = array_merge( $defaults , $args );
+
+  // We want to get the user's IP address when possible
+  $ip     = '';
+  if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) && ! filter_var( $_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP ) === false ) {
+    $ip = $_SERVER['HTTP_CLIENT_IP'];
+  } elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) && ! filter_var( $_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) === false ) {
+    $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+  } else {
+    $ip = $_SERVER['REMOTE_ADDR'];
+  }
+
+  // If possible, let's get the user's language
+  $user_language = isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) ? explode( ',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) : array();
+  $user_language = reset( $user_language );
+  $user_language = sanitize_text_field( $user_language );
+
+  $default_body = array(
+    // Required: Version
+    'v'   => '1',
 		
-		// Required: UA code
-		'tid' => monsterinsights_get_ua_to_output( array( 'ecommerce' => $args ) ),
+    // Required: UA code
+    'tid' => monsterinsights_get_ua_to_output( array( 'ecommerce' => $args ) ),
 		
-		// Required: User visitor ID
-		'cid' => monsterinsights_get_client_id( $payment_id ),
+    // Required: User visitor ID
+    'cid' => monsterinsights_get_client_id( $payment_id ),
 
-		// Required: Type of hit (either pageview or event)
-		't'   => 'pageview', // Required - Hit type
+    // Required: Type of hit (either pageview or event)
+    't'   => 'pageview', // Required - Hit type
 
-		// Optional: Was the event a non-interaction event (for bounce purposes)
-		'ni'  => true,
+    // Optional: Was the event a non-interaction event (for bounce purposes)
+    'ni'  => true,
 
-		// Optional: Document Host Name
-		'dh'  => str_replace( array( 'http://', 'https://' ), '', site_url() ),
+    // Optional: Document Host Name
+    'dh'  => str_replace( array( 'http://', 'https://' ), '', site_url() ),
 
-		// Optional: Requested URI
-		'dp'  => $_SERVER['REQUEST_URI'],
+    // Optional: Requested URI
+    'dp'  => $_SERVER['REQUEST_URI'],
 
-		// Optional: Page Title
-		'dt'  => get_the_title(),
+    // Optional: Page Title
+    'dt'  => get_the_title(),
 
-		// Optional: User language
-		'ul'  => $user_language,
+    // Optional: User language
+    'ul'  => $user_language,
 
-		// Optional: User IP address
-		'uip' => $ip,
+    // Optional: User IP address
+    'uip' => $ip,
 
-		// Optional: User Agent
-		'ua'  => ! empty( $user_agent ) ?  $user_agent : $_SERVER['HTTP_USER_AGENT'],
+    // Optional: User Agent
+    'ua'  => ! empty( $user_agent ) ?  $user_agent : $_SERVER['HTTP_USER_AGENT'],
 
-		// Optional: Time of the event
-		'z'   => time()
-	);
+    // Optional: Time of the event
+    'z'   => time()
+  );
 
-	$body = wp_parse_args( $body, $default_body );
-	// $body = apply_filters( 'monsterinsights_mp_api_call', $body );
+  $body = wp_parse_args( $body, $default_body );
+  // $body = apply_filters( 'monsterinsights_mp_api_call', $body );
 
 
-	// Ensure that the CID is not empty
-	if ( empty( $body['cid'] ) ) {
-		$body['cid'] = monsterinsights_generate_uuid();
-	}
+  // Ensure that the CID is not empty
+  if ( empty( $body['cid'] ) ) {
+    $body['cid'] = monsterinsights_generate_uuid();
+  }
 
-	// Unset empty values to reduce request size
-	foreach ( $body as $key => $value ) {
-		if ( empty( $value ) ) {
-			unset( $body[ $key ] );
-		}
-	}
+  // Unset empty values to reduce request size
+  foreach ( $body as $key => $value ) {
+    if ( empty( $value ) ) {
+      unset( $body[ $key ] );
+    }
+  }
 
-	$debug_mode = monsterinsights_is_debug_mode();
-	$args = array(
-		'method'   => 'POST',
-		'timeout'  => '5',
-		'blocking' => ( $debug_mode ) ? true : false,
-		'body'     => $body,
-	);
+  $debug_mode = monsterinsights_is_debug_mode();
+  $args = array(
+    'method'   => 'POST',
+    'timeout'  => '5',
+    'blocking' => ( $debug_mode ) ? true : false,
+    'body'     => $body,
+  );
 
-	if ( ! empty( $user_agent ) ) {
-		$args['user-agent'] = $user_agent;
-	}
+  if ( ! empty( $user_agent ) ) {
+    $args['user-agent'] = $user_agent;
+  }
 
-	$response = wp_remote_post( monsterinsights_get_mp_api_url(), $args );
+  $response = wp_remote_post( monsterinsights_get_mp_api_url(), $args );
 
-	//
-	//if ( $debug_mode ) {
-	//	monsterinsights_debug_output( $body );
-	//	monsterinsights_debug_output( $response );
-	//}
-	return $response;
+  //
+  //if ( $debug_mode ) {
+  //	monsterinsights_debug_output( $body );
+  //	monsterinsights_debug_output( $response );
+  //}
+  return $response;
 }
 
 function monsterinsights_mp_track_event_call( $args = array() ) {
-	$default_args = array(
-		// Change the default type to event
-		't'  => 'event',
+  $default_args = array(
+    // Change the default type to event
+    't'  => 'event',
 
-		// Required: Event Category
-		'ec' => '',
+    // Required: Event Category
+    'ec' => '',
 		
-		// Required: Event Action
-		'ea' => '',
+    // Required: Event Action
+    'ea' => '',
 
-		// Required: Event Label
-		'el' => '',
+    // Required: Event Label
+    'el' => '',
 
-		// Optional: Event Value
-		'ev' => null,
-	);
-	$args  = wp_parse_args( $args, $default_args );
-	//$args = apply_filters( 'monsterinsights_mp_track_event_call', $args );
+    // Optional: Event Value
+    'ev' => null,
+  );
+  $args  = wp_parse_args( $args, $default_args );
+  //$args = apply_filters( 'monsterinsights_mp_track_event_call', $args );
 
-	return monsterinsights_mp_api_call( $args );
+  return monsterinsights_mp_api_call( $args );
 }
\ No newline at end of file

Spacing +33 added lines, -33 removed lines

@@ -1,63 +1,63 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
 function monsterinsights_get_mp_api_url( ) {
-	if ( monsterinsights_is_debug_mode() ) {
+	if (monsterinsights_is_debug_mode()) {
 		return 'https://www.google-analytics.com/debug/collect';
 	} else {
 		return 'https://ssl.google-analytics.com/collect';
 	}
 }
 
-function monsterinsights_mp_api_call( $args = array() ) {
+function monsterinsights_mp_api_call($args = array()) {
 	$user_agent = '';
-	if ( ! empty( $args['user-agent'] ) ) {
+	if ( ! empty($args['user-agent'])) {
 		$user_agent = $args['user-agent'];
-		unset( $args['user-agent'] );
+		unset($args['user-agent']);
 	}
 
 	$payment_id = 0;
-	if ( ! empty( $args['payment_id'] ) ) {
+	if ( ! empty($args['payment_id'])) {
 		$payment_id = $args['payment_id'];
-		unset( $args['payment_id'] );
+		unset($args['payment_id']);
 	}
 
 	$defaults = array(
 		't'  => 'event', // Required: Hit type
-		'ec' => '',      // Optional: Event category
-		'ea' => '', 	 // Optional: Event Action
-		'el' => '', 	 // Optional: Event Label
-		'ev' => null, 	 // Optional: Event Value
+		'ec' => '', // Optional: Event category
+		'ea' => '', // Optional: Event Action
+		'el' => '', // Optional: Event Label
+		'ev' => null, // Optional: Event Value
 	);
 
-	$body  = array_merge( $defaults , $args );
+	$body = array_merge($defaults, $args);
 
 	// We want to get the user's IP address when possible
-	$ip     = '';
-	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) && ! filter_var( $_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP ) === false ) {
+	$ip = '';
+	if ( ! empty($_SERVER['HTTP_CLIENT_IP']) && ! filter_var($_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP) === false) {
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) && ! filter_var( $_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) === false ) {
+	} elseif ( ! empty($_SERVER['HTTP_X_FORWARDED_FOR']) && ! filter_var($_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP) === false) {
 		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
 	} else {
 		$ip = $_SERVER['REMOTE_ADDR'];
 	}
 
 	// If possible, let's get the user's language
-	$user_language = isset( $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) ? explode( ',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ) : array();
-	$user_language = reset( $user_language );
-	$user_language = sanitize_text_field( $user_language );
+	$user_language = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) : array();
+	$user_language = reset($user_language);
+	$user_language = sanitize_text_field($user_language);
 
 	$default_body = array(
 		// Required: Version
 		'v'   => '1',
 		
 		// Required: UA code
-		'tid' => monsterinsights_get_ua_to_output( array( 'ecommerce' => $args ) ),
+		'tid' => monsterinsights_get_ua_to_output(array('ecommerce' => $args)),
 		
 		// Required: User visitor ID
-		'cid' => monsterinsights_get_client_id( $payment_id ),
+		'cid' => monsterinsights_get_client_id($payment_id),
 
 		// Required: Type of hit (either pageview or event)
 		't'   => 'pageview', // Required - Hit type
@@ -66,7 +66,7 @@ 
 		'ni'  => true,
 
 		// Optional: Document Host Name
-		'dh'  => str_replace( array( 'http://', 'https://' ), '', site_url() ),
+		'dh'  => str_replace(array('http://', 'https://'), '', site_url()),
 
 		// Optional: Requested URI
 		'dp'  => $_SERVER['REQUEST_URI'],
@@ -81,25 +81,25 @@ 
 		'uip' => $ip,
 
 		// Optional: User Agent
-		'ua'  => ! empty( $user_agent ) ?  $user_agent : $_SERVER['HTTP_USER_AGENT'],
+		'ua'  => ! empty($user_agent) ? $user_agent : $_SERVER['HTTP_USER_AGENT'],
 
 		// Optional: Time of the event
 		'z'   => time()
 	);
 
-	$body = wp_parse_args( $body, $default_body );
+	$body = wp_parse_args($body, $default_body);
 	// $body = apply_filters( 'monsterinsights_mp_api_call', $body );
 
 
 	// Ensure that the CID is not empty
-	if ( empty( $body['cid'] ) ) {
+	if (empty($body['cid'])) {
 		$body['cid'] = monsterinsights_generate_uuid();
 	}
 
 	// Unset empty values to reduce request size
-	foreach ( $body as $key => $value ) {
-		if ( empty( $value ) ) {
-			unset( $body[ $key ] );
+	foreach ($body as $key => $value) {
+		if (empty($value)) {
+			unset($body[$key]);
 		}
 	}
 
@@ -107,15 +107,15 @@ 
 	$args = array(
 		'method'   => 'POST',
 		'timeout'  => '5',
-		'blocking' => ( $debug_mode ) ? true : false,
+		'blocking' => ($debug_mode) ? true : false,
 		'body'     => $body,
 	);
 
-	if ( ! empty( $user_agent ) ) {
+	if ( ! empty($user_agent)) {
 		$args['user-agent'] = $user_agent;
 	}
 
-	$response = wp_remote_post( monsterinsights_get_mp_api_url(), $args );
+	$response = wp_remote_post(monsterinsights_get_mp_api_url(), $args);
 
 	//
 	//if ( $debug_mode ) {
@@ -125,7 +125,7 @@ 
 	return $response;
 }
 
-function monsterinsights_mp_track_event_call( $args = array() ) {
+function monsterinsights_mp_track_event_call($args = array()) {
 	$default_args = array(
 		// Change the default type to event
 		't'  => 'event',
@@ -142,8 +142,8 @@ 
 		// Optional: Event Value
 		'ev' => null,
 	);
-	$args  = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args($args, $default_args);
 	//$args = apply_filters( 'monsterinsights_mp_track_event_call', $args );
 
-	return monsterinsights_mp_api_call( $args );
+	return monsterinsights_mp_api_call($args);
 }
\ No newline at end of file

lite/includes/admin/addons.php

Indentation +164 added lines, -164 removed lines

@@ -2,172 +2,172 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) { 
-	exit;
+  exit;
 }
 
 function monsterinsights_registered_settings_filter( $settings ) {
-	$tracking_mode   = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-	$events_tracking = monsterinsights_get_option( 'events_mode', 'js' );
-
-	// both
-	if ( ! empty( $settings['engagement']['events_mode'] ) ) {
-		if ( $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
-			// if we're not using Universal Analytics, we can't do JS events tracking
-			unset( $settings['engagement']['events_mode']['options']['js'] );
-		} else {
-			if ( $tracking_mode !== 'ga' && $events_tracking !== 'php' && ! monsterinsights_is_debug_mode() ) {
-			   // if we're not using PHP events tracking, turn it off
-				unset( $settings['engagement']['events_mode']['options']['php'] );
-			}
-		}
-	}
-	if ( ! empty( $settings['demographics']['demographics'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
-		// Events relies on universal tracking
-		$url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
-		$settings['demographics']['demographics']['type'] = 'notice';
-		$settings['demographics']['demographics']['desc'] = sprintf( esc_html__( 'Demographics and Interests tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' );
-	}
-	if ( ! empty( $settings['links']['enhanced_link_attribution'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
-		// This relies on universal tracking
-		$url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
-		$settings['links']['enhanced_link_attribution']['type'] = 'notice';
-		$settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'Enhanced Link Attribution tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' );
-	}
-
-
-	if ( ! empty( $settings['compatibility']['subdomain_tracking'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
-		$settings['links']['enhanced_link_attribution']['name'] = __( 'Subdomain tracking:', 'google-analytics-for-wordpress' );
-		$settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'This allows you to set the domain that\'s set by %1$s for tracking subdomains. If empty, this will not be set. Can be used to set localhost for ga.js tracking.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory#_gat.GA_Tracker_._setDomainName" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setDomainName</code></a>' );
-	}
-
-
-	// Addons:
-		// Social
-			$settings['social']['social_notice'] = array( 
-				'id' => 'social_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress' )
-			);
-
-		// Ads
-			$settings['ads']['ads_notice'] = array( 
-				'id' => 'ads_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress' )
-			);
-
-		// Forms
-			$settings['forms']['forms_notice'] = array( 
-				'id' => 'forms_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress' )
-			);
-
-		// Media
-			$settings['media']['media_notice'] = array( 
-				'id' => 'media_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress' )
-			);
-
-		// Membership
-			$settings['membership']['membership_notice'] = array( 
-				'id' => 'membership_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress' )
-			);
-
-			// Dimensions
-			$settings['dimensions']['dimensions_notice'] = array( 
-				'id' => 'dimensions_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress' )
-			);
-
-			// Performance
-			$settings['performance']['performance_notice'] = array( 
-				'id' => 'performance_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress' )
-			);
-
-			// Reporting
-			$settings['reporting']['reporting_notice'] = array( 
-				'id' => 'reporting_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress' )
-			);
-
-			// Google AMP
-			$settings['amp']['amp_notice'] = array( 
-				'id' => 'amp_notice',
-				'no_label' => true,
-				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress' )
-			);
-
-			// Google Optimize
-			$settings['goptimize']['goptimize_notice'] = array( 
-				'id' => 'goptimize_notice',
-				'no_label' => true,
-				'name' => __( 'Want to use Google Optimize to retarget your website vistors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress' )
-			);
-
-			// Facebook Instant Articles
-			$settings['fbia']['fbia_notice'] = array( 
-				'id' => 'fbia_notice',
-				'no_label' => true,
-				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress' )
-			);
-
-			// Bounce Reduction
-			$settings['bounce']['bounce_notice'] = array( 
-				'id' => 'bounce_notice',
-				'no_label' => true,
-				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress' )
-			);
-
-			// Notifications
-			$settings['notifications']['notifications_notice'] = array( 
-				'id' => 'notifications_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress' )
-			);
-
-			// eCommerce
-			$settings['ecommerce']['ecommerce_notice'] = array( 
-				'id' => 'ecommerce_notice',
-				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
-				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress' )
-			);
-
-	return $settings;
+  $tracking_mode   = monsterinsights_get_option( 'tracking_mode', 'analytics' );
+  $events_tracking = monsterinsights_get_option( 'events_mode', 'js' );
+
+  // both
+  if ( ! empty( $settings['engagement']['events_mode'] ) ) {
+    if ( $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+      // if we're not using Universal Analytics, we can't do JS events tracking
+      unset( $settings['engagement']['events_mode']['options']['js'] );
+    } else {
+      if ( $tracking_mode !== 'ga' && $events_tracking !== 'php' && ! monsterinsights_is_debug_mode() ) {
+          // if we're not using PHP events tracking, turn it off
+        unset( $settings['engagement']['events_mode']['options']['php'] );
+      }
+    }
+  }
+  if ( ! empty( $settings['demographics']['demographics'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+    // Events relies on universal tracking
+    $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
+    $settings['demographics']['demographics']['type'] = 'notice';
+    $settings['demographics']['demographics']['desc'] = sprintf( esc_html__( 'Demographics and Interests tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' );
+  }
+  if ( ! empty( $settings['links']['enhanced_link_attribution'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+    // This relies on universal tracking
+    $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
+    $settings['links']['enhanced_link_attribution']['type'] = 'notice';
+    $settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'Enhanced Link Attribution tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' );
+  }
+
+
+  if ( ! empty( $settings['compatibility']['subdomain_tracking'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+    $settings['links']['enhanced_link_attribution']['name'] = __( 'Subdomain tracking:', 'google-analytics-for-wordpress' );
+    $settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'This allows you to set the domain that\'s set by %1$s for tracking subdomains. If empty, this will not be set. Can be used to set localhost for ga.js tracking.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory#_gat.GA_Tracker_._setDomainName" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setDomainName</code></a>' );
+  }
+
+
+  // Addons:
+    // Social
+      $settings['social']['social_notice'] = array( 
+        'id' => 'social_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress' )
+      );
+
+    // Ads
+      $settings['ads']['ads_notice'] = array( 
+        'id' => 'ads_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress' )
+      );
+
+    // Forms
+      $settings['forms']['forms_notice'] = array( 
+        'id' => 'forms_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress' )
+      );
+
+    // Media
+      $settings['media']['media_notice'] = array( 
+        'id' => 'media_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress' )
+      );
+
+    // Membership
+      $settings['membership']['membership_notice'] = array( 
+        'id' => 'membership_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress' )
+      );
+
+      // Dimensions
+      $settings['dimensions']['dimensions_notice'] = array( 
+        'id' => 'dimensions_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress' )
+      );
+
+      // Performance
+      $settings['performance']['performance_notice'] = array( 
+        'id' => 'performance_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress' )
+      );
+
+      // Reporting
+      $settings['reporting']['reporting_notice'] = array( 
+        'id' => 'reporting_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress' )
+      );
+
+      // Google AMP
+      $settings['amp']['amp_notice'] = array( 
+        'id' => 'amp_notice',
+        'no_label' => true,
+        'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress' )
+      );
+
+      // Google Optimize
+      $settings['goptimize']['goptimize_notice'] = array( 
+        'id' => 'goptimize_notice',
+        'no_label' => true,
+        'name' => __( 'Want to use Google Optimize to retarget your website vistors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress' )
+      );
+
+      // Facebook Instant Articles
+      $settings['fbia']['fbia_notice'] = array( 
+        'id' => 'fbia_notice',
+        'no_label' => true,
+        'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress' )
+      );
+
+      // Bounce Reduction
+      $settings['bounce']['bounce_notice'] = array( 
+        'id' => 'bounce_notice',
+        'no_label' => true,
+        'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress' )
+      );
+
+      // Notifications
+      $settings['notifications']['notifications_notice'] = array( 
+        'id' => 'notifications_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress' )
+      );
+
+      // eCommerce
+      $settings['ecommerce']['ecommerce_notice'] = array( 
+        'id' => 'ecommerce_notice',
+        'no_label' => true,
+        'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+        'type' => 'upgrade_notice',
+        'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress' )
+      );
+
+  return $settings;
 }
 add_filter( 'monsterinsights_registered_settings', 'monsterinsights_registered_settings_filter' );

Spacing +47 added lines, -47 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined('ABSPATH')) { 
 	exit;
 }
 
-function monsterinsights_registered_settings_filter( $settings ) {
-	$tracking_mode   = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-	$events_tracking = monsterinsights_get_option( 'events_mode', 'js' );
+function monsterinsights_registered_settings_filter($settings) {
+	$tracking_mode   = monsterinsights_get_option('tracking_mode', 'analytics');
+	$events_tracking = monsterinsights_get_option('events_mode', 'js');
 
 	// both
-	if ( ! empty( $settings['engagement']['events_mode'] ) ) {
-		if ( $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+	if ( ! empty($settings['engagement']['events_mode'])) {
+		if ($tracking_mode === 'ga' && ! monsterinsights_is_debug_mode()) {
 			// if we're not using Universal Analytics, we can't do JS events tracking
-			unset( $settings['engagement']['events_mode']['options']['js'] );
+			unset($settings['engagement']['events_mode']['options']['js']);
 		} else {
-			if ( $tracking_mode !== 'ga' && $events_tracking !== 'php' && ! monsterinsights_is_debug_mode() ) {
+			if ($tracking_mode !== 'ga' && $events_tracking !== 'php' && ! monsterinsights_is_debug_mode()) {
 			   // if we're not using PHP events tracking, turn it off
-				unset( $settings['engagement']['events_mode']['options']['php'] );
+				unset($settings['engagement']['events_mode']['options']['php']);
 			}
 		}
 	}
-	if ( ! empty( $settings['demographics']['demographics'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+	if ( ! empty($settings['demographics']['demographics']) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode()) {
 		// Events relies on universal tracking
-		$url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
+		$url = esc_url(wp_nonce_url(add_query_arg(array('monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics')), 'monsterinsights-switch-to-analyticsjs-nonce'));
 		$settings['demographics']['demographics']['type'] = 'notice';
-		$settings['demographics']['demographics']['desc'] = sprintf( esc_html__( 'Demographics and Interests tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' );
+		$settings['demographics']['demographics']['desc'] = sprintf(esc_html__('Demographics and Interests tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>');
 	}
-	if ( ! empty( $settings['links']['enhanced_link_attribution'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
+	if ( ! empty($settings['links']['enhanced_link_attribution']) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode()) {
 		// This relies on universal tracking
-		$url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
+		$url = esc_url(wp_nonce_url(add_query_arg(array('monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'demographics')), 'monsterinsights-switch-to-analyticsjs-nonce'));
 		$settings['links']['enhanced_link_attribution']['type'] = 'notice';
-		$settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'Enhanced Link Attribution tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' );
+		$settings['links']['enhanced_link_attribution']['desc'] = sprintf(esc_html__('Enhanced Link Attribution tracking is only available on Universal Tracking (analytics.js). You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for additional functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>');
 	}
 
 
-	if ( ! empty( $settings['compatibility']['subdomain_tracking'] ) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode() ) {
-		$settings['links']['enhanced_link_attribution']['name'] = __( 'Subdomain tracking:', 'google-analytics-for-wordpress' );
-		$settings['links']['enhanced_link_attribution']['desc'] = sprintf( esc_html__( 'This allows you to set the domain that\'s set by %1$s for tracking subdomains. If empty, this will not be set. Can be used to set localhost for ga.js tracking.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory#_gat.GA_Tracker_._setDomainName" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setDomainName</code></a>' );
+	if ( ! empty($settings['compatibility']['subdomain_tracking']) && $tracking_mode === 'ga' && ! monsterinsights_is_debug_mode()) {
+		$settings['links']['enhanced_link_attribution']['name'] = __('Subdomain tracking:', 'google-analytics-for-wordpress');
+		$settings['links']['enhanced_link_attribution']['desc'] = sprintf(esc_html__('This allows you to set the domain that\'s set by %1$s for tracking subdomains. If empty, this will not be set. Can be used to set localhost for ga.js tracking.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory#_gat.GA_Tracker_._setDomainName" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setDomainName</code></a>');
 	}
 
 
@@ -46,128 +46,128 @@ 
 			$settings['social']['social_notice'] = array( 
 				'id' => 'social_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress')
 			);
 
 		// Ads
 			$settings['ads']['ads_notice'] = array( 
 				'id' => 'ads_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress')
 			);
 
 		// Forms
 			$settings['forms']['forms_notice'] = array( 
 				'id' => 'forms_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress')
 			);
 
 		// Media
 			$settings['media']['media_notice'] = array( 
 				'id' => 'media_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress')
 			);
 
 		// Membership
 			$settings['membership']['membership_notice'] = array( 
 				'id' => 'membership_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress')
 			);
 
 			// Dimensions
 			$settings['dimensions']['dimensions_notice'] = array( 
 				'id' => 'dimensions_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress')
 			);
 
 			// Performance
 			$settings['performance']['performance_notice'] = array( 
 				'id' => 'performance_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress')
 			);
 
 			// Reporting
 			$settings['reporting']['reporting_notice'] = array( 
 				'id' => 'reporting_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress')
 			);
 
 			// Google AMP
 			$settings['amp']['amp_notice'] = array( 
 				'id' => 'amp_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress')
 			);
 
 			// Google Optimize
 			$settings['goptimize']['goptimize_notice'] = array( 
 				'id' => 'goptimize_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use Google Optimize to retarget your website vistors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to use Google Optimize to retarget your website vistors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress')
 			);
 
 			// Facebook Instant Articles
 			$settings['fbia']['fbia_notice'] = array( 
 				'id' => 'fbia_notice',
 				'no_label' => true,
-				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress')
 			);
 
 			// Bounce Reduction
 			$settings['bounce']['bounce_notice'] = array( 
 				'id' => 'bounce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress')
 			);
 
 			// Notifications
 			$settings['notifications']['notifications_notice'] = array( 
 				'id' => 'notifications_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress')
 			);
 
 			// eCommerce
 			$settings['ecommerce']['ecommerce_notice'] = array( 
 				'id' => 'ecommerce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __('Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
 				'type' => 'upgrade_notice',
-				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress' )
+				'desc' => esc_html__("By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress')
 			);
 
 	return $settings;
 }
-add_filter( 'monsterinsights_registered_settings', 'monsterinsights_registered_settings_filter' );
+add_filter('monsterinsights_registered_settings', 'monsterinsights_registered_settings_filter');

lite/includes/admin/tools.php

Indentation +3 added lines, -3 removed lines

@@ -1,17 +1,17 @@
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 
 function monsterinsights_tools_url_builder() {
-	ob_start();?>
+  ob_start();?>
 	<div class="monsterinsights-upsell-under-box">
 		<h2><?php esc_html_e( "Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress' ); ?></h2>
 		<p class="monsterinsights-upsell-lite-text"><?php esc_html_e( "By upgrading to MonsterInsights Pro, you can unlock the MonsterInsights URL builder that helps you better track your advertising and email marketing campaigns.", 'google-analytics-for-wordpress' ); ?></p>
 		<p><a href="<?php echo monsterinsights_get_upgrade_link(); ?>" class="button button-primary"><?php esc_html_e( "Click here to Upgrade", 'google-analytics-for-wordpress' ); ?></a></p>
 	</div>
 	<?php
-	echo ob_get_clean();
+  echo ob_get_clean();
 }
 add_action( 'monsterinsights_tools_url_builder_tab', 'monsterinsights_tools_url_builder' );
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,17 +1,17 @@
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 function monsterinsights_tools_url_builder() {
-	ob_start();?>
+	ob_start(); ?>
 	<div class="monsterinsights-upsell-under-box">
-		<h2><?php esc_html_e( "Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress' ); ?></h2>
-		<p class="monsterinsights-upsell-lite-text"><?php esc_html_e( "By upgrading to MonsterInsights Pro, you can unlock the MonsterInsights URL builder that helps you better track your advertising and email marketing campaigns.", 'google-analytics-for-wordpress' ); ?></p>
-		<p><a href="<?php echo monsterinsights_get_upgrade_link(); ?>" class="button button-primary"><?php esc_html_e( "Click here to Upgrade", 'google-analytics-for-wordpress' ); ?></a></p>
+		<h2><?php esc_html_e("Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress'); ?></h2>
+		<p class="monsterinsights-upsell-lite-text"><?php esc_html_e("By upgrading to MonsterInsights Pro, you can unlock the MonsterInsights URL builder that helps you better track your advertising and email marketing campaigns.", 'google-analytics-for-wordpress'); ?></p>
+		<p><a href="<?php echo monsterinsights_get_upgrade_link(); ?>" class="button button-primary"><?php esc_html_e("Click here to Upgrade", 'google-analytics-for-wordpress'); ?></a></p>
 	</div>
 	<?php
 	echo ob_get_clean();
 }
-add_action( 'monsterinsights_tools_url_builder_tab', 'monsterinsights_tools_url_builder' );
\ No newline at end of file
+add_action('monsterinsights_tools_url_builder_tab', 'monsterinsights_tools_url_builder');
\ No newline at end of file

lite/includes/admin/tab-support.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Callback for displaying the UI for support tab.
@@ -25,7 +25,7 @@ 
     <div id="monsterinsights-settings-general">
         <?php 
         // Output any notices now
-        do_action( 'monsterinsights_settings_support_tab_notice' );
+        do_action('monsterinsights_settings_support_tab_notice');
         ?>
         <?php //Status page coming soon. ?>
         <!-- <hr /> -->

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+  exit;
+}
 
 /**
  * Callback for displaying the UI for support tab.

lite/includes/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 //Nothing to see here
 
-header( 'HTTP/1.0 403 Forbidden' );
\ No newline at end of file
+header('HTTP/1.0 403 Forbidden');
\ No newline at end of file

lite/includes/install.php

Indentation +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) { 
-	exit;
+  exit;
 }
 
 // @todo: Add defaults for new installs
@@ -23,22 +23,22 @@ 
 //do_action( 'monsterinsights_after_install_routine', $version );
 
 function monsterinsights_lite_upgrade_from_yoast( $key, $network ) {
-	if ( $network ) {
-		$option                = array();
-		$option['key']         = $key;
-		$option['type']        = '';
-		$option['is_expired']  = false;
-		$option['is_disabled'] = false;
-		$option['is_invalid']  = false;
-		update_site_option( 'monsterinsights_license', $option );
-	} else {
-		$option                = array();
-		$option['key']         = $key;
-		$option['type']        = '';
-		$option['is_expired']  = false;
-		$option['is_disabled'] = false;
-		$option['is_invalid']  = false;
-		update_option( 'monsterinsights_license', $option );        
-	}
+  if ( $network ) {
+    $option                = array();
+    $option['key']         = $key;
+    $option['type']        = '';
+    $option['is_expired']  = false;
+    $option['is_disabled'] = false;
+    $option['is_invalid']  = false;
+    update_site_option( 'monsterinsights_license', $option );
+  } else {
+    $option                = array();
+    $option['key']         = $key;
+    $option['type']        = '';
+    $option['is_expired']  = false;
+    $option['is_disabled'] = false;
+    $option['is_invalid']  = false;
+    update_option( 'monsterinsights_license', $option );        
+  }
 }
 add_action( 'monsterinsights_upgrade_from_yoast', 'monsterinsights_lite_upgrade_from_yoast', 10, 2 );

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined('ABSPATH')) { 
 	exit;
 }
 
@@ -22,15 +22,15 @@ 
 // Add default 
 //do_action( 'monsterinsights_after_install_routine', $version );
 
-function monsterinsights_lite_upgrade_from_yoast( $key, $network ) {
-	if ( $network ) {
+function monsterinsights_lite_upgrade_from_yoast($key, $network) {
+	if ($network) {
 		$option                = array();
 		$option['key']         = $key;
 		$option['type']        = '';
 		$option['is_expired']  = false;
 		$option['is_disabled'] = false;
 		$option['is_invalid']  = false;
-		update_site_option( 'monsterinsights_license', $option );
+		update_site_option('monsterinsights_license', $option);
 	} else {
 		$option                = array();
 		$option['key']         = $key;
@@ -38,7 +38,7 @@ 
 		$option['is_expired']  = false;
 		$option['is_disabled'] = false;
 		$option['is_invalid']  = false;
-		update_option( 'monsterinsights_license', $option );        
+		update_option('monsterinsights_license', $option);        
 	}
 }
-add_action( 'monsterinsights_upgrade_from_yoast', 'monsterinsights_lite_upgrade_from_yoast', 10, 2 );
+add_action('monsterinsights_upgrade_from_yoast', 'monsterinsights_lite_upgrade_from_yoast', 10, 2);

lite/includes/google.php

Indentation +33 added lines, -33 removed lines

@@ -1,49 +1,49 @@
 <?php
 function monsterinsights_google_app_config() {
-	// We'll go ahead and ask for these permissions on new installs
-	$scopes = array( 
-		'https://www.googleapis.com/auth/analytics.readonly',
-		'https://www.googleapis.com/auth/analytics',
-	//	'https://www.googleapis.com/auth/analytics.manage.users',
-	//	'https://www.googleapis.com/auth/tagmanager.readonly',
-	//	'https://www.googleapis.com/auth/webmasters.readonly'
-	);
-	$config = array(
-		'application_name' => 'Google Analytics by MonsterInsights',
-		'client_id'        => '346753076522-21smrc6aq0hq8oij8001s57dfoo8igf5.apps.googleusercontent.com',
-		'client_secret'    => '5oWaEGFgp-bSrY6vWBmdPfIF',
-		'redirect_uri'     => 'urn:ietf:wg:oauth:2.0:oob',
-		'scopes'           => $scopes,
-	);
+  // We'll go ahead and ask for these permissions on new installs
+  $scopes = array( 
+    'https://www.googleapis.com/auth/analytics.readonly',
+    'https://www.googleapis.com/auth/analytics',
+  //	'https://www.googleapis.com/auth/analytics.manage.users',
+  //	'https://www.googleapis.com/auth/tagmanager.readonly',
+  //	'https://www.googleapis.com/auth/webmasters.readonly'
+  );
+  $config = array(
+    'application_name' => 'Google Analytics by MonsterInsights',
+    'client_id'        => '346753076522-21smrc6aq0hq8oij8001s57dfoo8igf5.apps.googleusercontent.com',
+    'client_secret'    => '5oWaEGFgp-bSrY6vWBmdPfIF',
+    'redirect_uri'     => 'urn:ietf:wg:oauth:2.0:oob',
+    'scopes'           => $scopes,
+  );
 
-	$config = apply_filters( 'monsterinsights_lite_google_app_config', $config );
-	$config['scopes'] = $scopes; // Scopes requested are not changeable to minimize breakage.
-	return $config;
+  $config = apply_filters( 'monsterinsights_lite_google_app_config', $config );
+  $config['scopes'] = $scopes; // Scopes requested are not changeable to minimize breakage.
+  return $config;
 }
 
 function monsterinsights_create_client() {
-	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/src/Google/autoload.php';
-	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-client.php';
-	$config = monsterinsights_google_app_config();
-	$client = new MonsterInsights_GA_Client( $config, 'lite' );
-	return $client;
+  require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/src/Google/autoload.php';
+  require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-client.php';
+  $config = monsterinsights_google_app_config();
+  $client = new MonsterInsights_GA_Client( $config, 'lite' );
+  return $client;
 }
 
 function monsterinsights_create_test_client() {
-	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/src/Google/autoload.php';
-	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-client.php';
-	$config = monsterinsights_google_app_config();
-	$client = new MonsterInsights_GA_Client( $config, 'test_lite' );
-	return $client;
+  require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/src/Google/autoload.php';
+  require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-client.php';
+  $config = monsterinsights_google_app_config();
+  $client = new MonsterInsights_GA_Client( $config, 'test_lite' );
+  return $client;
 }
 
 function monsterinsights_set_client_oauth_version(){
-	monsterinsights_update_option( 'oauth_version', '1.0' );
+  monsterinsights_update_option( 'oauth_version', '1.0' );
 }
 
 function monsterinsights_get_report_date_range() {
-	return array(
-		'start' => date( 'Y-m-d', strtotime( '-1 month' ) ),
-		'end'   => date( 'Y-m-d', strtotime( 'yesterday' ) ),
-	);
+  return array(
+    'start' => date( 'Y-m-d', strtotime( '-1 month' ) ),
+    'end'   => date( 'Y-m-d', strtotime( 'yesterday' ) ),
+  );
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 		'scopes'           => $scopes,
 	);
 
-	$config = apply_filters( 'monsterinsights_lite_google_app_config', $config );
+	$config = apply_filters('monsterinsights_lite_google_app_config', $config);
 	$config['scopes'] = $scopes; // Scopes requested are not changeable to minimize breakage.
 	return $config;
 }
@@ -25,7 +25,7 @@ 
 	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/src/Google/autoload.php';
 	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-client.php';
 	$config = monsterinsights_google_app_config();
-	$client = new MonsterInsights_GA_Client( $config, 'lite' );
+	$client = new MonsterInsights_GA_Client($config, 'lite');
 	return $client;
 }
 
@@ -33,17 +33,17 @@ 
 	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/src/Google/autoload.php';
 	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-client.php';
 	$config = monsterinsights_google_app_config();
-	$client = new MonsterInsights_GA_Client( $config, 'test_lite' );
+	$client = new MonsterInsights_GA_Client($config, 'test_lite');
 	return $client;
 }
 
-function monsterinsights_set_client_oauth_version(){
-	monsterinsights_update_option( 'oauth_version', '1.0' );
+function monsterinsights_set_client_oauth_version() {
+	monsterinsights_update_option('oauth_version', '1.0');
 }
 
 function monsterinsights_get_report_date_range() {
 	return array(
-		'start' => date( 'Y-m-d', strtotime( '-1 month' ) ),
-		'end'   => date( 'Y-m-d', strtotime( 'yesterday' ) ),
+		'start' => date('Y-m-d', strtotime('-1 month')),
+		'end'   => date('Y-m-d', strtotime('yesterday')),
 	);
 }
\ No newline at end of file

lite/includes/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 //Nothing to see here
 
-header( 'HTTP/1.0 403 Forbidden' );
\ No newline at end of file
+header('HTTP/1.0 403 Forbidden');
\ No newline at end of file