awesomemotive / google-analytics-for-wordpress

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

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>';

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

includes/frontend/events/class-link.php

Spacing +22 added lines, -22 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -135,14 +135,14 @@ 
 	 * @param string $category The category of the url (ex: outbound-link).
 	 * @param array  $matches Matches found for the hyperlink.
 	 */
-	public function __construct( $base, $category, $matches ) {
-		$this->base 		   = $base;
+	public function __construct($base, $category, $matches) {
+		$this->base = $base;
 		$this->category        = $category;
 		$this->original_url    = $matches[5];
 		$this->domain          = $this->get_domain();
-		$this->extension       = substr( strrchr( $this->original_url, '.' ), 1 );
+		$this->extension       = substr(strrchr($this->original_url, '.'), 1);
 		$this->host            = $this->domain['host'];
-		$this->link_attributes = trim( $matches[1] . ' ' . $matches[6] );
+		$this->link_attributes = trim($matches[1] . ' ' . $matches[6]);
 		$this->link_text       = $matches[7];
 		$this->hyperlink       = $matches[0];
 		$this->protocol 	   = $matches[4];
@@ -160,17 +160,17 @@ 
 		$hostPattern     = '/^(https?:\/\/)?([^\/]+)/i';
 		$domainPatternUS = '/[^\.\/]+\.[^\.\/]+$/';
 		$domainPatternUK = '/[^\.\/]+\.[^\.\/]+\.[^\.\/]+$/';
-		$matching = preg_match( $hostPattern, $this->original_url, $matches );
-		if ( $matching ) {
+		$matching = preg_match($hostPattern, $this->original_url, $matches);
+		if ($matching) {
 			$host = $matches[2];
-			if ( preg_match( '/.*\..*\..*\..*$/', $host ) ) {
-				preg_match( $domainPatternUK, $host, $matches );
+			if (preg_match('/.*\..*\..*\..*$/', $host)) {
+				preg_match($domainPatternUK, $host, $matches);
 			} else {
-				preg_match( $domainPatternUS, $host, $matches );
+				preg_match($domainPatternUS, $host, $matches);
 			}
 			
-			if ( isset( $matches[0] ) ) {
-				return array( 'domain' => $matches[0], 'host' => $host );
+			if (isset($matches[0])) {
+				return array('domain' => $matches[0], 'host' => $host);
 			}
 		}
 		return false;
@@ -185,14 +185,14 @@ 
 	 * @return string The type of link.
 	 */
 	protected function get_target_type() {
-		$download_extensions = explode( ',', str_replace( '.', '', monsterinsights_get_option( 'extensions_of_files', '' ) ) );
-		$download_extensions = array_map( 'trim', $download_extensions );
+		$download_extensions = explode(',', str_replace('.', '', monsterinsights_get_option('extensions_of_files', '')));
+		$download_extensions = array_map('trim', $download_extensions);
 		$full_url = $this->protocol . '://' . $this->domain['domain'];
-		if ( $this->protocol == 'mailto' ) {
+		if ($this->protocol == 'mailto') {
 			$type = 'email';
-		} else if ( in_array( $this->extension, $download_extensions ) ) {
+		} 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();
@@ -209,11 +209,11 @@ 
 	 * @return string The type of link.
 	 */
 	protected function parse_internal_link_type() {
-		$out_links = explode( ',', monsterinsights_get_option( 'track_internal_as_outbound', '' ) );
-		$out_links = array_unique( array_map( 'trim', $out_links ) );
-		if ( ! empty( $this->original_url ) && count( $out_links ) >= 1 ) {
-			foreach ( $out_links as $out ) {
-				if ( ! empty( $out ) && strpos( $this->original_url, $out ) !== false ) {
+		$out_links = explode(',', monsterinsights_get_option('track_internal_as_outbound', ''));
+		$out_links = array_unique(array_map('trim', $out_links));
+		if ( ! empty($this->original_url) && count($out_links) >= 1) {
+			foreach ($out_links as $out) {
+				if ( ! empty($out) && strpos($this->original_url, $out) !== false) {
 					return 'internal-as-outbound';
 				}
 			}

Indentation +192 added lines, -192 removed lines

@@ -11,213 +11,213 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class MonsterInsights_Link {
-	/**
-	 * 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;
 
-	/**
-	 * The category of the link.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @var string $category Category of the link.
-	 */
-	public $category;
+    /**
+     * The category of the link.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @var string $category Category of the link.
+     */
+    public $category;
 
-	/**
-	 * Get the domain and host. False if empty.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @var array|bool $domain Domain of link.
-	 */
-	public $domain;
+    /**
+     * Get the domain and host. False if empty.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @var array|bool $domain Domain of link.
+     */
+    public $domain;
 
-	/**
-	 * Extension of the url.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @var string $extension File extension in given url.
-	 */
-	public $extension;
+    /**
+     * Extension of the url.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @var string $extension File extension in given url.
+     */
+    public $extension;
 
-	/**
-	 * Host of the URL.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $host Host of given url.
-	 */
-	public $host;
+    /**
+     * Host of the URL.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $host Host of given url.
+     */
+    public $host;
 
-	/**
-	 * The link attributes of the URL.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $link_attributes Link attributes of given hyperlink.
-	 */
-	public $link_attributes;
+    /**
+     * The link attributes of the URL.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $link_attributes Link attributes of given hyperlink.
+     */
+    public $link_attributes;
 
-	/**
-	 * The text of the link.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $link_text Text of given hyperlink.
-	 */
-	public $link_text;
+    /**
+     * The text of the link.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $link_text Text of given hyperlink.
+     */
+    public $link_text;
 
-	/**
-	 * The full url without the protocol.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $original_url The full url without the protocol.
-	 */
-	public $original_url;
+    /**
+     * The full url without the protocol.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $original_url The full url without the protocol.
+     */
+    public $original_url;
 
-	/**
-	 * The protocol of the url.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $protocol The protocol of the link.
-	 */
-	public $protocol;
+    /**
+     * The protocol of the url.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $protocol The protocol of the link.
+     */
+    public $protocol;
 
-	/**
-	 * The type of the URL - for example: internal as outbound, outbound, internal.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $type The type of the link.
-	 */
-	public $type;
+    /**
+     * The type of the URL - for example: internal as outbound, outbound, internal.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $type The type of the link.
+     */
+    public $type;
 
-	/**
-	 * The full hyperlink.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $hyperlink The hyperlink.
-	 */
-	public $hyperlink;
+    /**
+     * The full hyperlink.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $hyperlink The hyperlink.
+     */
+    public $hyperlink;
 
-	/**
-	 * Constructor of the class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @param MonsterInsights $base The base plugin object.
-	 * @param string $category The category of the url (ex: outbound-link).
-	 * @param array  $matches Matches found for the hyperlink.
-	 */
-	public function __construct( $base, $category, $matches ) {
-		$this->base 		   = $base;
-		$this->category        = $category;
-		$this->original_url    = $matches[5];
-		$this->domain          = $this->get_domain();
-		$this->extension       = substr( strrchr( $this->original_url, '.' ), 1 );
-		$this->host            = $this->domain['host'];
-		$this->link_attributes = trim( $matches[1] . ' ' . $matches[6] );
-		$this->link_text       = $matches[7];
-		$this->hyperlink       = $matches[0];
-		$this->protocol 	   = $matches[4];
-		$this->type     	   = $this->get_target_type();
-	}
-	/**
-	 * Parse the domain.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @return array|bool The domain/host of the link.
-	 */
-	public function get_domain() {
-		$hostPattern     = '/^(https?:\/\/)?([^\/]+)/i';
-		$domainPatternUS = '/[^\.\/]+\.[^\.\/]+$/';
-		$domainPatternUK = '/[^\.\/]+\.[^\.\/]+\.[^\.\/]+$/';
-		$matching = preg_match( $hostPattern, $this->original_url, $matches );
-		if ( $matching ) {
-			$host = $matches[2];
-			if ( preg_match( '/.*\..*\..*\..*$/', $host ) ) {
-				preg_match( $domainPatternUK, $host, $matches );
-			} else {
-				preg_match( $domainPatternUS, $host, $matches );
-			}
+    /**
+     * Constructor of the class.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @param MonsterInsights $base The base plugin object.
+     * @param string $category The category of the url (ex: outbound-link).
+     * @param array  $matches Matches found for the hyperlink.
+     */
+    public function __construct( $base, $category, $matches ) {
+        $this->base 		   = $base;
+        $this->category        = $category;
+        $this->original_url    = $matches[5];
+        $this->domain          = $this->get_domain();
+        $this->extension       = substr( strrchr( $this->original_url, '.' ), 1 );
+        $this->host            = $this->domain['host'];
+        $this->link_attributes = trim( $matches[1] . ' ' . $matches[6] );
+        $this->link_text       = $matches[7];
+        $this->hyperlink       = $matches[0];
+        $this->protocol 	   = $matches[4];
+        $this->type     	   = $this->get_target_type();
+    }
+    /**
+     * Parse the domain.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @return array|bool The domain/host of the link.
+     */
+    public function get_domain() {
+        $hostPattern     = '/^(https?:\/\/)?([^\/]+)/i';
+        $domainPatternUS = '/[^\.\/]+\.[^\.\/]+$/';
+        $domainPatternUK = '/[^\.\/]+\.[^\.\/]+\.[^\.\/]+$/';
+        $matching = preg_match( $hostPattern, $this->original_url, $matches );
+        if ( $matching ) {
+            $host = $matches[2];
+            if ( preg_match( '/.*\..*\..*\..*$/', $host ) ) {
+                preg_match( $domainPatternUK, $host, $matches );
+            } else {
+                preg_match( $domainPatternUS, $host, $matches );
+            }
 			
-			if ( isset( $matches[0] ) ) {
-				return array( 'domain' => $matches[0], 'host' => $host );
-			}
-		}
-		return false;
-	}
+            if ( isset( $matches[0] ) ) {
+                return array( 'domain' => $matches[0], 'host' => $host );
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * Getting the type for current target.
-	 *
-	 * @since 6.0.0
-	 * @access protected
-	 * 
-	 * @return string The type of link.
-	 */
-	protected function get_target_type() {
-		$download_extensions = explode( ',', str_replace( '.', '', monsterinsights_get_option( 'extensions_of_files', '' ) ) );
-		$download_extensions = array_map( 'trim', $download_extensions );
-		$full_url = $this->protocol . '://' . $this->domain['domain'];
-		if ( $this->protocol == 'mailto' ) {
-			$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(), '\/' ) ) {
-			$type = 'outbound';
-		} else {
-			$type = $this->parse_internal_link_type();
-		}
-		return $type;
-	}
+    /**
+     * Getting the type for current target.
+     *
+     * @since 6.0.0
+     * @access protected
+     * 
+     * @return string The type of link.
+     */
+    protected function get_target_type() {
+        $download_extensions = explode( ',', str_replace( '.', '', monsterinsights_get_option( 'extensions_of_files', '' ) ) );
+        $download_extensions = array_map( 'trim', $download_extensions );
+        $full_url = $this->protocol . '://' . $this->domain['domain'];
+        if ( $this->protocol == 'mailto' ) {
+            $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(), '\/' ) ) {
+            $type = 'outbound';
+        } else {
+            $type = $this->parse_internal_link_type();
+        }
+        return $type;
+    }
 	
-	/**
-	 * Parse the type for outbound links.
-	 *
-	 * @since 6.0.0
-	 * @access protected
-	 *
-	 * @return string The type of link.
-	 */
-	protected function parse_internal_link_type() {
-		$out_links = explode( ',', monsterinsights_get_option( 'track_internal_as_outbound', '' ) );
-		$out_links = array_unique( array_map( 'trim', $out_links ) );
-		if ( ! empty( $this->original_url ) && count( $out_links ) >= 1 ) {
-			foreach ( $out_links as $out ) {
-				if ( ! empty( $out ) && strpos( $this->original_url, $out ) !== false ) {
-					return 'internal-as-outbound';
-				}
-			}
-		}
-		return 'internal';
-	}
+    /**
+     * Parse the type for outbound links.
+     *
+     * @since 6.0.0
+     * @access protected
+     *
+     * @return string The type of link.
+     */
+    protected function parse_internal_link_type() {
+        $out_links = explode( ',', monsterinsights_get_option( 'track_internal_as_outbound', '' ) );
+        $out_links = array_unique( array_map( 'trim', $out_links ) );
+        if ( ! empty( $this->original_url ) && count( $out_links ) >= 1 ) {
+            foreach ( $out_links as $out ) {
+                if ( ! empty( $out ) && strpos( $this->original_url, $out ) !== false ) {
+                    return 'internal-as-outbound';
+                }
+            }
+        }
+        return 'internal';
+    }
 }
\ No newline at end of file

includes/measurement-protocol.php

Spacing +33 added lines, -33 removed lines

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

Indentation +113 added lines, -113 removed lines

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

lite/includes/admin/addons.php

Spacing +47 added lines, -47 removed lines

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

Indentation +164 added lines, -164 removed lines

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

lite/includes/admin/tools.php

Spacing +6 added lines, -6 removed lines

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

Indentation +3 added lines, -3 removed lines

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

lite/includes/admin/tab-support.php

Spacing +2 added lines, -2 removed lines

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

Braces +3 added lines, -1 removed lines

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

lite/includes/install.php

Spacing +6 added lines, -6 removed lines

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

Indentation +18 added lines, -18 removed lines

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

lite/includes/google.php

Spacing +7 added lines, -7 removed lines

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

Indentation +33 added lines, -33 removed lines

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

assets/lib/pandora/class-am-deactivation-survey.php

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! class_exists( 'AM_Deactivation_Survey' ) ) {
+if ( ! class_exists('AM_Deactivation_Survey')) {
 	/**
 	 * Awesome Motive Deactivation Survey.
 	 *
@@ -44,14 +44,14 @@ 
 		 * @param string $name Plugin name.
 		 * @param string $plugin Plugin slug.
 		 */
-		public function __construct( $name = '', $plugin = '' ) {
+		public function __construct($name = '', $plugin = '') {
 
 			$this->name   = $name;
 			$this->plugin = $plugin;
 
-			add_action( 'admin_print_scripts', array( $this, 'js'    ), 20 );
-			add_action( 'admin_print_scripts', array( $this, 'css'   )     );
-			add_action( 'admin_footer',        array( $this, 'modal' )     );
+			add_action('admin_print_scripts', array($this, 'js'), 20);
+			add_action('admin_print_scripts', array($this, 'css'));
+			add_action('admin_footer', array($this, 'modal'));
 		}
 
 		/**
@@ -62,7 +62,7 @@ 
 		 */
 		public function is_plugin_page() {
 
-			return ( in_array( get_current_screen()->id, array( 'plugins', 'plugins-network' ), true ) );
+			return (in_array(get_current_screen()->id, array('plugins', 'plugins-network'), true));
 		}
 
 		/**
@@ -72,7 +72,7 @@ 
 		 */
 		public function js() {
 
-			if ( ! $this->is_plugin_page() ) {
+			if ( ! $this->is_plugin_page()) {
 				return;
 			}
 			?>
@@ -105,15 +105,15 @@ 
 				$form.submit(function(event) {
 					event.preventDefault();
 					if (! $form.find('input[type=radio]:checked').val()) {
-						$form.find('.am-deactivate-survey-footer').prepend('<span class="error"><?php echo esc_js( __( 'Please select an option', 'google-analytics-for-wordpress' ) ); ?></span>');
+						$form.find('.am-deactivate-survey-footer').prepend('<span class="error"><?php echo esc_js(__('Please select an option', 'google-analytics-for-wordpress')); ?></span>');
 						return;
 					}
 					var data = {
 						code: $form.find('.selected input[type=radio]').val(),
 						reason: $form.find('.selected .am-deactivate-survey-option-reason').text(),
 						details: $form.find('.selected input[type=text]').val(),
-						site: '<?php echo esc_url( home_url() ); ?>',
-						plugin: '<?php echo sanitize_key( $this->name ); ?>'
+						site: '<?php echo esc_url(home_url()); ?>',
+						plugin: '<?php echo sanitize_key($this->name); ?>'
 					}
 					var submitSurvey = $.post('<?php echo $this->api_url; ?>', data);
 					submitSurvey.always(function() {
@@ -140,7 +140,7 @@ 
 		 */
 		public function css() {
 
-			if ( ! $this->is_plugin_page() ) {
+			if ( ! $this->is_plugin_page()) {
 				return;
 			}
 			?>
@@ -224,51 +224,51 @@ 
 		 */
 		public function modal() {
 
-			if ( ! $this->is_plugin_page() ) {
+			if ( ! $this->is_plugin_page()) {
 				return;
 			}
 
 			$options = array(
 				1 => array(
-					'title'   => esc_html__( 'I no longer need the plugin', 'google-analytics-for-wordpress' ),
+					'title'   => esc_html__('I no longer need the plugin', 'google-analytics-for-wordpress'),
 				),
 				2 => array(
-					'title'   => esc_html__( 'I\'m switching to a different plugin', 'google-analytics-for-wordpress' ),
-					'details' => esc_html__( 'Please share which plugin', 'google-analytics-for-wordpress' ),
+					'title'   => esc_html__('I\'m switching to a different plugin', 'google-analytics-for-wordpress'),
+					'details' => esc_html__('Please share which plugin', 'google-analytics-for-wordpress'),
 				),
 				3 => array(
-					'title'   => esc_html__( 'I couldn\'t get the plugin to work', 'google-analytics-for-wordpress' ),
+					'title'   => esc_html__('I couldn\'t get the plugin to work', 'google-analytics-for-wordpress'),
 				),
 				4 => array(
-					'title'   => esc_html__( 'It\'s a temporary deactivation', 'google-analytics-for-wordpress' ),
+					'title'   => esc_html__('It\'s a temporary deactivation', 'google-analytics-for-wordpress'),
 				),
 				5 => array(
-					'title'   => esc_html__( 'Other', 'google-analytics-for-wordpress' ),
-					'details' => esc_html__( 'Please share the reason', 'google-analytics-for-wordpress' ),
+					'title'   => esc_html__('Other', 'google-analytics-for-wordpress'),
+					'details' => esc_html__('Please share the reason', 'google-analytics-for-wordpress'),
 				),
 			);
 			?>
 			<div class="am-deactivate-survey-modal" id="am-deactivate-survey-<?php echo $this->plugin; ?>">
 				<div class="am-deactivate-survey-wrap">
 					<form class="am-deactivate-survey" method="post">
-						<span class="am-deactivate-survey-title"><span class="dashicons dashicons-testimonial"></span><?php echo ' ' . esc_html__( 'Quick Feedback', 'google-analytics-for-wordpress' ); ?></span>
-						<span class="am-deactivate-survey-desc"><?php echo sprintf( esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name ); ?></span>
+						<span class="am-deactivate-survey-title"><span class="dashicons dashicons-testimonial"></span><?php echo ' ' . esc_html__('Quick Feedback', 'google-analytics-for-wordpress'); ?></span>
+						<span class="am-deactivate-survey-desc"><?php echo sprintf(esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress'), $this->name); ?></span>
 						<div class="am-deactivate-survey-options">
-							<?php foreach ( $options as $id => $option ) : ?>
+							<?php foreach ($options as $id => $option) : ?>
 							<div class="am-deactivate-survey-option">
 								<label for="am-deactivate-survey-option-<?php echo $this->plugin; ?>-<?php echo $id; ?>" class="am-deactivate-survey-option-label">
 									<input id="am-deactivate-survey-option-<?php echo $this->plugin; ?>-<?php echo $id; ?>" class="am-deactivate-survey-option-input" type="radio" name="code" value="<?php echo $id; ?>" />
 									<span class="am-deactivate-survey-option-reason"><?php echo $option['title']; ?></span>
 								</label>
-								<?php if ( ! empty( $option['details'] ) ) : ?>
+								<?php if ( ! empty($option['details'])) : ?>
 								<input class="am-deactivate-survey-option-details" type="text" placeholder="<?php echo $option['details']; ?>" />
 								<?php endif; ?>
 							</div>
 							<?php endforeach; ?>
 						</div>
 						<div class="am-deactivate-survey-footer">
-							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf( esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></button>
-							<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf( esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></a>
+							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf(esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress'), '&amp;'); ?></button>
+							<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf(esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress'), '&amp;'); ?></a>
 						</div>
 					</form>
 				</div>

Indentation +109 added lines, -109 removed lines

@@ -1,81 +1,81 @@ 
 <?php
 if ( ! class_exists( 'AM_Deactivation_Survey' ) ) {
-	/**
-	 * Awesome Motive Deactivation Survey.
-	 *
-	 * This prompts the user for more details when they deactivate the plugin.
-	 *
-	 * @version    1.1.0
-	 * @package    AwesomeMotive
-	 * @author     Jared Atchison
-	 * @license    GPL-2.0+
-	 * @copyright  Copyright (c) 2017
-	 */
-	class AM_Deactivation_Survey {
+    /**
+     * Awesome Motive Deactivation Survey.
+     *
+     * This prompts the user for more details when they deactivate the plugin.
+     *
+     * @version    1.1.0
+     * @package    AwesomeMotive
+     * @author     Jared Atchison
+     * @license    GPL-2.0+
+     * @copyright  Copyright (c) 2017
+     */
+    class AM_Deactivation_Survey {
 
-		/**
-		 * The API URL we are calling.
-		 *
-		 * @since 1.0.0
-		 * @var string
-		 */
-		public $api_url = 'https://api.awesomemotive.com/v1/deactivation-survey/';
+        /**
+         * The API URL we are calling.
+         *
+         * @since 1.0.0
+         * @var string
+         */
+        public $api_url = 'https://api.awesomemotive.com/v1/deactivation-survey/';
 
-		/**
-		 * Name for this plugin.
-		 *
-		 * @since 1.0.0
-		 * @var string
-		 */
-		public $name;
+        /**
+         * Name for this plugin.
+         *
+         * @since 1.0.0
+         * @var string
+         */
+        public $name;
 
-		/**
-		 * Unique slug for this plugin.
-		 *
-		 * @since 1.0.0
-		 * @var string
-		 */
-		public $plugin;
+        /**
+         * Unique slug for this plugin.
+         *
+         * @since 1.0.0
+         * @var string
+         */
+        public $plugin;
 
-		/**
-		 * Primary class constructor.
-		 *
-		 * @since 1.0.0
-		 * @param string $name Plugin name.
-		 * @param string $plugin Plugin slug.
-		 */
-		public function __construct( $name = '', $plugin = '' ) {
+        /**
+         * Primary class constructor.
+         *
+         * @since 1.0.0
+         * @param string $name Plugin name.
+         * @param string $plugin Plugin slug.
+         */
+        public function __construct( $name = '', $plugin = '' ) {
 
-			$this->name   = $name;
-			$this->plugin = $plugin;
+            $this->name   = $name;
+            $this->plugin = $plugin;
 
-			add_action( 'admin_print_scripts', array( $this, 'js'    ), 20 );
-			add_action( 'admin_print_scripts', array( $this, 'css'   )     );
-			add_action( 'admin_footer',        array( $this, 'modal' )     );
-		}
+            add_action( 'admin_print_scripts', array( $this, 'js'    ), 20 );
+            add_action( 'admin_print_scripts', array( $this, 'css'   )     );
+            add_action( 'admin_footer',        array( $this, 'modal' )     );
+        }
 
-		/**
-		 * Checks if current admin screen is the plugins page.
-		 *
-		 * @since 1.0.0
-		 * @return bool
-		 */
-		public function is_plugin_page() {
+        /**
+         * Checks if current admin screen is the plugins page.
+         *
+         * @since 1.0.0
+         * @return bool
+         */
+        public function is_plugin_page() {
 
-			return ( in_array( get_current_screen()->id, array( 'plugins', 'plugins-network' ), true ) );
-		}
+            return ( in_array( get_current_screen()->id, array( 'plugins', 'plugins-network' ), true ) );
+        }
 
-		/**
-		 * Survey javascript.
-		 *
-		 * @since 1.0.0
-		 */
-		public function js() {
+        /**
+         * Survey javascript.
+         *
+         * @since 1.0.0
+         */
+        public function js() {
 
-			if ( ! $this->is_plugin_page() ) {
-				return;
-			}
-			?>
+            if ( ! $this->is_plugin_page() ) {
+                return;
+            }
+            ?>
 			<script type="text/javascript">
 			jQuery(function($){
 				var $deactivateLink = $('#the-list').find('[data-slug="<?php echo $this->plugin; ?>"] span.deactivate a'),
@@ -131,19 +131,19 @@ 
 			});
 			</script>
 			<?php
-		}
+        }
 
-		/**
-		 * Survey CSS.
-		 *
-		 * @since 1.0.0
-		 */
-		public function css() {
+        /**
+         * Survey CSS.
+         *
+         * @since 1.0.0
+         */
+        public function css() {
 
-			if ( ! $this->is_plugin_page() ) {
-				return;
-			}
-			?>
+            if ( ! $this->is_plugin_page() ) {
+                return;
+            }
+            ?>
 			<style type="text/css">
 			.am-deactivate-survey-modal {
 				display: none;
@@ -215,39 +215,39 @@ 
 			}
 			</style>
 			<?php
-		}
+        }
 
-		/**
-		 * Survey modal.
-		 *
-		 * @since 1.0.0
-		 */
-		public function modal() {
+        /**
+         * Survey modal.
+         *
+         * @since 1.0.0
+         */
+        public function modal() {
 
-			if ( ! $this->is_plugin_page() ) {
-				return;
-			}
+            if ( ! $this->is_plugin_page() ) {
+                return;
+            }
 
-			$options = array(
-				1 => array(
-					'title'   => esc_html__( 'I no longer need the plugin', 'google-analytics-for-wordpress' ),
-				),
-				2 => array(
-					'title'   => esc_html__( 'I\'m switching to a different plugin', 'google-analytics-for-wordpress' ),
-					'details' => esc_html__( 'Please share which plugin', 'google-analytics-for-wordpress' ),
-				),
-				3 => array(
-					'title'   => esc_html__( 'I couldn\'t get the plugin to work', 'google-analytics-for-wordpress' ),
-				),
-				4 => array(
-					'title'   => esc_html__( 'It\'s a temporary deactivation', 'google-analytics-for-wordpress' ),
-				),
-				5 => array(
-					'title'   => esc_html__( 'Other', 'google-analytics-for-wordpress' ),
-					'details' => esc_html__( 'Please share the reason', 'google-analytics-for-wordpress' ),
-				),
-			);
-			?>
+            $options = array(
+                1 => array(
+                    'title'   => esc_html__( 'I no longer need the plugin', 'google-analytics-for-wordpress' ),
+                ),
+                2 => array(
+                    'title'   => esc_html__( 'I\'m switching to a different plugin', 'google-analytics-for-wordpress' ),
+                    'details' => esc_html__( 'Please share which plugin', 'google-analytics-for-wordpress' ),
+                ),
+                3 => array(
+                    'title'   => esc_html__( 'I couldn\'t get the plugin to work', 'google-analytics-for-wordpress' ),
+                ),
+                4 => array(
+                    'title'   => esc_html__( 'It\'s a temporary deactivation', 'google-analytics-for-wordpress' ),
+                ),
+                5 => array(
+                    'title'   => esc_html__( 'Other', 'google-analytics-for-wordpress' ),
+                    'details' => esc_html__( 'Please share the reason', 'google-analytics-for-wordpress' ),
+                ),
+            );
+            ?>
 			<div class="am-deactivate-survey-modal" id="am-deactivate-survey-<?php echo $this->plugin; ?>">
 				<div class="am-deactivate-survey-wrap">
 					<form class="am-deactivate-survey" method="post">
@@ -274,6 +274,6 @@ 
 				</div>
 			</div>
 			<?php
-		}
-	}
+        }
+    }
 } // End if().
\ No newline at end of file