awesomemotive / google-analytics-for-wordpress

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

Spacing +4 added lines, -4 removed lines

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

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

Spacing +6 added lines, -6 removed lines

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

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

Indentation +149 added lines, -149 removed lines

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

Spacing +30 added lines, -30 removed lines

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

includes/frontend/tracking/index.php

Spacing +1 added lines, -1 removed lines

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

includes/frontend/class-tracking-abstract.php

Indentation +1 added lines, -1 removed lines

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

Spacing +1 added lines, -1 removed lines

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

includes/frontend/index.php

Spacing +1 added lines, -1 removed lines

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

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

Indentation +130 added lines, -130 removed lines

@@ -11,139 +11,139 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 
 class MonsterInsights_Events_JS {
 
-	/**
-	 * Holds the base class object.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var object $base Base class object.
-	 */
-	public $base;
+  /**
+   * Holds the base class object.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var object $base Base class object.
+   */
+  public $base;
 	
-	/**
-	 * Holds the name of the events type.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $name Name of the events type.
-	 */
-	public $name = 'js';
-
-	/**
-	 * Version of the events class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $version Version of the events class.
-	 */
-	public $version = '1.0.0';
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 */
-	public function __construct() {
-		$this->base     = MonsterInsights();
-		$tracking       = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-		$events         = monsterinsights_get_option( 'events_mode', false );
-		if ( $events === 'js' && $tracking === 'analytics' ) {
-			add_action( 'wp_enqueue_scripts', array( $this, 'output_javascript' ), 9 ); 
-			//add_action( 'login_head', array( $this, 'output_javascript' ), 9 );
-		}
-	}
-
-	/**
-	 * Outputs the Javascript for JS tracking on the page.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @return string
-	 */
-	public function output_javascript() {
-		// What should we track downloads as?
-		$track_download_as = monsterinsights_get_option( 'track_download_as', '' );
-		$track_download_as = $track_download_as === 'pageview' ? 'pageview' : 'event';
-
-		// What label should be used for internal links?
-		$internal_label = monsterinsights_get_option( 'track_internal_as_label', 'int' );
-		if ( ! empty( $internal_label ) && is_string( $internal_label ) ) {
-			$internal_label = trim( $internal_label, ',' );
-			$internal_label = trim( $internal_label );
-		}
-
-		// If the label is empty, set a default value
-		if ( empty( $internal_label ) ) {
-			$internal_label = 'int';
-		}
-
-		$internal_label = esc_js( $internal_label );
-
-		// Get inbound as outbound to track
-		$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 ) );
-			$i++;
-		}
-
-		$inbound_paths = implode( ",", $inbound_paths );
-
-		// Get download extensions to track
-		$download_extensions = monsterinsights_get_option( 'extensions_of_files', '' );
-		$download_extensions = explode( ',', str_replace( '.', '', $download_extensions ) );
-		if ( ! is_array( $download_extensions ) ) {
-			$download_extensions = array( $download_extensions );
-		}
-		$i = 0;
-		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();
-		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$is_debug_mode = 'true';
-		} else {
-			$is_debug_mode = 'false';
-		}
-
-		$hash_tracking = monsterinsights_get_option( 'hash_tracking', false ) ? 'true' : 'false';
-
-		$suffix = ( defined( 'WP_DEBUG' ) && WP_DEBUG ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-		if ( ! file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'assets/js/frontend.min.js' ) ) {
-			$suffix = '';
-		}
-		wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script', plugins_url( 'assets/js/frontend' . $suffix . '.js', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version(), false );
-		wp_localize_script(
-			MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script',
-			'monsterinsights_frontend',
-			array(
-				'js_events_tracking'  => 'true',
-				'is_debug_mode' 	  => $is_debug_mode,
-				'download_extensions' => $download_extensions, /* Let's get the extensions to track */
-				'inbound_paths'       => $inbound_paths, /* Let's get the internal paths to track */
-				'home_url'            => home_url(), /* Let's get the url to compare for external/internal use */
-				'track_download_as'   => $track_download_as, /* should downloads be tracked as events or pageviews */
-				'internal_label'      => $internal_label, /* What is the prefix for internal-as-external links */
-				'hash_tracking'       => $hash_tracking, /* Should hash track */
-			)
-		);
-	}
+  /**
+   * Holds the name of the events type.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var string $name Name of the events type.
+   */
+  public $name = 'js';
+
+  /**
+   * Version of the events class.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var string $version Version of the events class.
+   */
+  public $version = '1.0.0';
+
+  /**
+   * Primary class constructor.
+   *
+   * @since 6.0.0
+   * @access public
+   */
+  public function __construct() {
+    $this->base     = MonsterInsights();
+    $tracking       = monsterinsights_get_option( 'tracking_mode', 'analytics' );
+    $events         = monsterinsights_get_option( 'events_mode', false );
+    if ( $events === 'js' && $tracking === 'analytics' ) {
+      add_action( 'wp_enqueue_scripts', array( $this, 'output_javascript' ), 9 ); 
+      //add_action( 'login_head', array( $this, 'output_javascript' ), 9 );
+    }
+  }
+
+  /**
+   * Outputs the Javascript for JS tracking on the page.
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @return string
+   */
+  public function output_javascript() {
+    // What should we track downloads as?
+    $track_download_as = monsterinsights_get_option( 'track_download_as', '' );
+    $track_download_as = $track_download_as === 'pageview' ? 'pageview' : 'event';
+
+    // What label should be used for internal links?
+    $internal_label = monsterinsights_get_option( 'track_internal_as_label', 'int' );
+    if ( ! empty( $internal_label ) && is_string( $internal_label ) ) {
+      $internal_label = trim( $internal_label, ',' );
+      $internal_label = trim( $internal_label );
+    }
+
+    // If the label is empty, set a default value
+    if ( empty( $internal_label ) ) {
+      $internal_label = 'int';
+    }
+
+    $internal_label = esc_js( $internal_label );
+
+    // Get inbound as outbound to track
+    $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 ) );
+      $i++;
+    }
+
+    $inbound_paths = implode( ",", $inbound_paths );
+
+    // Get download extensions to track
+    $download_extensions = monsterinsights_get_option( 'extensions_of_files', '' );
+    $download_extensions = explode( ',', str_replace( '.', '', $download_extensions ) );
+    if ( ! is_array( $download_extensions ) ) {
+      $download_extensions = array( $download_extensions );
+    }
+    $i = 0;
+    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();
+    if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
+      $is_debug_mode = 'true';
+    } else {
+      $is_debug_mode = 'false';
+    }
+
+    $hash_tracking = monsterinsights_get_option( 'hash_tracking', false ) ? 'true' : 'false';
+
+    $suffix = ( defined( 'WP_DEBUG' ) && WP_DEBUG ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+    if ( ! file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'assets/js/frontend.min.js' ) ) {
+      $suffix = '';
+    }
+    wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script', plugins_url( 'assets/js/frontend' . $suffix . '.js', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version(), false );
+    wp_localize_script(
+      MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script',
+      'monsterinsights_frontend',
+      array(
+        'js_events_tracking'  => 'true',
+        'is_debug_mode' 	  => $is_debug_mode,
+        'download_extensions' => $download_extensions, /* Let's get the extensions to track */
+        'inbound_paths'       => $inbound_paths, /* Let's get the internal paths to track */
+        'home_url'            => home_url(), /* Let's get the url to compare for external/internal use */
+        'track_download_as'   => $track_download_as, /* should downloads be tracked as events or pageviews */
+        'internal_label'      => $internal_label, /* What is the prefix for internal-as-external links */
+        'hash_tracking'       => $hash_tracking, /* Should hash track */
+      )
+    );
+  }
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,10 +54,10 @@ 
 	 */
 	public function __construct() {
 		$this->base     = MonsterInsights();
-		$tracking       = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-		$events         = monsterinsights_get_option( 'events_mode', false );
-		if ( $events === 'js' && $tracking === 'analytics' ) {
-			add_action( 'wp_enqueue_scripts', array( $this, 'output_javascript' ), 9 ); 
+		$tracking       = monsterinsights_get_option('tracking_mode', 'analytics');
+		$events         = monsterinsights_get_option('events_mode', false);
+		if ($events === 'js' && $tracking === 'analytics') {
+			add_action('wp_enqueue_scripts', array($this, 'output_javascript'), 9); 
 			//add_action( 'login_head', array( $this, 'output_javascript' ), 9 );
 		}
 	}
@@ -72,65 +72,65 @@ 
 	 */
 	public function output_javascript() {
 		// What should we track downloads as?
-		$track_download_as = monsterinsights_get_option( 'track_download_as', '' );
+		$track_download_as = monsterinsights_get_option('track_download_as', '');
 		$track_download_as = $track_download_as === 'pageview' ? 'pageview' : 'event';
 
 		// What label should be used for internal links?
-		$internal_label = monsterinsights_get_option( 'track_internal_as_label', 'int' );
-		if ( ! empty( $internal_label ) && is_string( $internal_label ) ) {
-			$internal_label = trim( $internal_label, ',' );
-			$internal_label = trim( $internal_label );
+		$internal_label = monsterinsights_get_option('track_internal_as_label', 'int');
+		if ( ! empty($internal_label) && is_string($internal_label)) {
+			$internal_label = trim($internal_label, ',');
+			$internal_label = trim($internal_label);
 		}
 
 		// If the label is empty, set a default value
-		if ( empty( $internal_label ) ) {
+		if (empty($internal_label)) {
 			$internal_label = 'int';
 		}
 
-		$internal_label = esc_js( $internal_label );
+		$internal_label = esc_js($internal_label);
 
 		// Get inbound as outbound to track
-		$inbound_paths = monsterinsights_get_option( 'track_internal_as_outbound','' );
-		$inbound_paths = explode( ',', $inbound_paths );
-		if ( ! is_array( $inbound_paths ) ) {
-			$inbound_paths = array( $inbound_paths );
+		$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++;
 		}
 
-		$inbound_paths = implode( ",", $inbound_paths );
+		$inbound_paths = implode(",", $inbound_paths);
 
 		// Get download extensions to track
-		$download_extensions = monsterinsights_get_option( 'extensions_of_files', '' );
-		$download_extensions = explode( ',', str_replace( '.', '', $download_extensions ) );
-		if ( ! is_array( $download_extensions ) ) {
-			$download_extensions = array( $download_extensions );
+		$download_extensions = monsterinsights_get_option('extensions_of_files', '');
+		$download_extensions = explode(',', str_replace('.', '', $download_extensions));
+		if ( ! is_array($download_extensions)) {
+			$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 );
+		$download_extensions = implode(",", $download_extensions);
 
-		$is_debug_mode     =  monsterinsights_is_debug_mode();
-		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
+		$is_debug_mode = monsterinsights_is_debug_mode();
+		if (current_user_can('manage_options') && $is_debug_mode) {
 			$is_debug_mode = 'true';
 		} else {
 			$is_debug_mode = 'false';
 		}
 
-		$hash_tracking = monsterinsights_get_option( 'hash_tracking', false ) ? 'true' : 'false';
+		$hash_tracking = monsterinsights_get_option('hash_tracking', false) ? 'true' : 'false';
 
-		$suffix = ( defined( 'WP_DEBUG' ) && WP_DEBUG ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-		if ( ! file_exists( MONSTERINSIGHTS_PLUGIN_DIR . 'assets/js/frontend.min.js' ) ) {
+		$suffix = (defined('WP_DEBUG') && WP_DEBUG) || (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
+		if ( ! file_exists(MONSTERINSIGHTS_PLUGIN_DIR . 'assets/js/frontend.min.js')) {
 			$suffix = '';
 		}
-		wp_enqueue_script( MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script', plugins_url( 'assets/js/frontend' . $suffix . '.js', MONSTERINSIGHTS_PLUGIN_FILE ), array(), monsterinsights_get_asset_version(), false );
+		wp_enqueue_script(MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script', plugins_url('assets/js/frontend' . $suffix . '.js', MONSTERINSIGHTS_PLUGIN_FILE), array(), monsterinsights_get_asset_version(), false);
 		wp_localize_script(
 			MONSTERINSIGHTS_PLUGIN_SLUG . '-frontend-script',
 			'monsterinsights_frontend',

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

Indentation +402 added lines, -402 removed lines

@@ -11,411 +11,411 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 
 class MonsterInsights_Events_PHP {
 
-	/**
-	 * Holds the base class object.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var object $base Base class object.
-	 */
-	public $base;
+  /**
+   * Holds the base class object.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var object $base Base class object.
+   */
+  public $base;
 	
-	/**
-	 * Holds the name of the events type.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $name Name of the events type.
-	 */
-	public $name = 'php';
-
-	/**
-	 * Version of the events class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $version Version of the events class.
-	 */
-	public $version = '1.0.0';
-
-	/**
-	 * Holds the name of the tracking type.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $name Name of the tracking type.
-	 */
-	public $tracking = 'ga';
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 */
-	public function __construct() {
-		$this->base     = MonsterInsights();
-		$this->tracking = monsterinsights_get_option( 'tracking_mode', false );
-		$events = monsterinsights_get_option( 'events_mode', false );
-
-		if ( $events === 'php' && ( $this->tracking === 'ga' || $this->tracking === 'analytics' ) ) {
-			require_once plugin_dir_path( $this->base->file ) . 'includes/frontend/events/class-link.php';
-			add_filter( 'the_content', array( $this, 'the_content' ), 99 );
-			add_filter( 'the_excerpt', array( $this, 'the_content' ), 99 );
-			add_filter( 'widget_text', array( $this, 'widget_content' ), 99 );
-			add_filter( 'wp_list_bookmarks', array( $this, 'widget_content' ), 99 );
-			add_filter( 'comment_text', array( $this, 'comment_text' ), 99 );
-			add_filter( 'wp_nav_menu', array( $this, 'nav_menu' ), 99 );
-		}
-	}
-
-	/**
-	 * Get the regular expression used in ga.js and analytics.js PHP tracking to detect links
-	 *
-	 * @since 6.0.0
-	 * @access protected
-	 *
-	 * @todo If we don't remove this soon, it'd be far superior to use a real DOM parser.
-	 * 
-	 * @return string
-	 */
-	protected function get_link_regex() {
-		return '/'
-			   . '<a'               // matches the characters <a literally
-			   . '\s'				// Match any sort of whitespace
-			   . '([^>]*)'          // 1. match a single character not present in the list (Between 0 and * times)
-			   . '\s'               // match any white space character
-			   . 'href='            // matches the characters href= literally
-			   . '([\'\"])'         // 2. match a single or a double quote
-			   . '('                // 3. matches the link protocol (between 0 and 1 times)
-			   .   '([a-zA-Z]+)'    // 4. matches the link protocol name
-			   .   ':'              // matches the character : literally
-			   .   '(?:\/\/)??'     // matches the characters
-			   .  ')??'             // literally (between 0 and 1 times)
-			   .  '(.*)'            // 5. matches any character (except newline) (Between 0 and * times)
-			   .  '\2'              // matches the same quote (2nd capturing group) as was used to open the href value
-			   .  '([^>]*)'         // 6. match a single character not present in the list below
-			   . '>'                // 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
-	}
-
-
-	/**
-	 * Parse the_content or the_excerpt for links
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param string $text Text to parse
-	 *
-	 * @return string The resulting content.
-	 */
-	public function the_content( $text ) {
-		if ( ! is_feed() ) {
-			$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_article_link' ), $text );
-		}
-		return $text;
-	}
-
-	/**
-	 * Parse article link
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param array $matches The matches for links within the content
-	 *
-	 * @return string The parsed link string.
-	 */
-	public function parse_article_link( $matches ) {
-		return $this->parse_link( 'outbound-article', $matches );
-	}
-
-	/**
-	 * Parse the widget content for links
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param string $text The text to parse.
-	 *
-	 * @return string The resulting content.
-	 */
-	public function widget_content( $text ) {
-		$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_widget_link' ), $text );
-		return $text;
-	}
-
-	/**
-	 * Parse widget link
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param array $matches The matches for links within the content
-	 *
-	 * @return string The parsed link string.
-	 */
-	public function parse_widget_link( $matches ) {
-		return $this->parse_link( 'outbound-widget', $matches );
-	}
-
-	/**
-	 * Parse the nav menu content for links
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param string $text The text to parse.
-	 *
-	 * @return string The resulting content.
-	 */
-	public function nav_menu( $text ) {
-		$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_nav_menu_link' ), $text );
-		return $text;
-	}
-
-	/**
-	 * Parse nav menu link
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param array $matches The matches for links within the content
-	 *
-	 * @return string The parsed link string.
-	 */
-	public function parse_nav_menu_link( $matches ) {
-		return $this->parse_link( 'outbound-menu', $matches );
-	}
-
-	/**
-	 * Parse comment text for links
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param string $text The text to parse.
-	 *
-	 * @return string The resulting content.
-	 */
-	public function comment_text( $text ) {
-		if ( ! is_feed() ) {
-			$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_comment_link' ), $text );
-		}
-
-		return $text;
-	}
-
-	/**
-	 * Parse comment link
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param array $matches The matches for links within the content
-	 *
-	 * @return string The parsed link string.
-	 */
-	public function parse_comment_link( $matches ) {
-		return $this->parse_link( 'outbound-comment', $matches );
-	}
-
-
-	/**
-	 * Merge the existing onclick with a new one and append it
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param string $link_attribute The new onclick value to append.
-	 * @param string $onclick The existing onclick value.
-	 *
-	 * @return string The resulting link attribute for onclick.
-	 */
-	public function output_add_onclick( $link_attribute, $onclick ) {
-		if ( preg_match( '/onclick=[\'\"](.*?;)[\'\"]/i', $link_attribute, $matches ) > 0 && is_string( $onclick ) ) {
-			$onclick_with_double = str_replace( "'", '"', $onclick );
-			$js_snippet_single = 'onclick=\'' . $matches[1] . ' ' . $onclick_with_double . '\'';
-			$js_snippet_double = 'onclick="' . $matches[1] . ' ' . $onclick . '"';
-
-			$link_attribute = str_replace( 'onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute );
-			$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
-			$onclick_with_double = str_replace( "'", '"', $onclick );
-			if ( strlen( trim ( $matches[1] ) ) > 0 ) {
-				$js_snippet_single = 'onclick=\'' . $matches[1] . '; ' . $onclick_with_double . '\'';
-				$js_snippet_double = 'onclick="' . $matches[1] . '; ' . $onclick . '"';
-			} else {
-				$js_snippet_single = 'onclick=\'' . $matches[1] . ' ' . $onclick_with_double . '\'';
-				$js_snippet_double = 'onclick="' . $matches[1] . ' ' . $onclick . '"';				
-			}
-
-			$link_attribute = str_replace( 'onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute );
-			$link_attribute = str_replace( "onclick='" . $matches[1] . "'", $js_snippet_single, $link_attribute );
-
-			return $link_attribute;
-		} else {
-			if ( ! empty( $onclick ) && is_string( $onclick ) ) {
-				return 'onclick="' . $onclick . '" ' . $link_attribute;
-			} else {
-				return $link_attribute;
-			}
-		}
-	}
-
-	/**
-	 * Generate the full URL.
-	 * 
-	 * Takes an existing link that's missing it's protocol
-	 * and pre-pends the protocol to it.
-	 * 
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @param MonsterInsights_Link $link The protocol-less link.
-	 *
-	 * @return string The resulting link (with pre-pended protocol).
-	 */
-	public function make_full_url( $link ) {
-		$protocol = '';
-		switch ( $link->type ) {
-			case 'download':
-			case 'internal':
-			case 'internal-as-outbound':
-			case 'outbound':
-				$protocol = ! empty( $link->protocol ) ? $link->protocol . '://' : '';
-				break;
-			case 'email':
-				$protocol = 'mailto:';
-				break;
-		}
-
-		return $protocol . $link->original_url;
-	}
-
-	/**
-	 * Get the output tracking link
-	 *
-	 * @since 6.0.0
-	 * @access protected
-	 * 
-	 * @param string $category The category of the link (ex: outbound-widget).
-	 * @param array  $matches The matches found for links within the content.
-	 *
-	 * @return string The resulting link.
-	 */
-	protected function parse_link( $category, $matches ) {
-		return $this->output_parse_link( $category, new MonsterInsights_Link( $this->base, $category, $matches ) );
-	}
-
-	/**
-	 * Trims the track_internal_as_label option to prevent commas and whitespaces.
-	 *
-	 * @since 6.0.0
-	 * @access protected
-	 * 
-	 * @return string The internal label to use.
-	 */
-	protected function sanitize_internal_label() {
-		$label = monsterinsights_get_option( 'track_internal_as_label', '' );
-		if ( ! empty( $label ) && is_string( $label ) ) {
-			$label = trim( $label, ',' );
-			$label = trim( $label );
-		}
-
-		// If the label is empty, set a default value
-		if ( empty( $label ) ) {
-			$label = 'int';
-		}
-
-		return $label;
-	}
-
-	/**
-	 * Create the event tracking link.
-	 *
-	 * @since 6.0.0
-	 * @access protected
-	 * 
-	 * @param string               $category The category of the label (ex: outbound-widget ).
-	 * @param MonsterInsights_Link $link_target The link object we're working on.
-	 *
-	 * @return string The resultant new <a> tag to use.
-	 */
-	protected function output_parse_link( $category, $link_target ) {
-		$object_name = '__gaTracker'; // $this->tracking === 'analytics'
-		if ( $this->tracking === 'ga' ) {
-			$object_name = '_gaq.push';
-		}
-
-		// bail early for links that we can't handle
-		if ( $link_target->type === 'internal' ) {
-			return $link_target->hyperlink;
-		}
-
-		$onclick  = null;
-		$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' ) {
-						$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' ) {
-						$onclick = $object_name . "('send', 'pageview', '" . esc_js( $full_url ) . "');";
-					} else {
-						$onclick = $object_name . "('send', 'event', 'download', '" . esc_js( $full_url ) . "');";
-					}
-				}
-				break;
-			case 'email':
-				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' ){ 
-					$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 ) ) . "');";
-				}
-				break;
-			case 'outbound':
-				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 ) ) . "');";
-				}
-				break;
-		}
-
-		$link_target->link_attributes = $this->output_add_onclick( $link_target->link_attributes, $onclick );
-
-		if ( ! empty( $link_target->link_attributes ) ) {
-			return '<a href="' . $full_url . '" ' . trim( $link_target->link_attributes ) . '>' . $link_target->link_text . '</a>';
-		}
-
-		return '<a href="' . $full_url . '">' . $link_target->link_text . '</a>';
-	}
+  /**
+   * Holds the name of the events type.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var string $name Name of the events type.
+   */
+  public $name = 'php';
+
+  /**
+   * Version of the events class.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var string $version Version of the events class.
+   */
+  public $version = '1.0.0';
+
+  /**
+   * Holds the name of the tracking type.
+   *
+   * @since 6.0.0
+   * @access public
+   *
+   * @var string $name Name of the tracking type.
+   */
+  public $tracking = 'ga';
+
+  /**
+   * Primary class constructor.
+   *
+   * @since 6.0.0
+   * @access public
+   */
+  public function __construct() {
+    $this->base     = MonsterInsights();
+    $this->tracking = monsterinsights_get_option( 'tracking_mode', false );
+    $events = monsterinsights_get_option( 'events_mode', false );
+
+    if ( $events === 'php' && ( $this->tracking === 'ga' || $this->tracking === 'analytics' ) ) {
+      require_once plugin_dir_path( $this->base->file ) . 'includes/frontend/events/class-link.php';
+      add_filter( 'the_content', array( $this, 'the_content' ), 99 );
+      add_filter( 'the_excerpt', array( $this, 'the_content' ), 99 );
+      add_filter( 'widget_text', array( $this, 'widget_content' ), 99 );
+      add_filter( 'wp_list_bookmarks', array( $this, 'widget_content' ), 99 );
+      add_filter( 'comment_text', array( $this, 'comment_text' ), 99 );
+      add_filter( 'wp_nav_menu', array( $this, 'nav_menu' ), 99 );
+    }
+  }
+
+  /**
+   * Get the regular expression used in ga.js and analytics.js PHP tracking to detect links
+   *
+   * @since 6.0.0
+   * @access protected
+   *
+   * @todo If we don't remove this soon, it'd be far superior to use a real DOM parser.
+   * 
+   * @return string
+   */
+  protected function get_link_regex() {
+    return '/'
+          . '<a'               // matches the characters <a literally
+          . '\s'				// Match any sort of whitespace
+          . '([^>]*)'          // 1. match a single character not present in the list (Between 0 and * times)
+          . '\s'               // match any white space character
+          . 'href='            // matches the characters href= literally
+          . '([\'\"])'         // 2. match a single or a double quote
+          . '('                // 3. matches the link protocol (between 0 and 1 times)
+          .   '([a-zA-Z]+)'    // 4. matches the link protocol name
+          .   ':'              // matches the character : literally
+          .   '(?:\/\/)??'     // matches the characters
+          .  ')??'             // literally (between 0 and 1 times)
+          .  '(.*)'            // 5. matches any character (except newline) (Between 0 and * times)
+          .  '\2'              // matches the same quote (2nd capturing group) as was used to open the href value
+          .  '([^>]*)'         // 6. match a single character not present in the list below
+          . '>'                // 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
+  }
+
+
+  /**
+   * Parse the_content or the_excerpt for links
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param string $text Text to parse
+   *
+   * @return string The resulting content.
+   */
+  public function the_content( $text ) {
+    if ( ! is_feed() ) {
+      $text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_article_link' ), $text );
+    }
+    return $text;
+  }
+
+  /**
+   * Parse article link
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param array $matches The matches for links within the content
+   *
+   * @return string The parsed link string.
+   */
+  public function parse_article_link( $matches ) {
+    return $this->parse_link( 'outbound-article', $matches );
+  }
+
+  /**
+   * Parse the widget content for links
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param string $text The text to parse.
+   *
+   * @return string The resulting content.
+   */
+  public function widget_content( $text ) {
+    $text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_widget_link' ), $text );
+    return $text;
+  }
+
+  /**
+   * Parse widget link
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param array $matches The matches for links within the content
+   *
+   * @return string The parsed link string.
+   */
+  public function parse_widget_link( $matches ) {
+    return $this->parse_link( 'outbound-widget', $matches );
+  }
+
+  /**
+   * Parse the nav menu content for links
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param string $text The text to parse.
+   *
+   * @return string The resulting content.
+   */
+  public function nav_menu( $text ) {
+    $text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_nav_menu_link' ), $text );
+    return $text;
+  }
+
+  /**
+   * Parse nav menu link
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param array $matches The matches for links within the content
+   *
+   * @return string The parsed link string.
+   */
+  public function parse_nav_menu_link( $matches ) {
+    return $this->parse_link( 'outbound-menu', $matches );
+  }
+
+  /**
+   * Parse comment text for links
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param string $text The text to parse.
+   *
+   * @return string The resulting content.
+   */
+  public function comment_text( $text ) {
+    if ( ! is_feed() ) {
+      $text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_comment_link' ), $text );
+    }
+
+    return $text;
+  }
+
+  /**
+   * Parse comment link
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param array $matches The matches for links within the content
+   *
+   * @return string The parsed link string.
+   */
+  public function parse_comment_link( $matches ) {
+    return $this->parse_link( 'outbound-comment', $matches );
+  }
+
+
+  /**
+   * Merge the existing onclick with a new one and append it
+   *
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param string $link_attribute The new onclick value to append.
+   * @param string $onclick The existing onclick value.
+   *
+   * @return string The resulting link attribute for onclick.
+   */
+  public function output_add_onclick( $link_attribute, $onclick ) {
+    if ( preg_match( '/onclick=[\'\"](.*?;)[\'\"]/i', $link_attribute, $matches ) > 0 && is_string( $onclick ) ) {
+      $onclick_with_double = str_replace( "'", '"', $onclick );
+      $js_snippet_single = 'onclick=\'' . $matches[1] . ' ' . $onclick_with_double . '\'';
+      $js_snippet_double = 'onclick="' . $matches[1] . ' ' . $onclick . '"';
+
+      $link_attribute = str_replace( 'onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute );
+      $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
+      $onclick_with_double = str_replace( "'", '"', $onclick );
+      if ( strlen( trim ( $matches[1] ) ) > 0 ) {
+        $js_snippet_single = 'onclick=\'' . $matches[1] . '; ' . $onclick_with_double . '\'';
+        $js_snippet_double = 'onclick="' . $matches[1] . '; ' . $onclick . '"';
+      } else {
+        $js_snippet_single = 'onclick=\'' . $matches[1] . ' ' . $onclick_with_double . '\'';
+        $js_snippet_double = 'onclick="' . $matches[1] . ' ' . $onclick . '"';				
+      }
+
+      $link_attribute = str_replace( 'onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute );
+      $link_attribute = str_replace( "onclick='" . $matches[1] . "'", $js_snippet_single, $link_attribute );
+
+      return $link_attribute;
+    } else {
+      if ( ! empty( $onclick ) && is_string( $onclick ) ) {
+        return 'onclick="' . $onclick . '" ' . $link_attribute;
+      } else {
+        return $link_attribute;
+      }
+    }
+  }
+
+  /**
+   * Generate the full URL.
+   * 
+   * Takes an existing link that's missing it's protocol
+   * and pre-pends the protocol to it.
+   * 
+   * @since 6.0.0
+   * @access public
+   * 
+   * @param MonsterInsights_Link $link The protocol-less link.
+   *
+   * @return string The resulting link (with pre-pended protocol).
+   */
+  public function make_full_url( $link ) {
+    $protocol = '';
+    switch ( $link->type ) {
+      case 'download':
+      case 'internal':
+      case 'internal-as-outbound':
+      case 'outbound':
+        $protocol = ! empty( $link->protocol ) ? $link->protocol . '://' : '';
+        break;
+      case 'email':
+        $protocol = 'mailto:';
+        break;
+    }
+
+    return $protocol . $link->original_url;
+  }
+
+  /**
+   * Get the output tracking link
+   *
+   * @since 6.0.0
+   * @access protected
+   * 
+   * @param string $category The category of the link (ex: outbound-widget).
+   * @param array  $matches The matches found for links within the content.
+   *
+   * @return string The resulting link.
+   */
+  protected function parse_link( $category, $matches ) {
+    return $this->output_parse_link( $category, new MonsterInsights_Link( $this->base, $category, $matches ) );
+  }
+
+  /**
+   * Trims the track_internal_as_label option to prevent commas and whitespaces.
+   *
+   * @since 6.0.0
+   * @access protected
+   * 
+   * @return string The internal label to use.
+   */
+  protected function sanitize_internal_label() {
+    $label = monsterinsights_get_option( 'track_internal_as_label', '' );
+    if ( ! empty( $label ) && is_string( $label ) ) {
+      $label = trim( $label, ',' );
+      $label = trim( $label );
+    }
+
+    // If the label is empty, set a default value
+    if ( empty( $label ) ) {
+      $label = 'int';
+    }
+
+    return $label;
+  }
+
+  /**
+   * Create the event tracking link.
+   *
+   * @since 6.0.0
+   * @access protected
+   * 
+   * @param string               $category The category of the label (ex: outbound-widget ).
+   * @param MonsterInsights_Link $link_target The link object we're working on.
+   *
+   * @return string The resultant new <a> tag to use.
+   */
+  protected function output_parse_link( $category, $link_target ) {
+    $object_name = '__gaTracker'; // $this->tracking === 'analytics'
+    if ( $this->tracking === 'ga' ) {
+      $object_name = '_gaq.push';
+    }
+
+    // bail early for links that we can't handle
+    if ( $link_target->type === 'internal' ) {
+      return $link_target->hyperlink;
+    }
+
+    $onclick  = null;
+    $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' ) {
+            $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' ) {
+            $onclick = $object_name . "('send', 'pageview', '" . esc_js( $full_url ) . "');";
+          } else {
+            $onclick = $object_name . "('send', 'event', 'download', '" . esc_js( $full_url ) . "');";
+          }
+        }
+        break;
+      case 'email':
+        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' ){ 
+          $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 ) ) . "');";
+        }
+        break;
+      case 'outbound':
+        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 ) ) . "');";
+        }
+        break;
+    }
+
+    $link_target->link_attributes = $this->output_add_onclick( $link_target->link_attributes, $onclick );
+
+    if ( ! empty( $link_target->link_attributes ) ) {
+      return '<a href="' . $full_url . '" ' . trim( $link_target->link_attributes ) . '>' . $link_target->link_text . '</a>';
+    }
+
+    return '<a href="' . $full_url . '">' . $link_target->link_text . '</a>';
+  }
 }
