awesomemotive / google-analytics-for-wordpress

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

Spacing +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@ 
 			if ( ! is_array( $item ) ) {
 				echo '  _gaq.push([' . $item . "]);\n";
 			} else if ( isset( $item['value'] ) ) {
-				echo '  '.$item['value'] . "\n";
+				echo '  ' . $item['value'] . "\n";
 			}
 		}
 	}
@@ -171,7 +171,7 @@ 
 			var ga = document.createElement('script');
 			ga.type = 'text/javascript';
 			ga.async = true;
-			ga.src = <?php echo $src;?>
+			ga.src = <?php echo $src; ?>
 			var s = document.getElementsByTagName('script')[0];
 			s.parentNode.insertBefore(ga, s);
 		})();

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

Indentation +6 added lines, -6 removed lines

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

Spacing +3 added lines, -3 removed lines

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

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

Indentation +10 added lines, -10 removed lines

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

Spacing +4 added lines, -4 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -99,8 +99,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 ) . "'";
 		}
@@ -176,10 +176,10 @@ 
 	 */
 	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;' : '';

includes/frontend/events/class-link.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
 	 * @param array  $matches Matches found for the hyperlink.
 	 */
 	public function __construct( $base, $category, $matches ) {
-		$this->base 		   = $base;
+		$this->base = $base;
 		$this->category        = $category;
 		$this->original_url    = $matches[5];
 		$this->domain          = $this->get_domain();
@@ -192,7 +192,7 @@ 
 			$type = 'email';
 		} else if ( in_array( $this->extension, $download_extensions ) ) {
 			$type = 'download';
-		} else if ( in_array( $this->protocol, array( 'http', 'https') ) && $full_url !== rtrim( home_url(), '\/' ) ) {
+		} else if ( in_array( $this->protocol, array( 'http', 'https' ) ) && $full_url !== rtrim( home_url(), '\/' ) ) {
 			$type = 'outbound';
 		} else {
 			$type = $this->parse_internal_link_type();

includes/frontend/events/class-events-js.php

Spacing +6 added lines, -6 removed lines

@@ -90,14 +90,14 @@ 
 		$internal_label = esc_js( $internal_label );
 
 		// Get inbound as outbound to track
-		$inbound_paths = monsterinsights_get_option( 'track_internal_as_outbound','' );
+		$inbound_paths = monsterinsights_get_option( 'track_internal_as_outbound', '' );
 		$inbound_paths = explode( ',', $inbound_paths );
 		if ( ! is_array( $inbound_paths ) ) {
 			$inbound_paths = array( $inbound_paths );
 		}
 		$i = 0;
-		foreach ( $inbound_paths as $path ){
-			$inbound_paths[ $i ] = esc_js( trim( $path ) );
+		foreach ( $inbound_paths as $path ) {
+			$inbound_paths[$i] = esc_js( trim( $path ) );
 			$i++;
 		}
 
@@ -110,14 +110,14 @@ 
 			$download_extensions = array( $download_extensions );
 		}
 		$i = 0;
-		foreach( $download_extensions as $extension ){
-			$download_extensions[ $i ] = esc_js( trim( $extension ) );
+		foreach ( $download_extensions as $extension ) {
+			$download_extensions[$i] = esc_js( trim( $extension ) );
 			$i++;
 		}
 
 		$download_extensions = implode( ",", $download_extensions );
 
-		$is_debug_mode     =  monsterinsights_is_debug_mode();
+		$is_debug_mode = monsterinsights_is_debug_mode();
 		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
 			$is_debug_mode = 'true';
 		} else {

Braces +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 			$inbound_paths = array( $inbound_paths );
 		}
 		$i = 0;
-		foreach ( $inbound_paths as $path ){
+		foreach ( $inbound_paths as $path ) {
 			$inbound_paths[ $i ] = esc_js( trim( $path ) );
 			$i++;
 		}
@@ -110,7 +110,7 @@ 
 			$download_extensions = array( $download_extensions );
 		}
 		$i = 0;
-		foreach( $download_extensions as $extension ){
+		foreach( $download_extensions as $extension ) {
 			$download_extensions[ $i ] = esc_js( trim( $extension ) );
 			$i++;
 		}

includes/frontend/events/class-events-php.php

Spacing +9 added lines, -9 removed lines

@@ -107,7 +107,7 @@ 
 			   . '>'                // matches the characters > literally
 			   . '(.*)'             // 7. matches any character (except newline) (Between 0 and * times)
 			   . '<\/a>'            // matches the characters </a> literally
-			   . '/isU';            // case insensitive, single line, ungreedy
+			   . '/isU'; // case insensitive, single line, ungreedy
 	}
 
 
@@ -256,7 +256,7 @@ 
 			return $link_attribute;
 		} else if ( preg_match( '/onclick=[\'\"](.*?)[\'\"]/i', $link_attribute, $matches ) > 0 && is_string( $onclick ) ) { // if not closed, see #33
 			$onclick_with_double = str_replace( "'", '"', $onclick );
-			if ( strlen( trim ( $matches[1] ) ) > 0 ) {
+			if ( strlen( trim( $matches[1] ) ) > 0 ) {
 				$js_snippet_single = 'onclick=\'' . $matches[1] . '; ' . $onclick_with_double . '\'';
 				$js_snippet_double = 'onclick="' . $matches[1] . '; ' . $onclick . '"';
 			} else {
@@ -371,14 +371,14 @@ 
 		$full_url = $this->make_full_url( $link_target );
 		switch ( $link_target->type ) {
 			case 'download':
-				if ( $this->tracking === 'ga' ){
-					if ( monsterinsights_get_option('track_download_as', '' ) === 'pageview' ) {
+				if ( $this->tracking === 'ga' ) {
+					if ( monsterinsights_get_option( 'track_download_as', '' ) === 'pageview' ) {
 						$onclick = $object_name . "(['_trackPageview','download/" . esc_js( $full_url ) . "']);";
 					} else {
 						$onclick = $object_name . "(['_trackEvent','download','" . esc_js( $full_url ) . "']);";
 					}
 				} else {
-					if ( monsterinsights_get_option('track_download_as', '' ) === 'pageview' ) {
+					if ( monsterinsights_get_option( 'track_download_as', '' ) === 'pageview' ) {
 						$onclick = $object_name . "('send', 'pageview', '" . esc_js( $full_url ) . "');";
 					} else {
 						$onclick = $object_name . "('send', 'event', 'download', '" . esc_js( $full_url ) . "');";
@@ -386,23 +386,23 @@ 
 				}
 				break;
 			case 'email':
-				if ( $this->tracking === 'ga' ){
+				if ( $this->tracking === 'ga' ) {
 					$onclick = $object_name . "(['_trackEvent','mailto','" . esc_js( $link_target->original_url ) . "']);";
 				} else {
 					$onclick = $object_name . "('send', 'event', 'mailto', '" . esc_js( $link_target->original_url ) . "');";
 				}
 				break;
 			case 'internal-as-outbound':
-				if ( $this->tracking === 'ga' ){ 
+				if ( $this->tracking === 'ga' ) { 
 					$category = $this->sanitize_internal_label();
 					$onclick = $object_name . "(['_trackEvent', '" . esc_js( $link_target->category ) . '-' . esc_js( $category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "']);";
 				} else {
 					$category = $this->sanitize_internal_label();
-					$onclick = $object_name . "('send', '" . esc_js( monsterinsights_get_option('track_download_as', '' ) ) . "', '" . esc_js( $link_target->category ) . '-' . esc_js( $category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "');";
+					$onclick = $object_name . "('send', '" . esc_js( monsterinsights_get_option( 'track_download_as', '' ) ) . "', '" . esc_js( $link_target->category ) . '-' . esc_js( $category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "');";
 				}
 				break;
 			case 'outbound':
-				if ( $this->tracking === 'ga' ){  
+				if ( $this->tracking === 'ga' ) {  
 					 $onclick = $object_name . "(['_trackEvent', '" . esc_js( $link_target->category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "']);";
 				} else {
 					$onclick = $object_name . "('send', 'event', '" . esc_js( $link_target->category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "');";

Braces +6 added lines, -5 removed lines

@@ -254,7 +254,8 @@ 
 			$link_attribute = str_replace( "onclick='" . $matches[1] . "'", $js_snippet_single, $link_attribute );
 
 			return $link_attribute;
-		} else if ( preg_match( '/onclick=[\'\"](.*?)[\'\"]/i', $link_attribute, $matches ) > 0 && is_string( $onclick ) ) { // if not closed, see #33
+		} else if ( preg_match( '/onclick=[\'\"](.*?)[\'\"]/i', $link_attribute, $matches ) > 0 && is_string( $onclick ) ) {
+// if not closed, see #33
 			$onclick_with_double = str_replace( "'", '"', $onclick );
 			if ( strlen( trim ( $matches[1] ) ) > 0 ) {
 				$js_snippet_single = 'onclick=\'' . $matches[1] . '; ' . $onclick_with_double . '\'';
@@ -371,7 +372,7 @@ 
 		$full_url = $this->make_full_url( $link_target );
 		switch ( $link_target->type ) {
 			case 'download':
-				if ( $this->tracking === 'ga' ){
+				if ( $this->tracking === 'ga' ) {
 					if ( monsterinsights_get_option('track_download_as', '' ) === 'pageview' ) {
 						$onclick = $object_name . "(['_trackPageview','download/" . esc_js( $full_url ) . "']);";
 					} else {
@@ -386,14 +387,14 @@ 
 				}
 				break;
 			case 'email':
-				if ( $this->tracking === 'ga' ){
+				if ( $this->tracking === 'ga' ) {
 					$onclick = $object_name . "(['_trackEvent','mailto','" . esc_js( $link_target->original_url ) . "']);";
 				} else {
 					$onclick = $object_name . "('send', 'event', 'mailto', '" . esc_js( $link_target->original_url ) . "');";
 				}
 				break;
 			case 'internal-as-outbound':
-				if ( $this->tracking === 'ga' ){ 
+				if ( $this->tracking === 'ga' ) {
 					$category = $this->sanitize_internal_label();
 					$onclick = $object_name . "(['_trackEvent', '" . esc_js( $link_target->category ) . '-' . esc_js( $category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "']);";
 				} else {
@@ -402,7 +403,7 @@ 
 				}
 				break;
 			case 'outbound':
-				if ( $this->tracking === 'ga' ){  
+				if ( $this->tracking === 'ga' ) {
 					 $onclick = $object_name . "(['_trackEvent', '" . esc_js( $link_target->category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "']);";
 				} else {
 					$onclick = $object_name . "('send', 'event', '" . esc_js( $link_target->category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "');";

includes/frontend/frontend.php

Indentation +48 added lines, -48 removed lines

@@ -34,48 +34,48 @@ 
     $mode = '';
 
     if ( is_preview() ) {
-        $mode = 'preview';
+	$mode = 'preview';
     } else if ( ! monsterinsights_track_user() ) {
-        $mode = 'disabled';
+	$mode = 'disabled';
     } else if ( $tracking_mode === 'analytics' ) {
-        $mode = 'analytics';
+	$mode = 'analytics';
     } else if ( $tracking_mode === 'ga' ) {
-        $mode = 'ga';
+	$mode = 'ga';
     } else {
-        //$mode = apply_filters( 'monsterinsights_custom_tracking_name', 'name-of-method' );
+	//$mode = apply_filters( 'monsterinsights_custom_tracking_name', 'name-of-method' );
     }
 
     do_action( 'monsterinsights_tracking_before_' . $mode );
     do_action( 'monsterinsights_tracking_before', $mode );
 
     switch ( $mode ) {
-        case 'preview':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
-            $tracking = new MonsterInsights_Tracking_Preview();
-            echo $tracking->frontend_output();
-            break;
-
-        case 'disabled':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-disabled.php';
-            $tracking = new MonsterInsights_Tracking_Disabled();
-            echo $tracking->frontend_output();
-            break;
-
-        case 'analytics':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
-            $tracking = new MonsterInsights_Tracking_Analytics();
-            echo $tracking->frontend_output();
-            break;
-
-        case 'ga':
-            require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-ga.php';
-            $tracking = new MonsterInsights_Tracking_GA();
-            echo $tracking->frontend_output();
-            break;
-
-        default:
-            //do_action( 'monsterinsights_custom_tracking' );
-            break;
+	case 'preview':
+	    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
+	    $tracking = new MonsterInsights_Tracking_Preview();
+	    echo $tracking->frontend_output();
+	    break;
+
+	case 'disabled':
+	    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-disabled.php';
+	    $tracking = new MonsterInsights_Tracking_Disabled();
+	    echo $tracking->frontend_output();
+	    break;
+
+	case 'analytics':
+	    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
+	    $tracking = new MonsterInsights_Tracking_Analytics();
+	    echo $tracking->frontend_output();
+	    break;
+
+	case 'ga':
+	    require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-ga.php';
+	    $tracking = new MonsterInsights_Tracking_GA();
+	    echo $tracking->frontend_output();
+	    break;
+
+	default:
+	    //do_action( 'monsterinsights_custom_tracking' );
+	    break;
     }
 
     do_action( 'monsterinsights_tracking_after_' . $mode );
@@ -102,13 +102,13 @@ 
     $track_user    = monsterinsights_track_user();
 
     if ( $track_user && $events_mode === 'php' && ( $tracking_mode === 'ga' || $tracking_mode === 'analytics' ) ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-events-php.php';
-        new MonsterInsights_Events_PHP();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-events-php.php';
+	new MonsterInsights_Events_PHP();
     } else if ( $track_user && $events_mode === 'js' && $tracking_mode === 'analytics' ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-events-js.php';
-        new MonsterInsights_Events_JS();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-events-js.php';
+	new MonsterInsights_Events_JS();
     } else {
-        // User is in the disabled group or events mode is off
+	// User is in the disabled group or events mode is off
     }
 }
 add_action( 'template_redirect', 'monsterinsights_events_tracking', 9 );
@@ -127,17 +127,17 @@ 
     global $post;
 
     if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
-        if ( is_feed() ) {
-            if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
-                $delimiter = '#';
-            } else {
-                $delimiter = '?';
-                if ( strpos( $guid, $delimiter ) > 0 ) {
-                    $delimiter = '&';
-                }
-            }
-            return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
-        }
+	if ( is_feed() ) {
+	    if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
+		$delimiter = '#';
+	    } else {
+		$delimiter = '?';
+		if ( strpos( $guid, $delimiter ) > 0 ) {
+		    $delimiter = '&';
+		}
+	    }
+	    return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
+	}
     }
     return $guid;
 }

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 function monsterinsights_rss_link_tagger( $guid ) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
+    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ) {
         if ( is_feed() ) {
             if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
                 $delimiter = '#';

Braces +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 function monsterinsights_rss_link_tagger( $guid ) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
+    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ) {
         if ( is_feed() ) {
             if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
                 $delimiter = '#';

includes/install.php

Spacing +26 added lines, -26 removed lines

@@ -308,9 +308,9 @@ 
 		// Fallback to make sure every default option has a value
 		$defaults = $this->get_yoast_default_values();
 		if ( is_array( $defaults ) ) {
-			foreach ( $defaults[ 'ga_general' ] as $key => $value ) {
-				if ( ! isset( $options[ $key ] ) ) {
-					$options[ $key ] = $value;
+			foreach ( $defaults['ga_general'] as $key => $value ) {
+				if ( ! isset( $options[$key] ) ) {
+					$options[$key] = $value;
 				}
 			}
 		}
@@ -318,7 +318,7 @@ 
 		// Set to the current version now that we've done all needed upgrades
 		$options['version'] = '5.5.3'; // Last Yoast codebase version
 		$saved_options = get_option( 'yst_ga' );
-		$saved_options[ 'ga_general' ] = $options;
+		$saved_options['ga_general'] = $options;
 		update_option( 'yst_ga', $saved_options );
 
 
@@ -328,8 +328,8 @@ 
 			$network = false;
 			// Try network active Premium
 			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-				$key    = $is_key['key'];
+			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+				$key = $is_key['key'];
 				$found = true;
 				$network = true;
 			}
@@ -337,8 +337,8 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -346,8 +346,8 @@ 
 			// Try network active Premium
 			if ( ! $found ) {
 				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}				
@@ -356,8 +356,8 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -365,8 +365,8 @@ 
 			// Try network active ecommmerce
 			if ( ! $found ) {
 				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}
@@ -374,8 +374,8 @@ 
 			// Try single site ecommerce
 			if ( ! $found ) {
 				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -490,10 +490,10 @@ 
 							}
 						}
 					}
-					$options['cron_last_run'] = strtotime("-25 hours");
+					$options['cron_last_run'] = strtotime( "-25 hours" );
 				} else {
 					// if UA in manual code field, remove analytics profile fields if set
-					if ( ! empty( $options['manual_ua_code_field' ] ) ) {
+					if ( ! empty( $options['manual_ua_code_field'] ) ) {
 						if ( isset( $options['analytics_profile_code'] ) ) {
 							unset( $options['analytics_profile_code'] );
 						}
@@ -504,7 +504,7 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					} else if ( ! empty( $options['analytics_profile_code' ] ) ) {
+					} else if ( ! empty( $options['analytics_profile_code'] ) ) {
 					// if UA in profile fields, remove others and use that
 						$options['manual_ua_code'] = $options['analytics_profile_code'];
 						if ( isset( $options['analytics_profile_code'] ) ) {
@@ -516,13 +516,13 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
-						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
+						if ( ! empty( $options['analytics_profile'] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {
 								foreach ( $account['items'] as $profile ) {
 									foreach ( $profile['items'] as $subprofile ) {
-										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile' ] ) {
+										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile'] ) {
 											$options['manual_ua_code'] = $subprofile['ua_code'];
 											break 3;
 										}
@@ -642,8 +642,8 @@ 
 	 */
 	public function v602_upgrades() {
 		$options = get_option( 'yst_ga', array() );
-		if ( ( empty( $this->new_settings[ 'manual_ua_code'] ) || $this->new_settings[ 'manual_ua_code']  === '1' )  &&  
-			 empty( $this->new_settings[ 'analytics_profile_code'] ) &&
+		if ( ( empty( $this->new_settings['manual_ua_code'] ) || $this->new_settings['manual_ua_code'] === '1' ) &&  
+			 empty( $this->new_settings['analytics_profile_code'] ) &&
 			 ! empty( $options ) &&
 			 is_array( $options ) &&
 			 ! empty( $options['ga_general']['manual_ua_code_field'] )
@@ -691,8 +691,8 @@ 
 	 */
 	public function v620_upgrades() {
 		// Turns off debug mode if its on.
-		if ( empty( $this->new_settings['debug_mode' ] ) ) {
-			$this->new_settings['debug_mode' ] = 0;
+		if ( empty( $this->new_settings['debug_mode'] ) ) {
+			$this->new_settings['debug_mode'] = 0;
 		}
 	}
 

Braces +12 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -72,7 +72,8 @@ 
 			// This is the version used for MI upgrade routines.
 			update_option( 'monsterinsights_db_version', '6.2.0' );
 			
-		} else if ( ! $version && $yoast ) { // if new install and has used Yoast previously
+		} else if ( ! $version && $yoast ) {
+// if new install and has used Yoast previously
 
 			$this->upgrade_from_yoast();
 			// This is the version used for MI upgrade routines.
@@ -83,7 +84,8 @@ 
 				$cachec = true;
 			}
 			
-		} else { // if existing install
+		} else {
+// if existing install
 			if ( version_compare( $version, '6.0.2', '<' ) ) {
 				$this->v602_upgrades();
 			}
@@ -328,7 +330,7 @@ 
 			$network = false;
 			// Try network active Premium
 			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 				$key    = $is_key['key'];
 				$found = true;
 				$network = true;
@@ -337,7 +339,7 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -346,7 +348,7 @@ 
 			// Try network active Premium
 			if ( ! $found ) {
 				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 					$key    = $is_key['key'];
 					$found = true;
 					$network = true;
@@ -356,7 +358,7 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -365,7 +367,7 @@ 
 			// Try network active ecommmerce
 			if ( ! $found ) {
 				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 					$key    = $is_key['key'];
 					$found = true;
 					$network = true;
@@ -374,7 +376,7 @@ 
 			// Try single site ecommerce
 			if ( ! $found ) {
 				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -516,7 +518,7 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
 						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {