awesomemotive / google-analytics-for-wordpress

includes/admin/admin.php

Indentation +2 added lines, -2 removed lines

@@ -269,13 +269,13 @@
     }
 
     if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ){
-       echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
+        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
             echo '<p>';
             echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for 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. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
             echo '</p>';
         echo '</div>';
     } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ){
-       echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
+        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
             echo '<p>';
             echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
             echo '</p>';

assets/lib/pandora/class-am-notification.php

Indentation +336 added lines, -336 removed lines

@@ -1,257 +1,257 @@ 
 <?php
 if ( ! class_exists( 'AM_Notification' ) ) {
-	/**
-	 * Awesome Motive Notifications
-	 *
-	 * This creates a custom post type (if it doesn't exist) and calls the API to
-	 * retrieve notifications for this product.
-	 *
-	 * @package    AwesomeMotive
-	 * @author     Benjamin Rojas
-	 * @license    GPL-2.0+
-	 * @copyright  Copyright (c) 2017, Retyp LLC
-	 * @version    1.0.0
-	 */
-	class AM_Notification {
-		/**
-		 * The api url we are calling.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @var string
-		 */
-		public $api_url = 'https://api.awesomemotive.com/v1/notification/';
-
-		/**
-		 * A unique slug for this plugin.
-		 * (Not the WordPress plugin slug)
-		 *
-		 * @since 1.0.0
-		 *
-		 * @var string
-		 */
-		public $plugin;
-
-		/**
-		 * The current plugin version.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @var string
-		 */
-		public $plugin_version;
-
-		/**
-		 * The list of installed plugins.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @var array
-		 */
-		public $plugin_list = array();
-
-		/**
-		 * The list of installed themes.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @var string
-		 */
-		public $theme_list = array();
-
-		/**
-		 * Construct.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $plugin  The plugin slug.
-		 * @param string $version The version of the plugin.
-		 */
-		public function __construct( $plugin = '', $version = 0 ) {
-			$this->plugin         = $plugin;
-			$this->plugin_version = $version;
-
-			add_action( 'init', array( $this, 'custom_post_type' ) );
-			add_action( 'init', array( $this, 'get_remote_notifications' ), 100 );
-			add_action( 'admin_notices', array( $this, 'display_notifications' ) );
-			add_action( 'wp_ajax_am_notification_dismiss', array( $this, 'dismiss_notification' ) );
-		}
-
-		/**
-		 * Registers a custom post type.
-		 *
-		 * @since 1.0.0
-		 */
-		public function custom_post_type() {
-			register_post_type( 'amn_' . $this->plugin, array(
-				'supports' => false
-			) );
-		}
-
-		/**
-		 * Retrieve the remote notifications if the time has expired.
-		 *
-		 * @since 1.0.0
-		 */
-		public function get_remote_notifications() {
-			$last_checked  = get_option( '_amn_' . $this->plugin . '_last_checked', strtotime( '-1 week' ) );
-
-			if ( $last_checked < strtotime( 'today midnight' ) ) {
-
-				$plugin_notifications = $this->get_plugin_notifications( 1 );
-
-				$notification_id = null;
-				if ( ! empty( $plugin_notifications) ) {
-					// Unset it from the array.
-					$notification    = $plugin_notifications[0];
-					$notification_id = get_post_meta( $notification->ID, 'notification_id', true );
-				}
-
-				$response = wp_remote_retrieve_body( wp_remote_post( $this->api_url, array(
-					'sslverify' => false,
-					'body' => array(
-						'slug'              => $this->plugin,
-						'version'           => $this->plugin_version,
-						'last_notification' => $notification_id,
-						'plugins'           => $this->get_plugins_list(),
-						'themes'            => $this->get_themes_list()
-					)
-				) ) );
-
-				$data = json_decode( $response );
-
-				if ( ! empty( $data->id ) ) {
-
-					$notifications = array();
-					foreach ( (array) $data->slugs as $slug ) {
-						$notifications = array_merge( $notifications, (array) get_posts( array(
-							'post_type'  => 'amn_' . $slug,
-							'post_status' => 'all',
-							'meta_key' => 'notification_id',
-							'meta_value' => $data->id
-						) ) );
-					}
-
-					if ( empty( $notifications ) ) {
-
-						$new_notification_id = wp_insert_post( array(
-							'post_content' => $data->content,
-							'post_type'    => 'amn_' . $this->plugin
-						) );
-
-						update_post_meta( $new_notification_id, 'notification_id', $data->id );
-						update_post_meta( $new_notification_id, 'type', $data->type );
-						update_post_meta( $new_notification_id, 'dismissable', (bool) $data->dismissible ? 1 : 0 );
-						update_post_meta( $new_notification_id, 'location', wp_json_encode( $data->location ) );
-						update_post_meta( $new_notification_id, 'plugins', wp_json_encode( $data->plugins ) );
-						update_post_meta( $new_notification_id, 'theme', $data->theme );
-						update_post_meta( $new_notification_id, 'version', $data->version );
-						update_post_meta( $new_notification_id, 'viewed', 0 );
-					}
-
-				}
-
-				// Set the option now so we can't run this again until after 24 hours.
-				update_option( '_amn_' . $this->plugin . '_last_checked', strtotime( 'today midnight' ) );
-			}
-		}
-
-		/**
-		 * Get local plugin notifications that have already been set.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param  integer $limit Set the limit for how many posts to retrieve.
-		 * @param  array   $args  Any top-level arguments to add to the array.
-		 * @return object         WP_Posts that match the query.
-		 */
-		public function get_plugin_notifications( $limit = -1, $args = array() ) {
-			return get_posts( array(
-					'showposts' => $limit,
-					'post_type' => 'amn_' . $this->plugin
-			) + $args );
-		}
-
-		/**
-		 * Retrieve a list of plugins that are currently installed.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array An array of plugins that are currently installed.
-		 */
-		public function get_plugins_list() {
-			if ( ! empty( $this->plugin_list ) ) {
-				return $this->plugin_list;
-			}
-
-			if ( ! function_exists( 'get_plugins' ) ) {
-				require_once ABSPATH . 'wp-admin/includes/plugin.php';
-			}
-
-			$plugins = get_plugins();
-
-			foreach ( $plugins as $slug => $plugin ) {
-				$this->plugin_list[ $slug ] = array(
-					'slug'    => $slug,
-					'name'    => $plugin['Name'],
-					'version' => $plugin['Version'],
-					'active'  => is_plugin_active( $slug )
-				);
-			}
-
-			return $this->plugin_list;
-		}
-
-		/**
-		 * Retrieve a list of themes that are currently installed.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array An array of themes that are currently installed.
-		 */
-		public function get_themes_list() {
-			if ( ! empty( $this->theme_list ) ) {
-				return $this->theme_list;
-			}
-
-			$themes = wp_get_themes();
-
-			foreach ( $themes as $slug => $theme ) {
-				$this->theme_list[ $slug ] = array(
-					'slug'    => $slug,
-					'name'    => $theme->Name,
-					'version' => $theme->Version,
-					'active'  => (string) wp_get_theme() == $theme->Name
-				);
-			}
-
-			return $this->theme_list;
-		}
-
-		/**
-		 * Display any notifications that should be displayed.
-		 *
-		 * @since 1.0.0
-		 */
-		public function display_notifications() {
-
-			if ( ! current_user_can( apply_filters( 'am_notifications_display', 'manage_options' ) ) ) {
-				return;
-			}
-
-			$plugin_notifications = $this->get_plugin_notifications( -1, array(
-				'post_status' => 'all',
-				'meta_key' => 'viewed',
-				'meta_value' => '0'
-			) );
-
-			$plugin_notifications = $this->validate_notifications( $plugin_notifications );
-
-			if ( ! empty( $plugin_notifications ) ) {
-				foreach ( $plugin_notifications as $notification ) {
-					$dismissable = get_post_meta( $notification->ID, 'dismissable', true );
-					$type        = get_post_meta( $notification->ID, 'type', true );
-					?>
+    /**
+     * Awesome Motive Notifications
+     *
+     * This creates a custom post type (if it doesn't exist) and calls the API to
+     * retrieve notifications for this product.
+     *
+     * @package    AwesomeMotive
+     * @author     Benjamin Rojas
+     * @license    GPL-2.0+
+     * @copyright  Copyright (c) 2017, Retyp LLC
+     * @version    1.0.0
+     */
+    class AM_Notification {
+        /**
+         * The api url we are calling.
+         *
+         * @since 1.0.0
+         *
+         * @var string
+         */
+        public $api_url = 'https://api.awesomemotive.com/v1/notification/';
+
+        /**
+         * A unique slug for this plugin.
+         * (Not the WordPress plugin slug)
+         *
+         * @since 1.0.0
+         *
+         * @var string
+         */
+        public $plugin;
+
+        /**
+         * The current plugin version.
+         *
+         * @since 1.0.0
+         *
+         * @var string
+         */
+        public $plugin_version;
+
+        /**
+         * The list of installed plugins.
+         *
+         * @since 1.0.0
+         *
+         * @var array
+         */
+        public $plugin_list = array();
+
+        /**
+         * The list of installed themes.
+         *
+         * @since 1.0.0
+         *
+         * @var string
+         */
+        public $theme_list = array();
+
+        /**
+         * Construct.
+         *
+         * @since 1.0.0
+         *
+         * @param string $plugin  The plugin slug.
+         * @param string $version The version of the plugin.
+         */
+        public function __construct( $plugin = '', $version = 0 ) {
+            $this->plugin         = $plugin;
+            $this->plugin_version = $version;
+
+            add_action( 'init', array( $this, 'custom_post_type' ) );
+            add_action( 'init', array( $this, 'get_remote_notifications' ), 100 );
+            add_action( 'admin_notices', array( $this, 'display_notifications' ) );
+            add_action( 'wp_ajax_am_notification_dismiss', array( $this, 'dismiss_notification' ) );
+        }
+
+        /**
+         * Registers a custom post type.
+         *
+         * @since 1.0.0
+         */
+        public function custom_post_type() {
+            register_post_type( 'amn_' . $this->plugin, array(
+                'supports' => false
+            ) );
+        }
+
+        /**
+         * Retrieve the remote notifications if the time has expired.
+         *
+         * @since 1.0.0
+         */
+        public function get_remote_notifications() {
+            $last_checked  = get_option( '_amn_' . $this->plugin . '_last_checked', strtotime( '-1 week' ) );
+
+            if ( $last_checked < strtotime( 'today midnight' ) ) {
+
+                $plugin_notifications = $this->get_plugin_notifications( 1 );
+
+                $notification_id = null;
+                if ( ! empty( $plugin_notifications) ) {
+                    // Unset it from the array.
+                    $notification    = $plugin_notifications[0];
+                    $notification_id = get_post_meta( $notification->ID, 'notification_id', true );
+                }
+
+                $response = wp_remote_retrieve_body( wp_remote_post( $this->api_url, array(
+                    'sslverify' => false,
+                    'body' => array(
+                        'slug'              => $this->plugin,
+                        'version'           => $this->plugin_version,
+                        'last_notification' => $notification_id,
+                        'plugins'           => $this->get_plugins_list(),
+                        'themes'            => $this->get_themes_list()
+                    )
+                ) ) );
+
+                $data = json_decode( $response );
+
+                if ( ! empty( $data->id ) ) {
+
+                    $notifications = array();
+                    foreach ( (array) $data->slugs as $slug ) {
+                        $notifications = array_merge( $notifications, (array) get_posts( array(
+                            'post_type'  => 'amn_' . $slug,
+                            'post_status' => 'all',
+                            'meta_key' => 'notification_id',
+                            'meta_value' => $data->id
+                        ) ) );
+                    }
+
+                    if ( empty( $notifications ) ) {
+
+                        $new_notification_id = wp_insert_post( array(
+                            'post_content' => $data->content,
+                            'post_type'    => 'amn_' . $this->plugin
+                        ) );
+
+                        update_post_meta( $new_notification_id, 'notification_id', $data->id );
+                        update_post_meta( $new_notification_id, 'type', $data->type );
+                        update_post_meta( $new_notification_id, 'dismissable', (bool) $data->dismissible ? 1 : 0 );
+                        update_post_meta( $new_notification_id, 'location', wp_json_encode( $data->location ) );
+                        update_post_meta( $new_notification_id, 'plugins', wp_json_encode( $data->plugins ) );
+                        update_post_meta( $new_notification_id, 'theme', $data->theme );
+                        update_post_meta( $new_notification_id, 'version', $data->version );
+                        update_post_meta( $new_notification_id, 'viewed', 0 );
+                    }
+
+                }
+
+                // Set the option now so we can't run this again until after 24 hours.
+                update_option( '_amn_' . $this->plugin . '_last_checked', strtotime( 'today midnight' ) );
+            }
+        }
+
+        /**
+         * Get local plugin notifications that have already been set.
+         *
+         * @since 1.0.0
+         *
+         * @param  integer $limit Set the limit for how many posts to retrieve.
+         * @param  array   $args  Any top-level arguments to add to the array.
+         * @return object         WP_Posts that match the query.
+         */
+        public function get_plugin_notifications( $limit = -1, $args = array() ) {
+            return get_posts( array(
+                    'showposts' => $limit,
+                    'post_type' => 'amn_' . $this->plugin
+            ) + $args );
+        }
+
+        /**
+         * Retrieve a list of plugins that are currently installed.
+         *
+         * @since 1.0.0
+         *
+         * @return array An array of plugins that are currently installed.
+         */
+        public function get_plugins_list() {
+            if ( ! empty( $this->plugin_list ) ) {
+                return $this->plugin_list;
+            }
+
+            if ( ! function_exists( 'get_plugins' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+            }
+
+            $plugins = get_plugins();
+
+            foreach ( $plugins as $slug => $plugin ) {
+                $this->plugin_list[ $slug ] = array(
+                    'slug'    => $slug,
+                    'name'    => $plugin['Name'],
+                    'version' => $plugin['Version'],
+                    'active'  => is_plugin_active( $slug )
+                );
+            }
+
+            return $this->plugin_list;
+        }
+
+        /**
+         * Retrieve a list of themes that are currently installed.
+         *
+         * @since 1.0.0
+         *
+         * @return array An array of themes that are currently installed.
+         */
+        public function get_themes_list() {
+            if ( ! empty( $this->theme_list ) ) {
+                return $this->theme_list;
+            }
+
+            $themes = wp_get_themes();
+
+            foreach ( $themes as $slug => $theme ) {
+                $this->theme_list[ $slug ] = array(
+                    'slug'    => $slug,
+                    'name'    => $theme->Name,
+                    'version' => $theme->Version,
+                    'active'  => (string) wp_get_theme() == $theme->Name
+                );
+            }
+
+            return $this->theme_list;
+        }
+
+        /**
+         * Display any notifications that should be displayed.
+         *
+         * @since 1.0.0
+         */
+        public function display_notifications() {
+
+            if ( ! current_user_can( apply_filters( 'am_notifications_display', 'manage_options' ) ) ) {
+                return;
+            }
+
+            $plugin_notifications = $this->get_plugin_notifications( -1, array(
+                'post_status' => 'all',
+                'meta_key' => 'viewed',
+                'meta_value' => '0'
+            ) );
+
+            $plugin_notifications = $this->validate_notifications( $plugin_notifications );
+
+            if ( ! empty( $plugin_notifications ) ) {
+                foreach ( $plugin_notifications as $notification ) {
+                    $dismissable = get_post_meta( $notification->ID, 'dismissable', true );
+                    $type        = get_post_meta( $notification->ID, 'type', true );
+                    ?>
 					<div class="am-notification am-notification-<?php echo $notification->ID; ?> notice notice-<?php echo $type; ?><?php echo $dismissable ? ' is-dismissible' : ''; ?>">
 						<?php echo $notification->post_content; ?>
 					</div>
@@ -266,88 +266,88 @@ 
 						});
 					</script>
 				<?php }
-			}
-		}
-
-		/**
-		 * Validate the notifications before displaying them.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param  array $plugin_notifications An array of plugin notifications.
-		 * @return array                       A filtered array of plugin notifications.
-		 */
-		public function validate_notifications( $plugin_notifications ) {
-			global $pagenow;
-			foreach ( $plugin_notifications as $key => $notification ) {
-				// Location validation.
-				$location = (array) json_decode( get_post_meta( $notification->ID, 'location', true ) );
-				$continue = false;
-				if ( ! in_array( 'everywhere', $location ) ) {
-					if ( in_array( 'index.php', $location ) && 'index.php' == $pagenow ) {
-						$continue = true;
-					}
-
-					if ( in_array( 'plugins.php', $location ) && 'plugins.php' == $pagenow ) {
-						$continue = true;
-					}
-
-					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
-					}
-				}
-
-				// Plugin validation (OR conditional)
-				$plugins  = (array) json_decode( get_post_meta( $notification->ID, 'plugins', true ) );
-				$continue = false;
-				if ( ! empty( $plugins ) ) {
-					foreach ( $plugins as $plugin ) {
-						if ( is_plugin_active( $plugin ) ) {
-							$continue = true;
-						}
-					}
-
-					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
-					}
-				}
-
-				// Theme validation.
-				$theme    = get_post_meta( $notification->ID, 'theme', true );
-				$continue = (string) wp_get_theme() == $theme;
-
-				if ( ! empty( $theme ) && ! $continue ) {
-					unset( $plugin_notifications[ $key ] );
-				}
-
-				// Version validation.
-				$version  = get_post_meta( $notification->ID, 'version', true );
-				$continue = false;
-				if ( ! empty( $version ) ) {
-					if ( version_compare( $this->plugin_version, $version, '<=' ) ) {
-						$continue = true;
-					}
-
-					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
-					}
-				}
-
-			}
-
-			return $plugin_notifications;
-		}
-
-		/**
-		 * Dismiss the notification via AJAX.
-		 *
-		 * @since 1.0.0
-		 */
-		public function dismiss_notification() {
-			$notification_id = intval( $_POST['notification_id'] );
-			update_post_meta( $notification_id, 'viewed', 1 );
-			die;
-		}
-
-	}
+            }
+        }
+
+        /**
+         * Validate the notifications before displaying them.
+         *
+         * @since 1.0.0
+         *
+         * @param  array $plugin_notifications An array of plugin notifications.
+         * @return array                       A filtered array of plugin notifications.
+         */
+        public function validate_notifications( $plugin_notifications ) {
+            global $pagenow;
+            foreach ( $plugin_notifications as $key => $notification ) {
+                // Location validation.
+                $location = (array) json_decode( get_post_meta( $notification->ID, 'location', true ) );
+                $continue = false;
+                if ( ! in_array( 'everywhere', $location ) ) {
+                    if ( in_array( 'index.php', $location ) && 'index.php' == $pagenow ) {
+                        $continue = true;
+                    }
+
+                    if ( in_array( 'plugins.php', $location ) && 'plugins.php' == $pagenow ) {
+                        $continue = true;
+                    }
+
+                    if ( ! $continue ) {
+                        unset( $plugin_notifications[ $key ] );
+                    }
+                }
+
+                // Plugin validation (OR conditional)
+                $plugins  = (array) json_decode( get_post_meta( $notification->ID, 'plugins', true ) );
+                $continue = false;
+                if ( ! empty( $plugins ) ) {
+                    foreach ( $plugins as $plugin ) {
+                        if ( is_plugin_active( $plugin ) ) {
+                            $continue = true;
+                        }
+                    }
+
+                    if ( ! $continue ) {
+                        unset( $plugin_notifications[ $key ] );
+                    }
+                }
+
+                // Theme validation.
+                $theme    = get_post_meta( $notification->ID, 'theme', true );
+                $continue = (string) wp_get_theme() == $theme;
+
+                if ( ! empty( $theme ) && ! $continue ) {
+                    unset( $plugin_notifications[ $key ] );
+                }
+
+                // Version validation.
+                $version  = get_post_meta( $notification->ID, 'version', true );
+                $continue = false;
+                if ( ! empty( $version ) ) {
+                    if ( version_compare( $this->plugin_version, $version, '<=' ) ) {
+                        $continue = true;
+                    }
+
+                    if ( ! $continue ) {
+                        unset( $plugin_notifications[ $key ] );
+                    }
+                }
+
+            }
+
+            return $plugin_notifications;
+        }
+
+        /**
+         * Dismiss the notification via AJAX.
+         *
+         * @since 1.0.0
+         */
+        public function dismiss_notification() {
+            $notification_id = intval( $_POST['notification_id'] );
+            update_post_meta( $notification_id, 'viewed', 1 );
+            die;
+        }
+
+    }
 }
