awesomemotive / google-analytics-for-wordpress

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

Spacing +14 added lines, -14 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 ) . "'";
 		}
@@ -175,34 +175,34 @@ 
 	 */
 	public function frontend_output( ) {
 		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
+		$is_debug_mode  = monsterinsights_is_debug_mode();
+		$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
 		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src       = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+			$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
 		}
 		$compat     	= monsterinsights_get_option( 'gatracker_compatibility_mode', false );
-		$compat    	 	= $compat ? 'window.ga = __gaTracker;' : '';
+		$compat = $compat ? 'window.ga = __gaTracker;' : '';
 		$track_user 	= monsterinsights_track_user();
 		$ua         	= monsterinsights_get_ua();
 		$output     	= '';
 		$reason     	= '';
-		$cookie_notice  = class_exists( 'Cookie_Notice' ) && monsterinsights_get_option( 'cookie_notice', false );
+		$cookie_notice = class_exists( 'Cookie_Notice' ) && monsterinsights_get_option( 'cookie_notice', false );
 		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( $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 if ( class_exist( 'Cookie_Notice' ) ) {
 		$reason = __( 'Note: You have not accepted the Cookie Notice.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $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;
 } ?>
@@ -265,7 +265,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() {
@@ -288,7 +288,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( sprintf( __( "because you're not being tracked. %s", 'google-analytics-for-wordpress' ), $reason ) );?>");
+					console.log( '<?php echo esc_js( __( 'Not running function', 'google-analytics-for-wordpress' ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( sprintf( __( "because you're not being tracked. %s", 'google-analytics-for-wordpress' ), $reason ) ); ?>");
 					return;
 				}
 				try {

includes/api-request.php

Spacing +14 added lines, -14 removed lines

@@ -136,21 +136,21 @@ 
 		$this->method    = $method;
 
 		$default_token   = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token();
-		$default_key     = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_key()   : MonsterInsights()->auth->get_key();
+		$default_key     = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_key() : MonsterInsights()->auth->get_key();
 		
 		
-		$this->token     = ! empty( $args['token'] )     ? $args['token']  : $default_token;
-		$this->key       = ! empty( $args['key'] ) 	     ? $args['key']    : $default_key;
-		$this->tt        = ! empty( $args['tt'] ) 		 ? $args['tt']     : '';
-		$this->return    = ! empty( $args['return'] )    ? $args['return'] : '';
-		$this->start     = ! empty( $args['start'] )	 ? $args['start']  : '';
-		$this->end       = ! empty( $args['end'] )  	 ? $args['end']    : '';
+		$this->token     = ! empty( $args['token'] ) ? $args['token'] : $default_token;
+		$this->key       = ! empty( $args['key'] ) ? $args['key'] : $default_key;
+		$this->tt        = ! empty( $args['tt'] ) ? $args['tt'] : '';
+		$this->return    = ! empty( $args['return'] ) ? $args['return'] : '';
+		$this->start     = ! empty( $args['start'] ) ? $args['start'] : '';
+		$this->end       = ! empty( $args['end'] ) ? $args['end'] : '';
 
 		// We need to do this hack so that the network panel + the site_url of the main site are distinct
 		$this->site_url  = is_network_admin() ? network_admin_url() : site_url();
 
 		if ( monsterinsights_is_pro_version() ) {
-			$this->license   = is_network_admin() || ( ! empty( $args['network'] ) && $args['network'] ) ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
+			$this->license = is_network_admin() || ( ! empty( $args['network'] ) && $args['network'] ) ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
 		}
 		$this->plugin    = MonsterInsights()->plugin_slug;
 		$this->miversion = MONSTERINSIGHTS_VERSION;
@@ -220,12 +220,12 @@ 
 		}
 
 		if ( 'GET' == $this->method ) {
-			$body['time']   = time(); // just to avoid caching
+			$body['time'] = time(); // just to avoid caching
 		}
 
-		$body['timezone'] = date('e');
+		$body['timezone'] = date( 'e' );
 
-		$body['ip']   = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
+		$body['ip'] = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
 
 		// This filter will be removed in the future.
 		$body   = apply_filters( 'monsterinsights_api_request_body', $body );
@@ -269,7 +269,7 @@ 
 
 		// If not a 200 status header, send back error.
 		if ( 200 != $response_code ) {
-			$type  = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
+			$type = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
 			
 			if ( empty( $response_code ) ) {
 				return new WP_Error( $type, __( 'The API was unreachable.', 'google-analytics-for-wordpress' ) );
@@ -374,7 +374,7 @@ 
 						'body'          => ''
 					);
 					$response = wp_remote_get( $testurl, $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+					if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 						return false;
 					} else {
 						return true;
@@ -392,7 +392,7 @@ 
 			);
 			$response = wp_remote_get( $testurl, $params );
 			
-			if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 				return false;
 			} else {
 				return true;

includes/admin/common.php

Spacing +48 added lines, -48 removed lines

@@ -150,32 +150,32 @@ 
 				'copytoclip'       				=> esc_html__( 'Copy to Clipboard', 'google-analytics-for-wordpress' ),
 				'failed'           				=> esc_html__( 'Failed!', 'google-analytics-for-wordpress' ),
 				'admin_nonce'      				=> wp_create_nonce( 'mi-admin-nonce' ),
-				'shorten'         				=> esc_html__( 'Shorten URL' ,'google-analytics-for-wordpress'),
-				'shortened'        				=> esc_html__( 'Shortened!' ,'google-analytics-for-wordpress'),
-				'working'          				=> esc_html__( 'Working...' ,'google-analytics-for-wordpress'),
-				'importtext'       				=> esc_html__( 'Import' ,'google-analytics-for-wordpress'),
-				'imported'         				=> esc_html__( 'Imported!' ,'google-analytics-for-wordpress'),
-				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:' ,'google-analytics-for-wordpress'),
-				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'redirect_loading_error_title'  => esc_html__( "Authentication Error:" ,'google-analytics-for-wordpress'),
-				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....' ,'google-analytics-for-wordpress'),
-				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:" ,'google-analytics-for-wordpress'),
-				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!' ,'google-analytics-for-wordpress'),
-				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore." ,'google-analytics-for-wordpress'),
-				'verify_loading_title_text'  	=> esc_html__( 'Verifying....' ,'google-analytics-for-wordpress'),
-				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'verify_loading_error_title' 	=> esc_html__( "Verification Error:" ,'google-analytics-for-wordpress'),
-				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!' ,'google-analytics-for-wordpress'),
-				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!" ,'google-analytics-for-wordpress'),
-				'ok_text' 						=> esc_html__( "OK" ,'google-analytics-for-wordpress'),
-				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate" ,'google-analytics-for-wordpress'),
+				'shorten'         				=> esc_html__( 'Shorten URL', 'google-analytics-for-wordpress' ),
+				'shortened'        				=> esc_html__( 'Shortened!', 'google-analytics-for-wordpress' ),
+				'working'          				=> esc_html__( 'Working...', 'google-analytics-for-wordpress' ),
+				'importtext'       				=> esc_html__( 'Import', 'google-analytics-for-wordpress' ),
+				'imported'         				=> esc_html__( 'Imported!', 'google-analytics-for-wordpress' ),
+				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:', 'google-analytics-for-wordpress' ),
+				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'redirect_loading_error_title'  => esc_html__( "Authentication Error:", 'google-analytics-for-wordpress' ),
+				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....', 'google-analytics-for-wordpress' ),
+				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:", 'google-analytics-for-wordpress' ),
+				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!', 'google-analytics-for-wordpress' ),
+				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore.", 'google-analytics-for-wordpress' ),
+				'verify_loading_title_text'  	=> esc_html__( 'Verifying....', 'google-analytics-for-wordpress' ),
+				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'verify_loading_error_title' 	=> esc_html__( "Verification Error:", 'google-analytics-for-wordpress' ),
+				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!', 'google-analytics-for-wordpress' ),
+				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!", 'google-analytics-for-wordpress' ),
+				'ok_text' 						=> esc_html__( "OK", 'google-analytics-for-wordpress' ),
+				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate", 'google-analytics-for-wordpress' ),
 				'refresh_report_title'          => esc_html__( 'Refreshing Report', 'google-analytics-for-wordpress' ),
 				'refresh_report_text'           => esc_html__( 'Loading new report data...', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Success', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Retrieved the new report data successfully', 'google-analytics-for-wordpress' ),
 				'refresh_report_failure_title'  => esc_html__( 'Error', 'google-analytics-for-wordpress' ),
-				'timezone'						=> date('e'),
+				'timezone'						=> date( 'e' ),
 			)
 		);
 
@@ -224,7 +224,7 @@ 
 		'kad_admin_js', // Pinnacle theme
 		'dt-chart', // DesignThemes core features plugin
 		'tweeetshare_font_script', // TweetShare - Click To Tweet
-		'tweeetshare_jquery_script',  // TweetShare - Click To Tweet
+		'tweeetshare_jquery_script', // TweetShare - Click To Tweet
 		'tweeetshare_jqueryui_script', // TweetShare - Click To Tweet
 		'tweeetshare_custom_script', // TweetShare - Click To Tweet
 		'imagify-promise-polyfill', // Imagify 
@@ -243,9 +243,9 @@ 
         'rml-modal', // WP Real Media Library
         'rml-order', // WP Real Media Library
         'rml-meta', // WP Real Media Library
-        'rml-uploader',  // WP Real Media Library
-        'rml-options',  // WP Real Media Library
-        'rml-usersettings',  // WP Real Media Library
+        'rml-uploader', // WP Real Media Library
+        'rml-options', // WP Real Media Library
+        'rml-usersettings', // WP Real Media Library
         'rml-main', // WP Real Media Library
         'control-panel-sweet-alert', // Ken Theme
 	);
