awesomemotive / google-analytics-for-wordpress

includes/admin/api-auth.php

Spacing +48 added lines, -48 removed lines

@@ -28,23 +28,23 @@ 
 	public function __construct() {
 
 		// Authentication Actions
-		add_action( 'wp_ajax_monsterinsights_maybe_authenticate',    array( $this, 'maybe_authenticate' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_reauthenticate',  array( $this, 'maybe_reauthenticate' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_verify',          array( $this, 'maybe_verify' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_delete',          array( $this, 'maybe_delete' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_authenticate', array( $this, 'maybe_authenticate' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_reauthenticate', array( $this, 'maybe_reauthenticate' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_verify', array( $this, 'maybe_verify' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_delete', array( $this, 'maybe_delete' ) );
 
-		add_action( 'admin_init',          							 array( $this, 'authenticate_listener' ) );
-		add_action( 'admin_init',          							 array( $this, 'reauthenticate_listener' ) );
+		add_action( 'admin_init', array( $this, 'authenticate_listener' ) );
+		add_action( 'admin_init', array( $this, 'reauthenticate_listener' ) );
 
-		add_action( 'wp_ajax_nopriv_monsterinsights_is_installed',    array( $this, 'is_installed' ) );
-		add_action( 'wp_ajax_nopriv_monsterinsights_rauthenticate',   array( $this, 'rauthenticate' ) );
+		add_action( 'wp_ajax_nopriv_monsterinsights_is_installed', array( $this, 'is_installed' ) );
+		add_action( 'wp_ajax_nopriv_monsterinsights_rauthenticate', array( $this, 'rauthenticate' ) );
 
 		add_filter( 'monsterinsights_maybe_authenticate_siteurl', array( $this, 'before_redirect' ) );
 
 		add_action( 'wp_ajax_nopriv_monsterinsights_push_mp_token', array( $this, 'handle_relay_mp_token_push' ) );
 	}
 
-	public function get_tt(){
+	public function get_tt() {
 		$tt = is_network_admin() ? get_site_option( 'monsterinsights_network_tt', '' ) : get_option( 'monsterinsights_site_tt', '' );
 		if ( empty( $tt ) ) {
 			// if TT is empty, generate a new one, save it and then return it
@@ -54,12 +54,12 @@ 
 		return $tt;
 	}
 
-	public function rotate_tt(){
+	public function rotate_tt() {
 		$tt = $this->generate_tt();
 		is_network_admin() ? update_site_option( 'monsterinsights_network_tt', $tt ) : update_option( 'monsterinsights_site_tt', $tt );
 	}
 
-	public function generate_tt(){
+	public function generate_tt() {
 		return hash( 'sha512', wp_generate_password( 128, true, true ) . AUTH_SALT . uniqid( "", true ) );
 	}
 
@@ -77,14 +77,14 @@ 
 		);
 	}
 
-	public function maybe_authenticate(){
+	public function maybe_authenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can authenticate
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -101,9 +101,9 @@ 
 
 		// we do not have a current auth
 		if ( ! $this->is_network_admin() && MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot authenticate. Please re-authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot authenticate. Please re-authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( $this->is_network_admin() && MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot network authenticate. Please re-authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot network authenticate. Please re-authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$sitei = $this->get_sitei();
@@ -173,7 +173,7 @@ 
 		wp_send_json_success();
 	}
 
-	public function authenticate_listener(){
+	public function authenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'auth' ) {
 			return;
@@ -191,12 +191,12 @@ 
 
 		// Make sure has required params
 		if (
-			empty( $_REQUEST['key'] )    ||
-			empty( $_REQUEST['token'] )  ||
+			empty( $_REQUEST['key'] ) ||
+			empty( $_REQUEST['token'] ) ||
 			empty( $_REQUEST['miview'] ) ||
-			empty( $_REQUEST['a'] )      ||
-			empty( $_REQUEST['w'] )      ||
-			empty( $_REQUEST['p'] )      ||
+			empty( $_REQUEST['a'] ) ||
+			empty( $_REQUEST['w'] ) ||
+			empty( $_REQUEST['p'] ) ||
 			( empty( $_REQUEST['ua'] ) && empty( $_REQUEST['v4'] ) )
 		) {
 			return;
@@ -230,7 +230,7 @@ 
 			$profile['measurement_protocol_secret'] = sanitize_text_field( $_REQUEST['mp'] );
 		}
 
-		$profile[ $code_key ] = $code_value;
+		$profile[$code_key] = $code_value;
 
 		$worked = $this->verify_auth( $profile );
 		if ( ! $worked || is_wp_error( $worked ) ) {
@@ -244,7 +244,7 @@ 
 		$where = $this->is_network_admin() ? 'network' : 'site';
 		MonsterInsights()->reporting->delete_aggregate_data( $where );
 
-		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' )  : admin_url( 'admin.php?page=monsterinsights_settings' ) ;
+		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$url = add_query_arg( array(
 			 'mi_action' => 'auth',
 			 'success'   => 'true',
@@ -254,14 +254,14 @@ 
 		exit;
 	}
 
-	public function maybe_reauthenticate(){
+	public function maybe_reauthenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can authenticate
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to re-authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to re-authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -278,9 +278,9 @@ 
 
 		// we do have a current auth
 		if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate the network. Please authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate the network. Please authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$siteurl = add_query_arg( array(
@@ -306,7 +306,7 @@ 
 		wp_send_json_success( array( 'redirect' => $siteurl ) );
 	}
 
-	public function reauthenticate_listener(){
+	public function reauthenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'reauth' ) {
 			return;
@@ -369,7 +369,7 @@ 
 			$profile['measurement_protocol_secret'] = sanitize_text_field( $_REQUEST['mp'] );
 		}
 
-		$profile[ $code_key ] = $code_value;
+		$profile[$code_key] = $code_value;
 
 		// Save Profile
 		$this->is_network_admin() ? MonsterInsights()->auth->set_network_analytics_profile( $profile ) : MonsterInsights()->auth->set_analytics_profile( $profile );
@@ -378,7 +378,7 @@ 
 		$where = $this->is_network_admin() ? 'network' : 'site';
 		MonsterInsights()->reporting->delete_aggregate_data( $where );
 
-		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' )  : admin_url( 'admin.php?page=monsterinsights_settings' ) ;
+		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$url = add_query_arg( array(
 			 'mi_action' => 'reauth',
 			 'success'   => 'true',
@@ -389,14 +389,14 @@ 
 		exit;
 	}
 
-	public function maybe_verify(){
+	public function maybe_verify() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can verify
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to verify MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to verify MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -405,9 +405,9 @@ 
 
 		// we have an auth to verify
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( monsterinsights_is_pro_version() ) {
@@ -418,14 +418,14 @@ 
 		}
 
 		$worked = $this->verify_auth();
-		if ( $worked && ! is_wp_error(  $worked ) ) {
+		if ( $worked && ! is_wp_error( $worked ) ) {
 			wp_send_json_success( array( 'message' => __( "Successfully verified.", 'google-analytics-for-wordpress' ) ) );
 		} else {
 			wp_send_json_error( array( 'message' => __( "Could not verify.", 'google-analytics-for-wordpress' ) ) );
 		}
 	}
 
-	public function verify_auth( $credentials = array() ){
+	public function verify_auth( $credentials = array() ) {
 		$creds = ! empty( $credentials ) ? $credentials : ( $this->is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile( true ) : MonsterInsights()->auth->get_analytics_profile( true ) );
 
 		if ( empty( $creds['key'] ) ) {
@@ -444,14 +444,14 @@ 
 		}
 	}
 
-	public function maybe_delete(){
+	public function maybe_delete() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can delete
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to deauthenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to deauthenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -460,9 +460,9 @@ 
 
 		// we have an auth to delete
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( monsterinsights_is_pro_version() ) {
@@ -475,7 +475,7 @@ 
 		$force = ! empty( $_REQUEST['forcedelete'] ) && $_REQUEST['forcedelete'] === 'true';
 
 		$worked = $this->delete_auth( $force );
-		if ( $worked && ! is_wp_error(  $worked ) ) {
+		if ( $worked && ! is_wp_error( $worked ) ) {
 			wp_send_json_success( array( 'message' => __( "Successfully deauthenticated.", 'google-analytics-for-wordpress' ) ) );
 		} else {
 			if ( $force ) {
@@ -486,7 +486,7 @@ 
 		}
 	}
 
-	public function delete_auth( $force = false ){
+	public function delete_auth( $force = false ) {
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
 			return false;
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
@@ -502,13 +502,13 @@ 
 		// If we have a new siteurl enabled option and the profile site doesn't match the current site, deactivate anyways
 		if ( is_network_admin() ) {
 			$siteurl = network_admin_url();
-			if ( ! empty( $creds['neturl' ] ) && $creds['neturl'] !== $siteurl ) {
+			if ( ! empty( $creds['neturl'] ) && $creds['neturl'] !== $siteurl ) {
 				MonsterInsights()->auth->delete_network_analytics_profile( true );
 				return true;
 			}
 		} else {
 			$siteurl = site_url();
-			if ( ! empty( $creds['siteurl' ] ) && $creds['siteurl'] !== $siteurl ) {
+			if ( ! empty( $creds['siteurl'] ) && $creds['siteurl'] !== $siteurl ) {
 				MonsterInsights()->auth->delete_analytics_profile( true );
 				return true;
 			}
@@ -585,15 +585,15 @@ 
 		// 	return $sitei;
 		// }
 
-		$auth_key        = defined( 'AUTH_KEY' )        ? AUTH_KEY 		  : '';
+		$auth_key        = defined( 'AUTH_KEY' ) ? AUTH_KEY 		  : '';
 		$secure_auth_key = defined( 'SECURE_AUTH_KEY' ) ? SECURE_AUTH_KEY : '';
-		$logged_in_key   = defined( 'LOGGED_IN_KEY' )   ? LOGGED_IN_KEY   : '';
+		$logged_in_key   = defined( 'LOGGED_IN_KEY' ) ? LOGGED_IN_KEY   : '';
 
 		$sitei = $auth_key . $secure_auth_key . $logged_in_key;
-		$sitei = preg_replace('/[^a-zA-Z0-9]/', '', $sitei );
+		$sitei = preg_replace( '/[^a-zA-Z0-9]/', '', $sitei );
 		$sitei = sanitize_text_field( $sitei );
 		$sitei = trim( $sitei );
-		$sitei = ( strlen($sitei) > 30 ) ? substr($sitei, 0, 30 ) : $sitei;
+		$sitei = ( strlen( $sitei ) > 30 ) ? substr( $sitei, 0, 30 ) : $sitei;
 		return $sitei;
 	}
 

Braces +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
 		add_action( 'wp_ajax_nopriv_monsterinsights_push_mp_token', array( $this, 'handle_relay_mp_token_push' ) );
 	}
 
-	public function get_tt(){
+	public function get_tt() {
 		$tt = is_network_admin() ? get_site_option( 'monsterinsights_network_tt', '' ) : get_option( 'monsterinsights_site_tt', '' );
 		if ( empty( $tt ) ) {
 			// if TT is empty, generate a new one, save it and then return it
@@ -54,12 +54,12 @@ 
 		return $tt;
 	}
 
-	public function rotate_tt(){
+	public function rotate_tt() {
 		$tt = $this->generate_tt();
 		is_network_admin() ? update_site_option( 'monsterinsights_network_tt', $tt ) : update_option( 'monsterinsights_site_tt', $tt );
 	}
 
-	public function generate_tt(){
+	public function generate_tt() {
 		return hash( 'sha512', wp_generate_password( 128, true, true ) . AUTH_SALT . uniqid( "", true ) );
 	}
 
@@ -77,7 +77,7 @@ 
 		);
 	}
 
-	public function maybe_authenticate(){
+	public function maybe_authenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -173,7 +173,7 @@ 
 		wp_send_json_success();
 	}
 
-	public function authenticate_listener(){
+	public function authenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'auth' ) {
 			return;
@@ -254,7 +254,7 @@ 
 		exit;
 	}
 
-	public function maybe_reauthenticate(){
+	public function maybe_reauthenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -306,7 +306,7 @@ 
 		wp_send_json_success( array( 'redirect' => $siteurl ) );
 	}
 
-	public function reauthenticate_listener(){
+	public function reauthenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'reauth' ) {
 			return;
@@ -389,7 +389,7 @@ 
 		exit;
 	}
 
-	public function maybe_verify(){
+	public function maybe_verify() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -425,7 +425,7 @@ 
 		}
 	}
 
-	public function verify_auth( $credentials = array() ){
+	public function verify_auth( $credentials = array() ) {
 		$creds = ! empty( $credentials ) ? $credentials : ( $this->is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile( true ) : MonsterInsights()->auth->get_analytics_profile( true ) );
 
 		if ( empty( $creds['key'] ) ) {
@@ -444,7 +444,7 @@ 
 		}
 	}
 
-	public function maybe_delete(){
+	public function maybe_delete() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -486,7 +486,7 @@ 
 		}
 	}
 
-	public function delete_auth( $force = false ){
+	public function delete_auth( $force = false ) {
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
 			return false;
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {

includes/measurement-protocol-v4.php

Spacing +3 added lines, -3 removed lines

@@ -60,9 +60,9 @@ 
 
 		foreach ( $defaults as $key => $default ) {
 			if ( array_key_exists( $key, $args ) ) {
-				$out[ $key ] = $args[ $key ];
+				$out[$key] = $args[$key];
 			} else {
-				$out[ $key ] = $default;
+				$out[$key] = $default;
 			}
 		}
 
@@ -87,7 +87,7 @@ 
 
 		if ( $this->is_debug ) {
 			foreach ( $body['events'] as $index => $event ) {
-				$body['events'][ $index ]['params']['debug_mode'] = true;
+				$body['events'][$index]['params']['debug_mode'] = true;
 			}
 		}
 

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

Spacing +10 added lines, -10 removed lines

@@ -98,8 +98,8 @@ 
 
 		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;
+			$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 ) . "'";
 		}
@@ -206,22 +206,22 @@ 
 <?php if ( ! $track_user ) {
 	if ( empty( $ua ) ) {
 		$reason = __( 'Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-		$reason = __( 'Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'. PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+		$reason = __( 'Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.' . PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else {
 		$reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	}
 	echo $output;
 } ?>
 <?php if ( $ua ) { ?>
-<script<?php echo $attr_string;?>>
+<script<?php echo $attr_string; ?>>
     (window.gaDevIds=window.gaDevIds||[]).push("dZGIzZG");
 	var mi_version         = '<?php echo MONSTERINSIGHTS_VERSION; ?>';
 	var mi_track_user      = <?php echo ( $track_user ? 'true' : 'false' ); ?>;
-	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason)  . "'": "''" ); ?>;
+	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason ) . "'" : "''" ); ?>;
 	<?php do_action( 'monsterinsights_tracking_analytics_frontend_output_after_mi_track_user' ); ?>
 
 <?php if ( $this->should_do_optout() ) { ?>
@@ -275,7 +275,7 @@ 
 	?>
 	} else {
 <?php if ( $this->should_do_optout() ) { ?>
-		console.log( "<?php echo esc_js( $reason );?>" );
+		console.log( "<?php echo esc_js( $reason ); ?>" );
 		(function() {
 			/* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */
 			var noopfn = function() {
@@ -298,7 +298,7 @@ 
 				}
 				var f = arguments[len-1];
 				if ( typeof f !== 'object' || f === null || typeof f.hitCallback !== 'function' ) {
-					console.log( '<?php echo esc_js( __("Not running function", "google-analytics-for-wordpress" ) );?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) );?> " + mi_no_track_reason );
+					console.log( '<?php echo esc_js( __( "Not running function", "google-analytics-for-wordpress" ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) ); ?> " + mi_no_track_reason );
 					return;
 				}
 				try {

includes/admin/routes.php

Spacing +26 added lines, -26 removed lines

@@ -67,7 +67,7 @@ 
 			return;
 		}
 
-		$site_license    = array(
+		$site_license = array(
 			'key'         => MonsterInsights()->license->get_site_license_key(),
 			'type'        => MonsterInsights()->license->get_site_license_type(),
 			'is_disabled' => MonsterInsights()->license->site_license_disabled(),
@@ -134,8 +134,8 @@ 
 		// Array fields are needed even if empty.
 		$array_fields = array( 'view_reports', 'save_settings', 'ignore_users' );
 		foreach ( $array_fields as $array_field ) {
-			if ( ! isset( $options[ $array_field ] ) ) {
-				$options[ $array_field ] = array();
+			if ( ! isset( $options[$array_field] ) ) {
+				$options[$array_field] = array();
 			}
 		}
 
@@ -265,7 +265,7 @@ 
 						}
 					}
 					if ( $empty ) {
-						unset( $value[ $key ] );
+						unset( $value[$key] );
 					}
 				}
 			}
@@ -315,7 +315,7 @@ 
 				} else {
 					$addon = $this->get_addon( $installed_plugins, $addons_type, $addon, $slug );
 				}
-				$parsed_addons[ $addon->slug ] = $addon;
+				$parsed_addons[$addon->slug] = $addon;
 			}
 		}
 
@@ -365,11 +365,11 @@ 
 		);
 		// Complianz.
 		$parsed_addons['complianz'] = array(
-			'active' => defined( 'cmplz_plugin') || defined( 'cmplz_premium'),
+			'active' => defined( 'cmplz_plugin' ) || defined( 'cmplz_premium' ),
 		);
 		// Cookie Yes
 		$parsed_addons['cookie_yes'] = array(
-			'active' => defined( 'CLI_SETTINGS_FIELD'),
+			'active' => defined( 'CLI_SETTINGS_FIELD' ),
 		);
 		// Fb Instant Articles.
 		$parsed_addons['instant_articles'] = array(
@@ -434,7 +434,7 @@ 
 			'slug'      => 'wp-mail-smtp',
 		);
 		// SeedProd.
-		$parsed_addons['coming-soon']    = array(
+		$parsed_addons['coming-soon'] = array(
 			'active'    => defined( 'SEEDPROD_VERSION' ),
 			'icon'      => plugin_dir_url( MONSTERINSIGHTS_PLUGIN_FILE ) . 'assets/images/plugin-seedprod.png',
 			'title'     => 'SeedProd',
@@ -445,7 +445,7 @@ 
 			'settings'  => admin_url( 'admin.php?page=seedprod_lite' ),
 		);
 		// RafflePress
-		$parsed_addons['rafflepress']    = array(
+		$parsed_addons['rafflepress'] = array(
 			'active'    => function_exists( 'rafflepress_lite_activation' ),
 			'icon'      => plugin_dir_url( MONSTERINSIGHTS_PLUGIN_FILE ) . 'assets/images/pluign-rafflepress.png',
 			'title'     => 'RafflePress',
@@ -555,7 +555,7 @@ 
 		$installed       = false;
 		$plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug );
 
-		if ( isset( $installed_plugins[ $plugin_basename ] ) ) {
+		if ( isset( $installed_plugins[$plugin_basename] ) ) {
 			$installed = true;
 
 			if ( is_multisite() && is_network_admin() ) {
@@ -570,8 +570,8 @@ 
 
 		$active_version = false;
 		if ( $active ) {
-			if ( ! empty( $installed_plugins[ $plugin_basename ]['Version'] ) ) {
-				$active_version = $installed_plugins[ $plugin_basename ]['Version'];
+			if ( ! empty( $installed_plugins[$plugin_basename]['Version'] ) ) {
+				$active_version = $installed_plugins[$plugin_basename]['Version'];
 			}
 		}
 
@@ -839,14 +839,14 @@ 
 		);
 
 		foreach ( $exclude as $e ) {
-			if ( ! empty( $new_settings[ $e ] ) ) {
-				unset( $new_settings[ $e ] );
+			if ( ! empty( $new_settings[$e] ) ) {
+				unset( $new_settings[$e] );
 			}
 		}
 
 		foreach ( $exclude as $e ) {
-			if ( ! empty( $settings[ $e ] ) ) {
-				$new_settings = $settings[ $e ];
+			if ( ! empty( $settings[$e] ) ) {
+				$new_settings = $settings[$e];
 			}
 		}
 
@@ -1006,7 +1006,7 @@ 
 			),
 			admin_url( 'admin.php' )
 		);
-		$url    = esc_url( $url );
+		$url = esc_url( $url );
 
 		ob_start();
 		if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
@@ -1112,7 +1112,7 @@ 
 			$homepage = get_option( 'page_on_front' );
 			if ( ! $homepage ) {
 				$array[] = array(
-					'id'    => - 1,
+					'id'    => -1,
 					'title' => __( 'Homepage', 'google-analytics-for-wordpress' ),
 				);
 			}
@@ -1186,7 +1186,7 @@ 
 			if ( ! post_type_supports( $post_type->name, 'editor' ) || 'product' === $post_type->name ) {
 				continue;
 			}
-			$post_types_parsed[ $post_type->name ] = $post_type->labels->singular_name;
+			$post_types_parsed[$post_type->name] = $post_type->labels->singular_name;
 		}
 
 		$post_types_parsed = apply_filters( 'monsterinsights_vue_post_types_editor', $post_types_parsed );
@@ -1308,18 +1308,18 @@ 
 			$value        = sanitize_text_field( wp_unslash( $_POST['value'] ) ); // Value of custom style like 12px or #fff.
 			$settings     = get_option( $settings_key, array() );
 
-			if ( ! isset( $settings[ $type ] ) ) {
-				$settings[ $type ] = array();
+			if ( ! isset( $settings[$type] ) ) {
+				$settings[$type] = array();
 			}
-			if ( ! isset( $settings[ $type ][ $theme ] ) ) {
-				$settings[ $type ][ $theme ] = array();
+			if ( ! isset( $settings[$type][$theme] ) ) {
+				$settings[$type][$theme] = array();
 			}
 
-			if ( ! isset( $settings[ $type ][ $theme ][ $object ] ) ) {
-				$settings[ $type ][ $theme ][ $object ] = array();
+			if ( ! isset( $settings[$type][$theme][$object] ) ) {
+				$settings[$type][$theme][$object] = array();
 			}
 
-			$settings[ $type ][ $theme ][ $object ][ $key ] = $value;
+			$settings[$type][$theme][$object][$key] = $value;
 
 			update_option( $settings_key, $settings );
 

includes/frontend/seedprod.php

Indentation +4 added lines, -4 removed lines

@@ -36,10 +36,10 @@
 	    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-gtag-events.php';
 	    new MonsterInsights_Gtag_Events();
 
-        // Let's run form tracking if we find it
-        if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) {
-            monsterinsights_forms_output_after_script( array() );
-        }
+	// Let's run form tracking if we find it
+	if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) {
+	    monsterinsights_forms_output_after_script( array() );
+	}
     }
 }
 add_action( 'seedprod_monsterinsights_output_tracking', 'monsterinsights_seedprod_tracking', 6, 1 );

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	do_action( 'monsterinsights_tracking_after_gtag' );
     do_action( 'monsterinsights_tracking_after', 'gtag' );
 
-    $track_user    = monsterinsights_track_user();
+    $track_user = monsterinsights_track_user();
 
     if ( $track_user ) {
 	    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-gtag-events.php';

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

Indentation +138 added lines, -138 removed lines

@@ -52,7 +52,7 @@ 
      */
     public function frontend_tracking_options_persistent()
     {
-        return apply_filters('monsterinsights_frontend_tracking_options_persistent_gtag_before_pageview', []);
+	return apply_filters('monsterinsights_frontend_tracking_options_persistent_gtag_before_pageview', []);
     }
 
     /**
@@ -71,107 +71,107 @@ 
      */
     public function frontend_tracking_options($type = 'ua', $encoded = false)
     {
-        global $wp_query;
-        $options = [];
+	global $wp_query;
+	$options = [];
 
-        $tracking_ids = monsterinsights_get_tracking_ids();
-        if (empty($tracking_ids)) {
-            return $encoded ? wp_json_encode($options) : $options;
-        }
+	$tracking_ids = monsterinsights_get_tracking_ids();
+	if (empty($tracking_ids)) {
+	    return $encoded ? wp_json_encode($options) : $options;
+	}
 
-        $placeholder = '';
+	$placeholder = '';
 
-        if ($encoded) {
-            $placeholder = '!@#';
-        }
+	if ($encoded) {
+	    $placeholder = '!@#';
+	}
 
-        //		$track_user = monsterinsights_track_user();
+	//		$track_user = monsterinsights_track_user();
 //
-        //		if ( ! $track_user ) {
-        //			$options['create']   = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( 'auto' ) . "'";
-        //			$options['forceSSL'] = "'set', 'forceSSL', true";
-        //			$options['send']     = "'send','pageview'";
+	//		if ( ! $track_user ) {
+	//			$options['create']   = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( 'auto' ) . "'";
+	//			$options['forceSSL'] = "'set', 'forceSSL', true";
+	//			$options['send']     = "'send','pageview'";
 //
-        //			return $options;
-        //		}
-
-        $cross_domains = monsterinsights_get_option('cross_domains', []);
-        $allow_anchor = monsterinsights_get_option('allow_anchor', false);
-
-        if ($allow_anchor) {
-            $options['allow_anchor'] = 'true';
-        }
-
-        if (class_exists('MonsterInsights_AMP')) {
-            $options['use_amp_client_id'] = 'true';
-        }
-
-        $options['forceSSL'] = 'true';
-
-        // Anonymous data.
-        if (monsterinsights_get_option('anonymize_ips', false)) {
-            $options['anonymize_ip'] = 'true';
-        }
-
-        $options = apply_filters('monsterinsights_frontend_tracking_options_gtag_before_scripts', $options);
-
-        // Add Enhanced link attribution.
-        if (monsterinsights_get_option('link_attribution', false)) {
-            $options['link_attribution'] = 'true';
-        }
-
-        // Add cross-domain tracking.
-        if (is_array($cross_domains) && !empty($cross_domains)) {
-            $linker_domains = [];
-            foreach ($cross_domains as $cross_domain) {
-                if (!empty($cross_domain['domain'])) {
-                    $linker_domains[] = $cross_domain['domain'];
-                }
-            }
-            $options['linker'] = [
-                'domains' => $linker_domains,
-            ];
-        }
-
-        if (monsterinsights_is_debug_mode()) {
-            $options['debug_mode'] = true;
-        }
-
-        $options = apply_filters('monsterinsights_frontend_tracking_options_gtag_before_pageview', $options, $type);
-        $options = apply_filters('monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version, $type);
-
-        if (is_404()) {
-            if (monsterinsights_get_option('hash_tracking', false)) {
-                $options['page_path'] = "{$placeholder}'/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer{$placeholder}";
-            } else {
-                $options['page_path'] = "{$placeholder}'/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer{$placeholder}";
-            }
-        } elseif ($wp_query->is_search) {
-            $pushstr = "'/?s=";
-            if (0 === (int) $wp_query->found_posts) {
-                $options['page_path'] = $pushstr.'no-results:'.rawurlencode($wp_query->query_vars['s'])."&cat=no-results'";
-            } elseif (1 === (int) $wp_query->found_posts) {
-                $options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=1-result'";
-            } elseif ($wp_query->found_posts > 1 && $wp_query->found_posts < 6) {
-                $options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=2-5-results'";
-            } else {
-                $options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=plus-5-results'";
-            }
-        } elseif (monsterinsights_get_option('hash_tracking', false)) {
-            $options['page_path'] = "{$placeholder}location.pathname + location.search + location.hash{$placeholder}";
-        }
-
-        $options = apply_filters('monsterinsights_frontend_tracking_options_gtag_end', $options, $type);
-
-        if ($encoded) {
-            return str_replace(
-                ['"'.$placeholder, $placeholder.'"'],
-                '',
-                wp_json_encode($options)
-            );
-        }
-
-        return $options;
+	//			return $options;
+	//		}
+
+	$cross_domains = monsterinsights_get_option('cross_domains', []);
+	$allow_anchor = monsterinsights_get_option('allow_anchor', false);
+
+	if ($allow_anchor) {
+	    $options['allow_anchor'] = 'true';
+	}
+
+	if (class_exists('MonsterInsights_AMP')) {
+	    $options['use_amp_client_id'] = 'true';
+	}
+
+	$options['forceSSL'] = 'true';
+
+	// Anonymous data.
+	if (monsterinsights_get_option('anonymize_ips', false)) {
+	    $options['anonymize_ip'] = 'true';
+	}
+
+	$options = apply_filters('monsterinsights_frontend_tracking_options_gtag_before_scripts', $options);
+
+	// Add Enhanced link attribution.
+	if (monsterinsights_get_option('link_attribution', false)) {
+	    $options['link_attribution'] = 'true';
+	}
+
+	// Add cross-domain tracking.
+	if (is_array($cross_domains) && !empty($cross_domains)) {
+	    $linker_domains = [];
+	    foreach ($cross_domains as $cross_domain) {
+		if (!empty($cross_domain['domain'])) {
+		    $linker_domains[] = $cross_domain['domain'];
+		}
+	    }
+	    $options['linker'] = [
+		'domains' => $linker_domains,
+	    ];
+	}
+
+	if (monsterinsights_is_debug_mode()) {
+	    $options['debug_mode'] = true;
+	}
+
+	$options = apply_filters('monsterinsights_frontend_tracking_options_gtag_before_pageview', $options, $type);
+	$options = apply_filters('monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version, $type);
+
+	if (is_404()) {
+	    if (monsterinsights_get_option('hash_tracking', false)) {
+		$options['page_path'] = "{$placeholder}'/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer{$placeholder}";
+	    } else {
+		$options['page_path'] = "{$placeholder}'/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer{$placeholder}";
+	    }
+	} elseif ($wp_query->is_search) {
+	    $pushstr = "'/?s=";
+	    if (0 === (int) $wp_query->found_posts) {
+		$options['page_path'] = $pushstr.'no-results:'.rawurlencode($wp_query->query_vars['s'])."&cat=no-results'";
+	    } elseif (1 === (int) $wp_query->found_posts) {
+		$options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=1-result'";
+	    } elseif ($wp_query->found_posts > 1 && $wp_query->found_posts < 6) {
+		$options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=2-5-results'";
+	    } else {
+		$options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=plus-5-results'";
+	    }
+	} elseif (monsterinsights_get_option('hash_tracking', false)) {
+	    $options['page_path'] = "{$placeholder}location.pathname + location.search + location.hash{$placeholder}";
+	}
+
+	$options = apply_filters('monsterinsights_frontend_tracking_options_gtag_end', $options, $type);
+
+	if ($encoded) {
+	    return str_replace(
+		['"'.$placeholder, $placeholder.'"'],
+		'',
+		wp_json_encode($options)
+	    );
+	}
+
+	return $options;
     }
 
     /**
@@ -187,36 +187,36 @@ 
      */
     public function frontend_output()
     {
-        $options = $this->frontend_tracking_options('ua', true);
-        $options_v4 = $this->frontend_tracking_options('v4', true);
-        $persistent = $this->frontend_tracking_options_persistent();
-        $connected_type = MonsterInsights()->auth->get_connected_type();
-        $v4_id = monsterinsights_get_v4_id_to_output();
-        $ua = monsterinsights_get_ua_to_output();
-        $main_id = 'ua' === $connected_type ? $ua : $v4_id;
-        $src = apply_filters('monsterinsights_frontend_output_gtag_src', '//www.googletagmanager.com/gtag/js?id='.$main_id);
-        $compat_mode = apply_filters('monsterinsights_get_option_gtagtracker_compatibility_mode', true);
-        $compat = $compat_mode ? 'window.gtag = __gtagTracker;' : '';
-        $track_user = monsterinsights_track_user();
-        $output = '';
-        $reason = '';
-        $attr_string = monsterinsights_get_frontend_analytics_script_atts();
-        $gtag_async = apply_filters('monsterinsights_frontend_gtag_script_async', true) ? 'async' : '';
-        ob_start(); ?>
+	$options = $this->frontend_tracking_options('ua', true);
+	$options_v4 = $this->frontend_tracking_options('v4', true);
+	$persistent = $this->frontend_tracking_options_persistent();
+	$connected_type = MonsterInsights()->auth->get_connected_type();
+	$v4_id = monsterinsights_get_v4_id_to_output();
+	$ua = monsterinsights_get_ua_to_output();
+	$main_id = 'ua' === $connected_type ? $ua : $v4_id;
+	$src = apply_filters('monsterinsights_frontend_output_gtag_src', '//www.googletagmanager.com/gtag/js?id='.$main_id);
+	$compat_mode = apply_filters('monsterinsights_get_option_gtagtracker_compatibility_mode', true);
+	$compat = $compat_mode ? 'window.gtag = __gtagTracker;' : '';
+	$track_user = monsterinsights_track_user();
+	$output = '';
+	$reason = '';
+	$attr_string = monsterinsights_get_frontend_analytics_script_atts();
+	$gtag_async = apply_filters('monsterinsights_frontend_gtag_script_async', true) ? 'async' : '';
+	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 (!$track_user) {
-            if (empty($v4_id) && empty($ua)) {
-                $reason = __('Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress');
-                $output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
-            } elseif (current_user_can('monsterinsights_save_settings')) {
-                $reason = __('Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'.PHP_EOL.'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress');
-                $output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
-            } else {
-                $reason = __('Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress');
-                $output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
-            }
-            echo $output;
-        } ?>
+	    if (empty($v4_id) && empty($ua)) {
+		$reason = __('Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress');
+		$output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
+	    } elseif (current_user_can('monsterinsights_save_settings')) {
+		$reason = __('Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'.PHP_EOL.'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress');
+		$output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
+	    } else {
+		$reason = __('Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress');
+		$output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
+	    }
+	    echo $output;
+	} ?>
 		<?php if (!empty($v4_id) || !empty($ua)) { ?>
 			<script src="<?php echo esc_attr($src); ?>" <?php echo $attr_string; ?> <?php echo esc_attr($gtag_async); ?>></script>
 			<script<?php echo $attr_string; ?>>
@@ -315,12 +315,12 @@ 
 					__gtagTracker( 'set', {
 						'developer_id.dZGIzZG' : true,
 						<?php
-                        if (!empty($persistent)) {
-                            foreach ($persistent as $key => $value) {
-                                echo "'".esc_js($key)."' : '".esc_js($value)."',";
-                            }
-                        }
-                        ?>
+			if (!empty($persistent)) {
+			    foreach ($persistent as $key => $value) {
+				echo "'".esc_js($key)."' : '".esc_js($value)."',";
+			    }
+			}
+			?>
 					} );
 					<?php if (!empty($v4_id)) { ?>
 					__gtagTracker( 'config', '<?php echo esc_js($v4_id); ?>', <?php echo $options_v4; ?> );
@@ -328,15 +328,15 @@ 
 					<?php if (!empty($ua)) { ?>
 					__gtagTracker( 'config', '<?php echo esc_js($ua); ?>', <?php echo $options; ?> );
 					<?php
-                    }
-                    /*
+		    }
+		    /*
                      * Extend or enhance the functionality by adding custom code to frontend
                      * tracking via this hook.
                      *
                      * @since 7.15.0
                      */
-                    do_action('monsterinsights_frontend_tracking_gtag_after_pageview');
-                    ?>
+		    do_action('monsterinsights_frontend_tracking_gtag_after_pageview');
+		    ?>
 					<?php echo esc_js($compat); ?>
 					<?php if (apply_filters('monsterinsights_tracking_gtag_frontend_gatracker_compatibility', true)) { ?>
 						(function () {
@@ -467,14 +467,14 @@ 
 		<?php } ?>
 		<!-- / Google Analytics by MonsterInsights -->
 		<?php
-        $output = ob_get_contents();
-        ob_end_clean();
+	$output = ob_get_contents();
+	ob_end_clean();
 
-        return $output;
+	return $output;
     }
 
     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);
     }
 }

Spacing +72 added lines, -72 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly
-if (!defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
     exit;
 }
 
@@ -52,7 +52,7 @@ 
      */
     public function frontend_tracking_options_persistent()
     {
-        return apply_filters('monsterinsights_frontend_tracking_options_persistent_gtag_before_pageview', []);
+        return apply_filters( 'monsterinsights_frontend_tracking_options_persistent_gtag_before_pageview', [] );
     }
 
     /**
@@ -69,19 +69,19 @@ 
      *
      * @since 7.15.0
      */
-    public function frontend_tracking_options($type = 'ua', $encoded = false)
+    public function frontend_tracking_options( $type = 'ua', $encoded = false )
     {
         global $wp_query;
         $options = [];
 
         $tracking_ids = monsterinsights_get_tracking_ids();
-        if (empty($tracking_ids)) {
-            return $encoded ? wp_json_encode($options) : $options;
+        if ( empty( $tracking_ids ) ) {
+            return $encoded ? wp_json_encode( $options ) : $options;
         }
 
         $placeholder = '';
 
-        if ($encoded) {
+        if ( $encoded ) {
             $placeholder = '!@#';
         }
 
@@ -95,36 +95,36 @@ 
         //			return $options;
         //		}
 
-        $cross_domains = monsterinsights_get_option('cross_domains', []);
-        $allow_anchor = monsterinsights_get_option('allow_anchor', false);
+        $cross_domains = monsterinsights_get_option( 'cross_domains', [] );
+        $allow_anchor = monsterinsights_get_option( 'allow_anchor', false );
 
-        if ($allow_anchor) {
+        if ( $allow_anchor ) {
             $options['allow_anchor'] = 'true';
         }
 
-        if (class_exists('MonsterInsights_AMP')) {
+        if ( class_exists( 'MonsterInsights_AMP' ) ) {
             $options['use_amp_client_id'] = 'true';
         }
 
         $options['forceSSL'] = 'true';
 
         // Anonymous data.
-        if (monsterinsights_get_option('anonymize_ips', false)) {
+        if ( monsterinsights_get_option( 'anonymize_ips', false ) ) {
             $options['anonymize_ip'] = 'true';
         }
 
-        $options = apply_filters('monsterinsights_frontend_tracking_options_gtag_before_scripts', $options);
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_gtag_before_scripts', $options );
 
         // Add Enhanced link attribution.
-        if (monsterinsights_get_option('link_attribution', false)) {
+        if ( monsterinsights_get_option( 'link_attribution', false ) ) {
             $options['link_attribution'] = 'true';
         }
 
         // Add cross-domain tracking.
-        if (is_array($cross_domains) && !empty($cross_domains)) {
+        if ( is_array( $cross_domains ) && ! empty( $cross_domains ) ) {
             $linker_domains = [];
-            foreach ($cross_domains as $cross_domain) {
-                if (!empty($cross_domain['domain'])) {
+            foreach ( $cross_domains as $cross_domain ) {
+                if ( ! empty( $cross_domain['domain'] ) ) {
                     $linker_domains[] = $cross_domain['domain'];
                 }
             }
@@ -133,41 +133,41 @@ 
             ];
         }
 
-        if (monsterinsights_is_debug_mode()) {
+        if ( monsterinsights_is_debug_mode() ) {
             $options['debug_mode'] = true;
         }
 
-        $options = apply_filters('monsterinsights_frontend_tracking_options_gtag_before_pageview', $options, $type);
-        $options = apply_filters('monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version, $type);
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_gtag_before_pageview', $options, $type );
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version, $type );
 
-        if (is_404()) {
-            if (monsterinsights_get_option('hash_tracking', false)) {
+        if ( is_404() ) {
+            if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
                 $options['page_path'] = "{$placeholder}'/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer{$placeholder}";
             } else {
                 $options['page_path'] = "{$placeholder}'/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer{$placeholder}";
             }
-        } elseif ($wp_query->is_search) {
+        } elseif ( $wp_query->is_search ) {
             $pushstr = "'/?s=";
-            if (0 === (int) $wp_query->found_posts) {
-                $options['page_path'] = $pushstr.'no-results:'.rawurlencode($wp_query->query_vars['s'])."&cat=no-results'";
-            } elseif (1 === (int) $wp_query->found_posts) {
-                $options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=1-result'";
-            } elseif ($wp_query->found_posts > 1 && $wp_query->found_posts < 6) {
-                $options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=2-5-results'";
+            if ( 0 === (int) $wp_query->found_posts ) {
+                $options['page_path'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
+            } elseif ( 1 === (int) $wp_query->found_posts ) {
+                $options['page_path'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
+            } elseif ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
+                $options['page_path'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
             } else {
-                $options['page_path'] = $pushstr.rawurlencode($wp_query->query_vars['s'])."&cat=plus-5-results'";
+                $options['page_path'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
             }
-        } elseif (monsterinsights_get_option('hash_tracking', false)) {
+        } elseif ( monsterinsights_get_option( 'hash_tracking', false ) ) {
             $options['page_path'] = "{$placeholder}location.pathname + location.search + location.hash{$placeholder}";
         }
 
-        $options = apply_filters('monsterinsights_frontend_tracking_options_gtag_end', $options, $type);
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_gtag_end', $options, $type );
 
-        if ($encoded) {
+        if ( $encoded ) {
             return str_replace(
-                ['"'.$placeholder, $placeholder.'"'],
+                ['"' . $placeholder, $placeholder . '"'],
                 '',
-                wp_json_encode($options)
+                wp_json_encode( $options )
             );
         }
 
@@ -187,51 +187,51 @@ 
      */
     public function frontend_output()
     {
-        $options = $this->frontend_tracking_options('ua', true);
-        $options_v4 = $this->frontend_tracking_options('v4', true);
+        $options = $this->frontend_tracking_options( 'ua', true );
+        $options_v4 = $this->frontend_tracking_options( 'v4', true );
         $persistent = $this->frontend_tracking_options_persistent();
         $connected_type = MonsterInsights()->auth->get_connected_type();
         $v4_id = monsterinsights_get_v4_id_to_output();
         $ua = monsterinsights_get_ua_to_output();
         $main_id = 'ua' === $connected_type ? $ua : $v4_id;
-        $src = apply_filters('monsterinsights_frontend_output_gtag_src', '//www.googletagmanager.com/gtag/js?id='.$main_id);
-        $compat_mode = apply_filters('monsterinsights_get_option_gtagtracker_compatibility_mode', true);
+        $src = apply_filters( 'monsterinsights_frontend_output_gtag_src', '//www.googletagmanager.com/gtag/js?id=' . $main_id );
+        $compat_mode = apply_filters( 'monsterinsights_get_option_gtagtracker_compatibility_mode', true );
         $compat = $compat_mode ? 'window.gtag = __gtagTracker;' : '';
         $track_user = monsterinsights_track_user();
         $output = '';
         $reason = '';
         $attr_string = monsterinsights_get_frontend_analytics_script_atts();
-        $gtag_async = apply_filters('monsterinsights_frontend_gtag_script_async', true) ? 'async' : '';
+        $gtag_async = apply_filters( 'monsterinsights_frontend_gtag_script_async', true ) ? 'async' : '';
         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 (!$track_user) {
-            if (empty($v4_id) && empty($ua)) {
-                $reason = __('Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress');
-                $output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
-            } elseif (current_user_can('monsterinsights_save_settings')) {
-                $reason = __('Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'.PHP_EOL.'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress');
-                $output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
+		<?php if ( ! $track_user ) {
+            if ( empty( $v4_id ) && empty( $ua ) ) {
+                $reason = __( 'Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' );
+                $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+            } elseif ( current_user_can( 'monsterinsights_save_settings' ) ) {
+                $reason = __( 'Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.' . PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
+                $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
             } else {
-                $reason = __('Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress');
-                $output .= '<!-- '.esc_html($reason).' -->'.PHP_EOL;
+                $reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' );
+                $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
             }
             echo $output;
         } ?>
-		<?php if (!empty($v4_id) || !empty($ua)) { ?>
-			<script src="<?php echo esc_attr($src); ?>" <?php echo $attr_string; ?> <?php echo esc_attr($gtag_async); ?>></script>
+		<?php if ( ! empty( $v4_id ) || ! empty( $ua ) ) { ?>
+			<script src="<?php echo esc_attr( $src ); ?>" <?php echo $attr_string; ?> <?php echo esc_attr( $gtag_async ); ?>></script>
 			<script<?php echo $attr_string; ?>>
 				var mi_version = '<?php echo MONSTERINSIGHTS_VERSION; ?>';
 				var mi_track_user = <?php echo $track_user ? 'true' : 'false'; ?>;
-				var mi_no_track_reason = <?php echo $reason ? "'".esc_js($reason)."'" : "''"; ?>;
-				<?php do_action('monsterinsights_tracking_gtag_frontend_output_after_mi_track_user'); ?>
+				var mi_no_track_reason = <?php echo $reason ? "'" . esc_js( $reason ) . "'" : "''"; ?>;
+				<?php do_action( 'monsterinsights_tracking_gtag_frontend_output_after_mi_track_user' ); ?>
 
-				<?php if ($this->should_do_optout()) { ?>
+				<?php if ( $this->should_do_optout() ) { ?>
 				var disableStrs = [
-					<?php if (!empty($v4_id)) { ?>
-					'ga-disable-<?php echo esc_js($v4_id); ?>',
+					<?php if ( ! empty( $v4_id ) ) { ?>
+					'ga-disable-<?php echo esc_js( $v4_id ); ?>',
 					<?php } ?>
-					<?php if (!empty($ua)) { ?>
-					'ga-disable-<?php echo esc_js($ua); ?>',
+					<?php if ( ! empty( $ua ) ) { ?>
+					'ga-disable-<?php echo esc_js( $ua ); ?>',
 					<?php } ?>
 				];
 
@@ -289,7 +289,7 @@ 
 						}
 
 						if ( type === 'event' ) {
-							<?php if ($v4_id) { ?>
+							<?php if ( $v4_id ) { ?>
 								parameters.send_to = monsterinsights_frontend.v4_id;
 								var hookName = name;
 								if ( typeof parameters[ 'event_category' ] !== 'undefined' ) {
@@ -303,7 +303,7 @@ 
 								}
 							<?php } ?>
 
-							<?php if ($ua) { ?>
+							<?php if ( $ua ) { ?>
 								parameters.send_to = monsterinsights_frontend.ua;
 								__gtagDataLayer( type, name, parameters );
 							<?php } ?>
@@ -315,18 +315,18 @@ 
 					__gtagTracker( 'set', {
 						'developer_id.dZGIzZG' : true,
 						<?php
-                        if (!empty($persistent)) {
-                            foreach ($persistent as $key => $value) {
-                                echo "'".esc_js($key)."' : '".esc_js($value)."',";
+                        if ( ! empty( $persistent ) ) {
+                            foreach ( $persistent as $key => $value ) {
+                                echo "'" . esc_js( $key ) . "' : '" . esc_js( $value ) . "',";
                             }
                         }
                         ?>
 					} );
-					<?php if (!empty($v4_id)) { ?>
-					__gtagTracker( 'config', '<?php echo esc_js($v4_id); ?>', <?php echo $options_v4; ?> );
+					<?php if ( ! empty( $v4_id ) ) { ?>
+					__gtagTracker( 'config', '<?php echo esc_js( $v4_id ); ?>', <?php echo $options_v4; ?> );
 					<?php } ?>
-					<?php if (!empty($ua)) { ?>
-					__gtagTracker( 'config', '<?php echo esc_js($ua); ?>', <?php echo $options; ?> );
+					<?php if ( ! empty( $ua ) ) { ?>
+					__gtagTracker( 'config', '<?php echo esc_js( $ua ); ?>', <?php echo $options; ?> );
 					<?php
                     }
                     /*
@@ -335,10 +335,10 @@ 
                      *
                      * @since 7.15.0
                      */
-                    do_action('monsterinsights_frontend_tracking_gtag_after_pageview');
+                    do_action( 'monsterinsights_frontend_tracking_gtag_after_pageview' );
                     ?>
-					<?php echo esc_js($compat); ?>
-					<?php if (apply_filters('monsterinsights_tracking_gtag_frontend_gatracker_compatibility', true)) { ?>
+					<?php echo esc_js( $compat ); ?>
+					<?php if ( apply_filters( 'monsterinsights_tracking_gtag_frontend_gatracker_compatibility', true ) ) { ?>
 						(function () {
 							/* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */
 							/* ga and __gaTracker compatibility shim. */
@@ -450,8 +450,8 @@ 
 						})();
 					<?php } ?>
 				} else {
-					<?php if ($this->should_do_optout()) { ?>
-					console.log( "<?php echo esc_js($reason); ?>" );
+					<?php if ( $this->should_do_optout() ) { ?>
+					console.log( "<?php echo esc_js( $reason ); ?>" );
 					( function () {
 							function __gtagTracker() {
 								return null;
@@ -475,6 +475,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 );
     }
 }

Braces +6 added lines, -12 removed lines

@@ -12,8 +12,7 @@ 
     exit;
 }
 
-class MonsterInsights_Tracking_Gtag extends MonsterInsights_Tracking_Abstract
-{
+class MonsterInsights_Tracking_Gtag extends MonsterInsights_Tracking_Abstract {
     /**
      * Holds the name of the tracking type.
      *
@@ -37,8 +36,7 @@ 
      *
      * @since 7.15.0
      */
-    public function __construct()
-    {
+    public function __construct() {
     }
 
     /**
@@ -50,8 +48,7 @@ 
      *
      * @since 7.15.0
      */
-    public function frontend_tracking_options_persistent()
-    {
+    public function frontend_tracking_options_persistent() {
         return apply_filters('monsterinsights_frontend_tracking_options_persistent_gtag_before_pageview', []);
     }
 
@@ -69,8 +66,7 @@ 
      *
      * @since 7.15.0
      */
-    public function frontend_tracking_options($type = 'ua', $encoded = false)
-    {
+    public function frontend_tracking_options($type = 'ua', $encoded = false) {
         global $wp_query;
         $options = [];
 
@@ -185,8 +181,7 @@ 
      *
      * @since 7.15.0
      */
-    public function frontend_output()
-    {
+    public function frontend_output() {
         $options = $this->frontend_tracking_options('ua', true);
         $options_v4 = $this->frontend_tracking_options('v4', true);
         $persistent = $this->frontend_tracking_options_persistent();
@@ -473,8 +468,7 @@ 
         return $output;
     }
 
-    public function should_do_optout()
-    {
+    public function should_do_optout() {
         return !(defined('MI_NO_TRACKING_OPTOUT') && MI_NO_TRACKING_OPTOUT);
     }
 }