\ No newline at end of file

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

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

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

Indentation +402 added lines, -402 removed lines

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

includes/frontend/events/class-link.php

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/frontend/events/class-events-js.php

Indentation +130 added lines, -130 removed lines

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

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

Indentation +149 added lines, -149 removed lines

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

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

Indentation +186 added lines, -186 removed lines

@@ -10,181 +10,181 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class MonsterInsights_Tracking_Analytics extends MonsterInsights_Tracking_Abstract {
 
-	/**
-	 * Holds the base class object.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var object $base Base class object.
-	 */
-	public $base;
+    /**
+     * Holds the base class object.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var object $base Base class object.
+     */
+    public $base;
 	
-	/**
-	 * Holds the name of the tracking type.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $name Name of the tracking type.
-	 */
-	public $name = 'analytics';
-
-	/**
-	 * Version of the tracking class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @var string $version Version of the tracking class.
-	 */
-	public $version = '1.0.0';
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 */
-	public function __construct() {
-		$this->base = MonsterInsights();
-	}
-
-	/**
-	 * Get frontend tracking options.
-	 *
-	 * This function is used to return an array of parameters
-	 * for the frontend_output() function to output. These are 
-	 * generally dimensions and turned on GA features.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return array Array of the options to use.
-	 */
-	public function frontend_tracking_options( ) {
-		global $wp_query;
-		$options = array();
-
-		if ( monsterinsights_get_ua_to_output() ) {
-			$ua_code = monsterinsights_get_ua_to_output();
-		} else {
-			return $options;
-		}
-
-		$domain = 'auto'; // Default domain value
-		if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
-			$domain = esc_attr( monsterinsights_get_option( 'subdomain_tracking', '' ) );
-		}
-
-		$allow_linker = monsterinsights_get_option( 'add_allow_linker', false );
-		$allow_anchor = monsterinsights_get_option( 'allow_anchor', false );
-
-
-		$create = array();
-		if ( $allow_anchor ) {
-			$create['allowAnchor'] = true;
-		}
-
-		if ( $allow_linker ) {
-			$create['allowLinker'] = true;
-		}
-
-		$create = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_create', $create );
-
-		if ( $create && ! empty( $create ) && is_array( $create ) ) {
-			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
-		} else {
-			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
-		}
-
-		$options['forceSSL'] = "'set', 'forceSSL', true";
-
-		if ( monsterinsights_get_option( 'custom_code', false ) ) {
-			// Add custom code to the view
-			$options['custom_code'] = array(
-				'type'  => 'custom_code',
-				'value' => stripslashes( monsterinsights_get_option( 'custom_code', '' ) ),
-			);
-		}
-
-		// Anonymous data
-		if ( monsterinsights_get_option( 'anonymize_ips', false ) ) {
-			$options['anonymize_ips'] = "'set', 'anonymizeIp', true";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', $options );
-
-		// add demographics
-		if ( monsterinsights_get_option( 'demographics', false ) ) {
-			$options['demographics'] = "'require', 'displayfeatures'";
-		}
-
-		// Check for Enhanced link attribution
-		if ( monsterinsights_get_option( 'enhanced_link_attribution', false ) ) {
-			$options['enhanced_link_attribution'] = "'require', 'linkid', 'linkid.js'";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_pageview', $options );
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
-
-		if ( is_404() ) {
-			if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
-				$options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer";
-			} else {
-				$options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
-			}
-		} else if ( $wp_query->is_search ) {
-			$pushstr = "'send','pageview','/?s=";
-			if ( (int) $wp_query->found_posts === 0 ) {
-				$options['send'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
-			} else if ( (int) $wp_query->found_posts === 1 ) {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
-			} else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
-			} else {
-				$options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
-			}
-		} else if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
-			$options['send'] = "'send','pageview', location.pathname + location.search + location.hash";
-		} else {
-			$options['send'] = "'send','pageview'";
-		}
-
-		$options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_end', $options );
-		return $options;
-	}
-
-	/**
-	 * Get frontend output.
-	 *
-	 * This function is used to return the Javascript
-	 * to output in the head of the page for the given
-	 * tracking method.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return string Javascript to output.
-	 */
-	public function frontend_output( ) {
-		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
-		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src     = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
-		}
-		$compat  = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
-		$compat  = $compat ? 'window.ga = __gaTracker;' : '';
-		ob_start();
-		?>
+    /**
+     * Holds the name of the tracking type.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $name Name of the tracking type.
+     */
+    public $name = 'analytics';
+
+    /**
+     * Version of the tracking class.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @var string $version Version of the tracking class.
+     */
+    public $version = '1.0.0';
+
+    /**
+     * Primary class constructor.
+     *
+     * @since 6.0.0
+     * @access public
+     */
+    public function __construct() {
+        $this->base = MonsterInsights();
+    }
+
+    /**
+     * Get frontend tracking options.
+     *
+     * This function is used to return an array of parameters
+     * for the frontend_output() function to output. These are 
+     * generally dimensions and turned on GA features.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return array Array of the options to use.
+     */
+    public function frontend_tracking_options( ) {
+        global $wp_query;
+        $options = array();
+
+        if ( monsterinsights_get_ua_to_output() ) {
+            $ua_code = monsterinsights_get_ua_to_output();
+        } else {
+            return $options;
+        }
+
+        $domain = 'auto'; // Default domain value
+        if ( monsterinsights_get_option( 'subdomain_tracking', false ) ) {
+            $domain = esc_attr( monsterinsights_get_option( 'subdomain_tracking', '' ) );
+        }
+
+        $allow_linker = monsterinsights_get_option( 'add_allow_linker', false );
+        $allow_anchor = monsterinsights_get_option( 'allow_anchor', false );
+
+
+        $create = array();
+        if ( $allow_anchor ) {
+            $create['allowAnchor'] = true;
+        }
+
+        if ( $allow_linker ) {
+            $create['allowLinker'] = true;
+        }
+
+        $create = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_create', $create );
+
+        if ( $create && ! empty( $create ) && is_array( $create ) ) {
+            $create = json_encode( $create );
+            $create = str_replace( '"', "'",  $create );
+            $options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+        } else {
+            $options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
+        }
+
+        $options['forceSSL'] = "'set', 'forceSSL', true";
+
+        if ( monsterinsights_get_option( 'custom_code', false ) ) {
+            // Add custom code to the view
+            $options['custom_code'] = array(
+                'type'  => 'custom_code',
+                'value' => stripslashes( monsterinsights_get_option( 'custom_code', '' ) ),
+            );
+        }
+
+        // Anonymous data
+        if ( monsterinsights_get_option( 'anonymize_ips', false ) ) {
+            $options['anonymize_ips'] = "'set', 'anonymizeIp', true";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', $options );
+
+        // add demographics
+        if ( monsterinsights_get_option( 'demographics', false ) ) {
+            $options['demographics'] = "'require', 'displayfeatures'";
+        }
+
+        // Check for Enhanced link attribution
+        if ( monsterinsights_get_option( 'enhanced_link_attribution', false ) ) {
+            $options['enhanced_link_attribution'] = "'require', 'linkid', 'linkid.js'";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_before_pageview', $options );
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_before_pageview', $options, $this->name, $this->version );
+
+        if ( is_404() ) {
+            if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
+                $options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + location.hash + '&from=' + document.referrer";
+            } else {
+                $options['send'] = "'send','pageview','/404.html?page=' + document.location.pathname + document.location.search + '&from=' + document.referrer";
+            }
+        } else if ( $wp_query->is_search ) {
+            $pushstr = "'send','pageview','/?s=";
+            if ( (int) $wp_query->found_posts === 0 ) {
+                $options['send'] = $pushstr . 'no-results:' . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=no-results'";
+            } else if ( (int) $wp_query->found_posts === 1 ) {
+                $options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=1-result'";
+            } else if ( $wp_query->found_posts > 1 && $wp_query->found_posts < 6 ) {
+                $options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=2-5-results'";
+            } else {
+                $options['send'] = $pushstr . rawurlencode( $wp_query->query_vars['s'] ) . "&cat=plus-5-results'";
+            }
+        } else if ( monsterinsights_get_option( 'hash_tracking', false ) ) {
+            $options['send'] = "'send','pageview', location.pathname + location.search + location.hash";
+        } else {
+            $options['send'] = "'send','pageview'";
+        }
+
+        $options = apply_filters( 'monsterinsights_frontend_tracking_options_analytics_end', $options );
+        return $options;
+    }
+
+    /**
+     * Get frontend output.
+     *
+     * This function is used to return the Javascript
+     * to output in the head of the page for the given
+     * tracking method.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return string Javascript to output.
+     */
+    public function frontend_output( ) {
+        $options        = $this->frontend_tracking_options();
+        $is_debug_mode  =  monsterinsights_is_debug_mode();
+        $src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
+        if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
+            $src     = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+        }
+        $compat  = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
+        $compat  = $compat ? 'window.ga = __gaTracker;' : '';
+        ob_start();
+        ?>
 <!-- This site uses the Google Analytics by MonsterInsights plugin v<?php echo MONSTERINSIGHTS_VERSION; ?> - Using Analytics tracking - https://www.monsterinsights.com/ -->
 <?php if ( monsterinsights_get_ua() ) { ?>
 <script type="text/javascript" data-cfasync="false">
@@ -214,17 +214,17 @@ 
 
 <?php
 if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-	echo 'window.ga_debug = {trace: true};';
+    echo 'window.ga_debug = {trace: true};';
 }
 echo $compat;
 if ( count( $options ) >= 1 ) {
-	foreach ( $options as $item ) {
-		if ( ! is_array( $item ) ) {
-			echo '	__gaTracker(' . $item . ");\n";
-		} else if ( ! empty ( $item['value'] ) ) {
-			echo '	' . $item['value'] . "\n";
-		}
-	}
+    foreach ( $options as $item ) {
+        if ( ! is_array( $item ) ) {
+            echo '	__gaTracker(' . $item . ");\n";
+        } else if ( ! empty ( $item['value'] ) ) {
+            echo '	' . $item['value'] . "\n";
+        }
+    }
 }
 ?>
 </script>
@@ -233,12 +233,12 @@ 
 <?php } ?>
 <!-- / Google Analytics by MonsterInsights -->
 <?php
-		$output = ob_get_contents();
-		ob_end_clean();
-		return $output;
-	}
-
-	public function should_do_optout() {
-		return ! ( defined( 'MI_NO_TRACKING_OPTOUT' ) && MI_NO_TRACKING_OPTOUT );
-	}
+        $output = ob_get_contents();
+        ob_end_clean();
+        return $output;
+    }
+
+    public function should_do_optout() {
+        return ! ( defined( 'MI_NO_TRACKING_OPTOUT' ) && MI_NO_TRACKING_OPTOUT );
+    }
 }

includes/frontend/class-tracking-abstract.php

Indentation +1 added lines, -1 removed lines

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