@@ -279,15 +279,15 @@ 
 
 	global $wp_styles;
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
@@ -302,15 +302,15 @@ 
 
 	global $wp_scripts;
 	foreach ( $wp_scripts->queue as $handle ) {
-		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
@@ -333,65 +333,65 @@ 
  *
  * @return null Return early if not on the proper screen.
  */
-function hide_non_monsterinsights_warnings () {
+function hide_non_monsterinsights_warnings() {
 	// Bail if we're not on a MonsterInsights screen.
 	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'monsterinsights' ) === false ) {
 		return;
 	}
 
 	global $wp_filter;
-	if ( !empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 }
-add_action('admin_print_scripts', 'hide_non_monsterinsights_warnings');  
+add_action( 'admin_print_scripts', 'hide_non_monsterinsights_warnings' );  
 
 /**
  * Called whenever an upgrade button / link is displayed in Lite, this function will
@@ -452,7 +452,7 @@ 
 	return $shareasale_id;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){
@@ -468,9 +468,9 @@ 
 }
 
 function monsterinsights_ublock_notice() {
-	ob_start();?>
+	ob_start(); ?>
 	<div id="monsterinsights-ublock-origin-error" class="error inline" style="display:none;">
-		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">');
+		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' );
 		?>
 	</div>
 	<?php

includes/admin/api-auth.php

Spacing +53 added lines, -53 removed lines

@@ -28,16 +28,16 @@ 
 	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' ) );
 	}
 
-	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
@@ -47,12 +47,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 ) );
 	}
 
@@ -61,14 +61,14 @@ 
 		return hash_equals( $tt, $passed_tt );
 	}
 
-	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'] ) {
@@ -78,14 +78,14 @@ 
 		// Only for Pro users, require a license key to be entered first so we can link to things.
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		// 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();
@@ -109,7 +109,7 @@ 
 	}
 
 
-	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;
@@ -127,12 +127,12 @@ 
 		}
 
 		// Make sure has required params
-		if ( empty( $_REQUEST['key'] )      ||
-			 empty( $_REQUEST['token'] )    ||
-			 empty( $_REQUEST['ua'] )       ||
-			 empty( $_REQUEST['miview'] )   ||
-			 empty( $_REQUEST['a'] )        ||
-			 empty( $_REQUEST['w'] )        ||
+		if ( empty( $_REQUEST['key'] ) ||
+			 empty( $_REQUEST['token'] ) ||
+			 empty( $_REQUEST['ua'] ) ||
+			 empty( $_REQUEST['miview'] ) ||
+			 empty( $_REQUEST['a'] ) ||
+			 empty( $_REQUEST['w'] ) ||
 			 empty( $_REQUEST['p'] )
 		) {
 			return;
@@ -171,7 +171,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',
@@ -180,14 +180,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'] ) {
@@ -197,14 +197,14 @@ 
 		// Only for Pro users, require a license key to be entered first so we can link to things.
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		// 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(
@@ -227,7 +227,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;
@@ -245,10 +245,10 @@ 
 
 		// Make sure has required params
 		if (
-			 empty( $_REQUEST['ua'] )       ||
-			 empty( $_REQUEST['miview'] )   ||
-			 empty( $_REQUEST['a'] )        ||
-			 empty( $_REQUEST['w'] )        ||
+			 empty( $_REQUEST['ua'] ) ||
+			 empty( $_REQUEST['miview'] ) ||
+			 empty( $_REQUEST['a'] ) ||
+			 empty( $_REQUEST['w'] ) ||
 			 empty( $_REQUEST['p'] )       
 		) {
 			return;
@@ -288,7 +288,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',
@@ -297,14 +297,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'] ) {
@@ -313,25 +313,25 @@ 
 
 		// 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' ) ) );
 		}
 
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$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'] ) ) {
@@ -348,14 +348,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'] ) {
@@ -364,20 +364,20 @@ 
 
 		// 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' ) ) );
 		}
 
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$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 ) {
@@ -388,7 +388,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() ) {
@@ -404,13 +404,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;
 			}
@@ -452,15 +452,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;
 	}
 }
\ No newline at end of file

includes/admin/ajax.php

Indentation +71 added lines, -71 removed lines

@@ -51,60 +51,60 @@ 
     check_ajax_referer( 'monsterinsights-install', 'nonce' );
 
     if ( ! current_user_can( 'install_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Install the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        $download_url = $_POST['plugin'];
-        global $hook_suffix;
-
-        // Set the current screen to avoid undefined notices.
-        set_current_screen();
-
-        // Prepare variables.
-        $method = '';
-        $url    = add_query_arg(
-            array(
-                'page' => 'monsterinsights-settings'
-            ),
-            admin_url( 'admin.php' )
-        );
-        $url = esc_url( $url );
-
-        // Start output bufferring to catch the filesystem form if credentials are needed.
-        ob_start();
-        if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // If we are not authenticated, make it happen now.
-        if ( ! WP_Filesystem( $creds ) ) {
-            ob_start();
-            request_filesystem_credentials( $url, $method, true, false, null );
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // We do not need any extra credentials if we have gotten this far, so let's install the plugin.
-        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-        $base = MonsterInsights();
-        require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
+	$download_url = $_POST['plugin'];
+	global $hook_suffix;
+
+	// Set the current screen to avoid undefined notices.
+	set_current_screen();
+
+	// Prepare variables.
+	$method = '';
+	$url    = add_query_arg(
+	    array(
+		'page' => 'monsterinsights-settings'
+	    ),
+	    admin_url( 'admin.php' )
+	);
+	$url = esc_url( $url );
+
+	// Start output bufferring to catch the filesystem form if credentials are needed.
+	ob_start();
+	if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// If we are not authenticated, make it happen now.
+	if ( ! WP_Filesystem( $creds ) ) {
+	    ob_start();
+	    request_filesystem_credentials( $url, $method, true, false, null );
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// We do not need any extra credentials if we have gotten this far, so let's install the plugin.
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	$base = MonsterInsights();
+	require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
         
-        // Create the plugin upgrader with our custom skin.
-        $installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
-        $installer->install( $download_url );
-
-        // Flush the cache and return the newly installed plugin basename.
-        wp_cache_flush();
-        if ( $installer->plugin_info() ) {
-            $plugin_basename = $installer->plugin_info();
-            echo json_encode( array( 'plugin' => $plugin_basename ) );
-            wp_die();
-        }
+	// Create the plugin upgrader with our custom skin.
+	$installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
+	$installer->install( $download_url );
+
+	// Flush the cache and return the newly installed plugin basename.
+	wp_cache_flush();
+	if ( $installer->plugin_info() ) {
+	    $plugin_basename = $installer->plugin_info();
+	    echo json_encode( array( 'plugin' => $plugin_basename ) );
+	    wp_die();
+	}
     }
 
     // Send back a response.
@@ -126,21 +126,21 @@ 
     check_ajax_referer( 'monsterinsights-activate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
-        } else {
-            $activate = activate_plugin( $_POST['plugin'] );
-        }
-
-        if ( is_wp_error( $activate ) ) {
-            echo json_encode( array( 'error' => $activate->get_error_message() ) );
-            wp_die();
-        }
+	if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+	    $activate = activate_plugin( $_POST['plugin'], NULL, true );
+	} else {
+	    $activate = activate_plugin( $_POST['plugin'] );
+	}
+
+	if ( is_wp_error( $activate ) ) {
+	    echo json_encode( array( 'error' => $activate->get_error_message() ) );
+	    wp_die();
+	}
     }
 
     echo json_encode( true );
@@ -161,16 +161,16 @@ 
     check_ajax_referer( 'monsterinsights-deactivate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
-            $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
-        } else {
-            $deactivate = deactivate_plugins( $_POST['plugin'] );
-        }
+	if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+	    $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
+	} else {
+	    $deactivate = deactivate_plugins( $_POST['plugin'] );
+	}
     }
 
     echo json_encode( true );
@@ -193,12 +193,12 @@ 
 
     // Deactivate the notice
     if ( isset( $_POST['notice'] ) ) {
-        // Init the notice class and mark notice as deactivated
-        MonsterInsights()->notices->dismiss( $_POST['notice'] );
+	// Init the notice class and mark notice as deactivated
+	MonsterInsights()->notices->dismiss( $_POST['notice'] );
 
-        // Return true
-        echo json_encode( true );
-        wp_die();
+	// Return true
+	echo json_encode( true );
+	wp_die();
     }
 
     // If here, an error occurred

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $activate = activate_plugin( $_POST['plugin'], NULL, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );

includes/admin/reports/overview.php

Spacing +47 added lines, -47 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Outputs the report.
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		ob_start();
 		if ( ! empty( $data['overviewgraph']['count'] ) && $data['overviewgraph']['count'] > 0 ) {
 			?>
@@ -93,7 +93,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['sessions']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['sessions']['prev'] ) ) . '%'; ?>
@@ -120,7 +120,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['pageviews']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['pageviews']['prev'] ) ) . '%'; ?>
@@ -147,10 +147,10 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['duration']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
-					<?php echo esc_html( absint(  $data['infobox']['duration']['prev'] ) ) . '%'; ?>
+					<?php echo esc_html( absint( $data['infobox']['duration']['prev'] ) ) . '%'; ?>
 				</div>
 				<?php } ?>
 				<div class="monsterinsights-reports-infobox-compare">
@@ -174,7 +174,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['bounce']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['bounce']['prev'] ) ) . '%'; ?>
@@ -186,12 +186,12 @@ 
 			  </div>
 			</div>
 		<?php } ?>
-		<?php if ( ! empty( $data['newvsreturn'] ) &&  ! empty( $data['devices'] ) ) { ?>
+		<?php if ( ! empty( $data['newvsreturn'] ) && ! empty( $data['devices'] ) ) { ?>
 			<div class="monsterinsights-reports-2-column-container row">
 			  <div class="monsterinsights-reports-2-column-item col-md-6">
 				<div class="monsterinsights-reports-2-column-panel panel monsterinsights-pie-chart-panel chart-panel">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This graph shows what percent of your user sessions come from new versus repeat visitors.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-pie-graph monsterinsights-clear">
@@ -281,8 +281,8 @@ 
 										}],
 										values: [<?php echo esc_js( $data['newvsreturn']['new'] ); ?>,<?php echo esc_js( $data['newvsreturn']['returning'] ); ?> ],
 										labels: [
-											"<?php echo esc_js( __('New', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Returning', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'New', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Returning', 'google-analytics-for-wordpress' ) ); ?>",
 										]
 									},
 									options: {
@@ -340,7 +340,7 @@ 
 			<div class="monsterinsights-reports-2-column-item col-md-6">
 				<div class="monsterinsights-reports-2-column-panel panel monsterinsights-pie-chart-panel chart-panel">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Device Breakdown', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Device Breakdown', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Device Breakdown', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This graph shows what percent of your visitor sessions are done using a traditional computer or laptop, tablet or mobile device to view your site.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-pie-graph monsterinsights-clear">
@@ -432,9 +432,9 @@ 
 										}],
 										values: [<?php echo esc_js( $data['devices']['desktop'] ); ?>,<?php echo esc_js( $data['devices']['tablet'] ); ?>,<?php echo esc_js( $data['devices']['mobile'] ); ?>  ],
 										labels: [
-											"<?php echo esc_js( __('Desktop', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Tablet', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Mobile', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Desktop', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Tablet', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Mobile', 'google-analytics-for-wordpress' ) ); ?>",
 										]
 									},
 									options: {
@@ -492,12 +492,12 @@ 
 			</div>
 		<?php } ?>
 
-		<?php if ( ! empty( $data['countries'] ) &&  ! empty( $data['referrals'] ) ) { ?>
+		<?php if ( ! empty( $data['countries'] ) && ! empty( $data['referrals'] ) ) { ?>
 			<div class="monsterinsights-reports-2-column-container row">
 			  <div class="monsterinsights-reports-2-column-item col-md-6 list-has-icons">
 				<div class="monsterinsights-reports-2-column-panel panel nopadding">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Top 10 Countries', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Top 10 Countries', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Top 10 Countries', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the top countries your website visitors are from.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-list">
@@ -505,11 +505,11 @@ 
 						<?php 
 						$countries = monsterinsights_get_country_list( true );
 						$i = 1;
-						foreach( $data['countries'] as $icountry => $countrydata ) {
-							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+						foreach ( $data['countries'] as $icountry => $countrydata ) {
+							if ( ! empty( $countries[$countrydata['iso']] ) ) {
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[$countrydata['iso']] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							} else { 
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
 							$i++;
 						}
@@ -517,35 +517,35 @@ 
 						</ul>
 					</div>
 					<?php 
-					$referral_url = 'https://analytics.google.com/analytics/web/#report/visitors-geo/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+					$referral_url = 'https://analytics.google.com/analytics/web/#report/visitors-geo/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 					?>
 					<div class="monsterinsights-reports-panel-footer">
-						<a href="<?php echo $referral_url; ?>" target="_blank"  title="<?php echo esc_html__( 'View Full Countries Report', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Countries Report', 'google-analytics-for-wordpress' );?></a>
+						<a href="<?php echo $referral_url; ?>" target="_blank"  title="<?php echo esc_html__( 'View Full Countries Report', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Countries Report', 'google-analytics-for-wordpress' ); ?></a>
 					</div>
 				</div>
 			  </div>
 			  <div class="monsterinsights-reports-2-column-item col-md-6 list-has-icons">
 				<div class="monsterinsights-reports-2-column-panel panel nopadding">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Referrals', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Referrals', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Referrals', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the top websites that send your website traffic, known as "referral traffic".', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-list">
 						<ul class="monsterinsights-reports-referral-list list-group">
 						<?php
 						$i = 1;
-						foreach( $data['referrals'] as $ireferrals => $referralsdata ) {
-								echo '<li class="list-group-item">'.
+						foreach ( $data['referrals'] as $ireferrals => $referralsdata ) {
+								echo '<li class="list-group-item">' .
 										'<span class="monsterinsights-reports-list-count">'
 											. $i .
-										'</span>'.
-										'<img class="monsterinsights-reports-referral-icon"  src="https://www.google.com/s2/favicons?domain=' . $referralsdata['url'] . '" width="16px" height="16px" />'.
+										'</span>' .
+										'<img class="monsterinsights-reports-referral-icon"  src="https://www.google.com/s2/favicons?domain=' . $referralsdata['url'] . '" width="16px" height="16px" />' .
 										'<span class="monsterinsights-reports-list-text">' 
 											. $referralsdata['url'] . 
 										'</span>
 										<span class="monsterinsights-reports-list-number">'
 											. number_format_i18n( $referralsdata['sessions'] ) . 
-										'</span>'.
+										'</span>' .
 									'</li>';
 							$i++;
 						}
@@ -553,10 +553,10 @@ 
 						</ul>
 					</div>
 					<?php 
-					$referral_url = 'https://analytics.google.com/analytics/web/#report/trafficsources-referrals/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+					$referral_url = 'https://analytics.google.com/analytics/web/#report/trafficsources-referrals/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 					?>
 					<div class="monsterinsights-reports-panel-footer">
-						<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' );?></a>
+						<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' ); ?></a>
 					</div>
 				</div>
 			  </div>
@@ -566,7 +566,7 @@ 
 		<?php if ( ! empty( $data['toppages'] ) ) { ?>
 			<div class="monsterinsights-reports-1-column-row panel row container-fluid nopadding list-no-icons" style="position: relative;">
 				<div class="monsterinsights-reports-panel-title">
-					<?php echo esc_html__( 'Top Posts / Pages', 'google-analytics-for-wordpress' );?>
+					<?php echo esc_html__( 'Top Posts / Pages', 'google-analytics-for-wordpress' ); ?>
 				</div>
 				
 				<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Top Posts / Pages', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the most viewed posts and pages on your website.', 'google-analytics-for-wordpress' ) ); ?>"></div>
@@ -574,23 +574,23 @@ 
 					<ul class="monsterinsights-reports-pages-list list-group">
 						<?php
 						$i = 1;
-						foreach( $data['toppages'] as $itoppages => $toppagesdata ) {
-								$hide     = $i > 10 ? ' style="display: none;" ': '';
+						foreach ( $data['toppages'] as $itoppages => $toppagesdata ) {
+								$hide     = $i > 10 ? ' style="display: none;" ' : '';
 								$protocol = is_ssl() ? 'https://' : 'http://';
-								$opening  = ! empty( $toppagesdata['url'] ) && ! empty( $toppagesdata['hostname'] ) ? '<a href="' . $protocol . esc_attr( $toppagesdata['hostname'] . $toppagesdata['url'] ) .'" target="_blank">' : '';
+								$opening  = ! empty( $toppagesdata['url'] ) && ! empty( $toppagesdata['hostname'] ) ? '<a href="' . $protocol . esc_attr( $toppagesdata['hostname'] . $toppagesdata['url'] ) . '" target="_blank">' : '';
 								$closing = ! empty( $opening ) ? '</a>' : '';
-								echo '<li class="list-group-item  monsterinsights-listing-table-row"'. $hide . '>'.
+								echo '<li class="list-group-item  monsterinsights-listing-table-row"' . $hide . '>' .
 										'<span class="monsterinsights-reports-list-count">'
 											. $i .
-										'. </span>&nbsp;'.
+										'. </span>&nbsp;' .
 										'<span class="monsterinsights-reports-list-text">' 
 											. $opening
 											. $toppagesdata['title']
 											. $closing .
-										'</span>'.
+										'</span>' .
 										'<span class="monsterinsights-reports-list-number">' . 
 											number_format_i18n( $toppagesdata['sessions'] ) . 
-										'</span>'.
+										'</span>' .
 									'</li>';
 							$i++;
 						}
@@ -598,16 +598,16 @@ 
 					</ul>
 				</div>
 				<?php 
-				$referral_url = 'https://analytics.google.com/analytics/web/#report/content-pages/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+				$referral_url = 'https://analytics.google.com/analytics/web/#report/content-pages/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 				?>
 				<div class="monsterinsights-reports-panel-footer monsterinsights-reports-panel-footer-large">
-					<?php echo esc_html__( 'Show', 'google-analytics-for-wordpress' );?>&nbsp;
-					<div class="monsterinsights-reports-show-selector-group btn-group" role="group" aria-label="<?php echo esc_html__( 'How many to show', 'google-analytics-for-wordpress' );?>">
+					<?php echo esc_html__( 'Show', 'google-analytics-for-wordpress' ); ?>&nbsp;
+					<div class="monsterinsights-reports-show-selector-group btn-group" role="group" aria-label="<?php echo esc_html__( 'How many to show', 'google-analytics-for-wordpress' ); ?>">
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button ten btn btn-default active" disabled="disabled">10</button>
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button twentyfive btn btn-default">25</button>
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button fifty btn btn-default">50</button>
 					</div>
-					<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button alignright" style="margin-right: 20px;"><?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' );?></a>
+					<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button alignright" style="margin-right: 20px;"><?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' ); ?></a>
 				</div>
 			</div>
 		<?php } ?>
@@ -644,7 +644,7 @@ 
 
 		ob_start(); ?>
 		<div class="monsterinsights-reports-box-datagraph" style="position:relative;">
-			<canvas id="monsterinsights-overview-<?php echo $class;?>" width="400px" height="400px"></canvas>
+			<canvas id="monsterinsights-overview-<?php echo $class; ?>" width="400px" height="400px"></canvas>
 			<script>
 				jQuery(document).ready(function() {
 					if ( window.uorigindetected != null){
@@ -675,7 +675,7 @@ 
 						   }
 						});
 						
-						var ctx = document.getElementById("monsterinsights-overview-<?php echo $class;?>");
+						var ctx = document.getElementById("monsterinsights-overview-<?php echo $class; ?>");
 						var data = {
 							labels: [<?php echo implode( ', ', $labels ); ?>],
 							datasets: [
@@ -700,8 +700,8 @@ 
 									pointHoverRadius: 6,//The radius of the point when hovered.
 
 
-									labels: [<?php echo implode( ', ', $labels );   ?>],
-									data: [<?php echo implode( ', ', $datapoints );   ?>],
+									labels: [<?php echo implode( ', ', $labels ); ?>],
+									data: [<?php echo implode( ', ', $datapoints ); ?>],
 									trend: [<?php echo implode( ', ', $trendpoints ); ?>],
 								},
 							]
@@ -783,7 +783,7 @@ 
 						  });
 						};
 
-						var MonsterInsightsOverview<?php echo time();?> = new Chart(ctx, {
+						var MonsterInsightsOverview<?php echo time(); ?> = new Chart(ctx, {
 							type: 'LineWithLine',
 							data: data,
 							plugins: [{

Braces +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Outputs the report.
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		ob_start();
 		if ( ! empty( $data['overviewgraph']['count'] ) && $data['overviewgraph']['count'] > 0 ) {
 			?>
@@ -508,7 +508,7 @@ 
 						foreach( $data['countries'] as $icountry => $countrydata ) {
 							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
-							} else { 
+							} else {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
 							$i++;