\ No newline at end of file

Spacing +76 added lines, -76 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -64,17 +64,17 @@ 
 	 */
 	public function __construct() {
 		$this->base     = MonsterInsights();
-		$this->tracking = monsterinsights_get_option( 'tracking_mode', false );
-		$events = monsterinsights_get_option( 'events_mode', false );
-
-		if ( $events === 'php' && ( $this->tracking === 'ga' || $this->tracking === 'analytics' ) ) {
-			require_once plugin_dir_path( $this->base->file ) . 'includes/frontend/events/class-link.php';
-			add_filter( 'the_content', array( $this, 'the_content' ), 99 );
-			add_filter( 'the_excerpt', array( $this, 'the_content' ), 99 );
-			add_filter( 'widget_text', array( $this, 'widget_content' ), 99 );
-			add_filter( 'wp_list_bookmarks', array( $this, 'widget_content' ), 99 );
-			add_filter( 'comment_text', array( $this, 'comment_text' ), 99 );
-			add_filter( 'wp_nav_menu', array( $this, 'nav_menu' ), 99 );
+		$this->tracking = monsterinsights_get_option('tracking_mode', false);
+		$events = monsterinsights_get_option('events_mode', false);
+
+		if ($events === 'php' && ($this->tracking === 'ga' || $this->tracking === 'analytics')) {
+			require_once plugin_dir_path($this->base->file) . 'includes/frontend/events/class-link.php';
+			add_filter('the_content', array($this, 'the_content'), 99);
+			add_filter('the_excerpt', array($this, 'the_content'), 99);
+			add_filter('widget_text', array($this, 'widget_content'), 99);
+			add_filter('wp_list_bookmarks', array($this, 'widget_content'), 99);
+			add_filter('comment_text', array($this, 'comment_text'), 99);
+			add_filter('wp_nav_menu', array($this, 'nav_menu'), 99);
 		}
 	}
 
@@ -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
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 *
 	 * @return string The resulting content.
 	 */
-	public function the_content( $text ) {
-		if ( ! is_feed() ) {
-			$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_article_link' ), $text );
+	public function the_content($text) {
+		if ( ! is_feed()) {
+			$text = preg_replace_callback($this->get_link_regex(), array($this, 'parse_article_link'), $text);
 		}
 		return $text;
 	}
@@ -138,8 +138,8 @@ 
 	 *
 	 * @return string The parsed link string.
 	 */
-	public function parse_article_link( $matches ) {
-		return $this->parse_link( 'outbound-article', $matches );
+	public function parse_article_link($matches) {
+		return $this->parse_link('outbound-article', $matches);
 	}
 
 	/**
@@ -152,8 +152,8 @@ 
 	 *
 	 * @return string The resulting content.
 	 */
-	public function widget_content( $text ) {
-		$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_widget_link' ), $text );
+	public function widget_content($text) {
+		$text = preg_replace_callback($this->get_link_regex(), array($this, 'parse_widget_link'), $text);
 		return $text;
 	}
 
@@ -167,8 +167,8 @@ 
 	 *
 	 * @return string The parsed link string.
 	 */
-	public function parse_widget_link( $matches ) {
-		return $this->parse_link( 'outbound-widget', $matches );
+	public function parse_widget_link($matches) {
+		return $this->parse_link('outbound-widget', $matches);
 	}
 
 	/**
@@ -181,8 +181,8 @@ 
 	 *
 	 * @return string The resulting content.
 	 */
-	public function nav_menu( $text ) {
-		$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_nav_menu_link' ), $text );
+	public function nav_menu($text) {
+		$text = preg_replace_callback($this->get_link_regex(), array($this, 'parse_nav_menu_link'), $text);
 		return $text;
 	}
 
@@ -196,8 +196,8 @@ 
 	 *
 	 * @return string The parsed link string.
 	 */
-	public function parse_nav_menu_link( $matches ) {
-		return $this->parse_link( 'outbound-menu', $matches );
+	public function parse_nav_menu_link($matches) {
+		return $this->parse_link('outbound-menu', $matches);
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 *
 	 * @return string The resulting content.
 	 */
-	public function comment_text( $text ) {
-		if ( ! is_feed() ) {
-			$text = preg_replace_callback( $this->get_link_regex(), array( $this, 'parse_comment_link' ), $text );
+	public function comment_text($text) {
+		if ( ! is_feed()) {
+			$text = preg_replace_callback($this->get_link_regex(), array($this, 'parse_comment_link'), $text);
 		}
 
 		return $text;
@@ -228,8 +228,8 @@ 
 	 *
 	 * @return string The parsed link string.
 	 */
-	public function parse_comment_link( $matches ) {
-		return $this->parse_link( 'outbound-comment', $matches );
+	public function parse_comment_link($matches) {
+		return $this->parse_link('outbound-comment', $matches);
 	}
 
 
@@ -244,19 +244,19 @@ 
 	 *
 	 * @return string The resulting link attribute for onclick.
 	 */
-	public function output_add_onclick( $link_attribute, $onclick ) {
-		if ( preg_match( '/onclick=[\'\"](.*?;)[\'\"]/i', $link_attribute, $matches ) > 0 && is_string( $onclick ) ) {
-			$onclick_with_double = str_replace( "'", '"', $onclick );
+	public function output_add_onclick($link_attribute, $onclick) {
+		if (preg_match('/onclick=[\'\"](.*?;)[\'\"]/i', $link_attribute, $matches) > 0 && is_string($onclick)) {
+			$onclick_with_double = str_replace("'", '"', $onclick);
 			$js_snippet_single = 'onclick=\'' . $matches[1] . ' ' . $onclick_with_double . '\'';
 			$js_snippet_double = 'onclick="' . $matches[1] . ' ' . $onclick . '"';
 
-			$link_attribute = str_replace( 'onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute );
-			$link_attribute = str_replace( "onclick='" . $matches[1] . "'", $js_snippet_single, $link_attribute );
+			$link_attribute = str_replace('onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute);
+			$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
-			$onclick_with_double = str_replace( "'", '"', $onclick );
-			if ( strlen( trim ( $matches[1] ) ) > 0 ) {
+		} 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 . '\'';
 				$js_snippet_double = 'onclick="' . $matches[1] . '; ' . $onclick . '"';
 			} else {
@@ -264,12 +264,12 @@ 
 				$js_snippet_double = 'onclick="' . $matches[1] . ' ' . $onclick . '"';				
 			}
 
-			$link_attribute = str_replace( 'onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute );
-			$link_attribute = str_replace( "onclick='" . $matches[1] . "'", $js_snippet_single, $link_attribute );
+			$link_attribute = str_replace('onclick="' . $matches[1] . '"', $js_snippet_double, $link_attribute);
+			$link_attribute = str_replace("onclick='" . $matches[1] . "'", $js_snippet_single, $link_attribute);
 
 			return $link_attribute;
 		} else {
-			if ( ! empty( $onclick ) && is_string( $onclick ) ) {
+			if ( ! empty($onclick) && is_string($onclick)) {
 				return 'onclick="' . $onclick . '" ' . $link_attribute;
 			} else {
 				return $link_attribute;
@@ -290,14 +290,14 @@ 
 	 *
 	 * @return string The resulting link (with pre-pended protocol).
 	 */
-	public function make_full_url( $link ) {
+	public function make_full_url($link) {
 		$protocol = '';
-		switch ( $link->type ) {
+		switch ($link->type) {
 			case 'download':
 			case 'internal':
 			case 'internal-as-outbound':
 			case 'outbound':
-				$protocol = ! empty( $link->protocol ) ? $link->protocol . '://' : '';
+				$protocol = ! empty($link->protocol) ? $link->protocol . '://' : '';
 				break;
 			case 'email':
 				$protocol = 'mailto:';
@@ -318,8 +318,8 @@ 
 	 *
 	 * @return string The resulting link.
 	 */
-	protected function parse_link( $category, $matches ) {
-		return $this->output_parse_link( $category, new MonsterInsights_Link( $this->base, $category, $matches ) );
+	protected function parse_link($category, $matches) {
+		return $this->output_parse_link($category, new MonsterInsights_Link($this->base, $category, $matches));
 	}
 
 	/**
@@ -331,14 +331,14 @@ 
 	 * @return string The internal label to use.
 	 */
 	protected function sanitize_internal_label() {
-		$label = monsterinsights_get_option( 'track_internal_as_label', '' );
-		if ( ! empty( $label ) && is_string( $label ) ) {
-			$label = trim( $label, ',' );
-			$label = trim( $label );
+		$label = monsterinsights_get_option('track_internal_as_label', '');
+		if ( ! empty($label) && is_string($label)) {
+			$label = trim($label, ',');
+			$label = trim($label);
 		}
 
 		// If the label is empty, set a default value
-		if ( empty( $label ) ) {
+		if (empty($label)) {
 			$label = 'int';
 		}
 
@@ -356,64 +356,64 @@ 
 	 *
 	 * @return string The resultant new <a> tag to use.
 	 */
-	protected function output_parse_link( $category, $link_target ) {
+	protected function output_parse_link($category, $link_target) {
 		$object_name = '__gaTracker'; // $this->tracking === 'analytics'
-		if ( $this->tracking === 'ga' ) {
+		if ($this->tracking === 'ga') {
 			$object_name = '_gaq.push';
 		}
 
 		// bail early for links that we can't handle
-		if ( $link_target->type === 'internal' ) {
+		if ($link_target->type === 'internal') {
 			return $link_target->hyperlink;
 		}
 
 		$onclick  = null;
-		$full_url = $this->make_full_url( $link_target );
-		switch ( $link_target->type ) {
+		$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' ) {
-						$onclick = $object_name . "(['_trackPageview','download/" . esc_js( $full_url ) . "']);";
+				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 ) . "']);";
+						$onclick = $object_name . "(['_trackEvent','download','" . esc_js($full_url) . "']);";
 					}
 				} else {
-					if ( monsterinsights_get_option('track_download_as', '' ) === 'pageview' ) {
-						$onclick = $object_name . "('send', 'pageview', '" . esc_js( $full_url ) . "');";
+					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 ) . "');";
+						$onclick = $object_name . "('send', 'event', 'download', '" . esc_js($full_url) . "');";
 					}
 				}
 				break;
 			case 'email':
-				if ( $this->tracking === 'ga' ){
-					$onclick = $object_name . "(['_trackEvent','mailto','" . esc_js( $link_target->original_url ) . "']);";
+				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 ) . "');";
+					$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 ) ) . "']);";
+					$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' ){  
-					 $onclick = $object_name . "(['_trackEvent', '" . esc_js( $link_target->category ) . "', '" . esc_js( $full_url ) . "', '" . esc_js( strip_tags( $link_target->link_text ) ) . "']);";
+				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 ) ) . "');";
+					$onclick = $object_name . "('send', 'event', '" . esc_js($link_target->category) . "', '" . esc_js($full_url) . "', '" . esc_js(strip_tags($link_target->link_text)) . "');";
 				}
 				break;
 		}
 
-		$link_target->link_attributes = $this->output_add_onclick( $link_target->link_attributes, $onclick );
+		$link_target->link_attributes = $this->output_add_onclick($link_target->link_attributes, $onclick);
 
-		if ( ! empty( $link_target->link_attributes ) ) {
-			return '<a href="' . $full_url . '" ' . trim( $link_target->link_attributes ) . '>' . $link_target->link_text . '</a>';
+		if ( ! empty($link_target->link_attributes)) {
+			return '<a href="' . $full_url . '" ' . trim($link_target->link_attributes) . '>' . $link_target->link_text . '</a>';
 		}
 
 		return '<a href="' . $full_url . '">' . $link_target->link_text . '</a>';

includes/frontend/events/index.php

Spacing +1 added lines, -1 removed lines

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