awesomemotive / google-analytics-for-wordpress

includes/admin/tracking.php

Spacing +8 added lines, -8 removed lines

@@ -93,12 +93,12 @@ 
 		$data['usagetracking'] = get_option( 'monsterinsights_usage_tracking_config', false );
 		$data['usercount']     = function_exists( 'get_user_count' ) ? get_user_count() : 'Not Set';
 		$data['usesauth']      = $usesauth;
-		$data['timezoneoffset']= date('P');
+		$data['timezoneoffset'] = date( 'P' );
 
 
 
 		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
@@ -108,7 +108,7 @@ 
 		foreach ( $plugins as $key => $plugin ) {
 			if ( in_array( $plugin, $active_plugins ) ) {
 				// Remove active plugins from list so we can show active and inactive separately
-				unset( $plugins[ $key ] );
+				unset( $plugins[$key] );
 			}
 		}
 
@@ -126,7 +126,7 @@ 
 			return false;
 		}
 
-		if( ! $this->tracking_allowed() && ! $override ) {
+		if ( ! $this->tracking_allowed() && ! $override ) {
 			return false;
 		}
 
@@ -158,15 +158,15 @@ 
 	public function schedule_send() {
 		if ( ! wp_next_scheduled( 'monsterinsights_usage_tracking_cron' ) ) {
 			$tracking             = array();
-			$tracking['day']      = rand( 0, 6  );
+			$tracking['day']      = rand( 0, 6 );
 			$tracking['hour']     = rand( 0, 23 );
 			$tracking['minute']   = rand( 0, 59 );
 			$tracking['second']   = rand( 0, 59 );
-			$tracking['offset']   = ( $tracking['day']    * DAY_IN_SECONDS    ) +
-									( $tracking['hour']   * HOUR_IN_SECONDS   ) +
+			$tracking['offset']   = ( $tracking['day'] * DAY_IN_SECONDS ) +
+									( $tracking['hour'] * HOUR_IN_SECONDS ) +
 									( $tracking['minute'] * MINUTE_IN_SECONDS ) +
 									 $tracking['second'];
-			$tracking['initsend'] = strtotime("next sunday") + $tracking['offset'];
+			$tracking['initsend'] = strtotime( "next sunday" ) + $tracking['offset'];
 
 			wp_schedule_event( $tracking['initsend'], 'weekly', 'monsterinsights_usage_tracking_cron' );
 			update_option( 'monsterinsights_usage_tracking_config', $tracking );

googleanalytics.php

Spacing +8 added lines, -8 removed lines

@@ -356,11 +356,11 @@ 
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file ) );
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) );
 		}
 	}
 
@@ -380,7 +380,7 @@ 
 		}
 
 		// Traditional WordPress plugin locale filter.
-		$mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
+		$mi_locale  = apply_filters( 'plugin_locale', $mi_locale, 'google-analytics-for-wordpress' );
 		$mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale );
 
 		// Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
@@ -419,7 +419,7 @@ 
 	public function monsterinsights_wp_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -440,7 +440,7 @@ 
 	public function monsterinsights_pro_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -466,7 +466,7 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
-		$monsterinsights_settings  = monsterinsights_get_options();
+		$monsterinsights_settings = monsterinsights_get_options();
 	}
 
 
@@ -480,7 +480,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/license-compat.php';
 			self::$instance->license = new MonsterInsights_License_Compat();
@@ -797,7 +797,7 @@ 
  *
  * @return void
  */
-function monsterinsights_lite_call_install_and_upgrade(){
+function monsterinsights_lite_call_install_and_upgrade() {
 	add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
 }
 

includes/auth.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 
 final class MonsterInsights_Auth {
 
-	private $profile  = array();
+	private $profile = array();
 	private $network = array();
 
 	/**
@@ -67,9 +67,9 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
-		$this->profile      = $data;
+		$this->profile = $data;
 
 		// If this is the first time, save the date when they connected.
 		$over_time    = get_option( 'monsterinsights_over_time', array() );
@@ -87,12 +87,12 @@ 
 		}
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
-		$this->network      = $data;
+		$this->network = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -106,7 +106,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -139,7 +139,7 @@ 
 
 		do_action( 'monsterinsights_reports_delete_aggregate_data' );
 
-		$this->profile      = $data;
+		$this->profile = $data;
 		$this->set_analytics_profile( $data );
 	}
 
@@ -196,55 +196,55 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() { // also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() { // also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

includes/admin/admin.php

Indentation +178 added lines, -178 removed lines

@@ -27,22 +27,22 @@ 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
 
     if ( $hook === 'monsterinsights_settings' ) {
-        // If dashboards disabled, first settings page
-        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
-        $hook = 'monsterinsights_settings';
+	// If dashboards disabled, first settings page
+	add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
+	$hook = 'monsterinsights_settings';
 
-        add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
+	add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
-        // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
+	// if dashboards enabled, first dashboard
+	add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
 
-        add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
+	add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
-        // then settings page
-        add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
+	// then settings page
+	add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
 
-        // Add dashboard submenu.
-        add_submenu_page( 'index.php', __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'admin.php?page=monsterinsights_reports' );
+	// Add dashboard submenu.
+	add_submenu_page( 'index.php', __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'admin.php?page=monsterinsights_reports' );
     }
 
     $submenu_base = add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
@@ -51,9 +51,9 @@ 
 	add_submenu_page( $hook, __( 'Popular Posts:', 'google-analytics-for-wordpress' ), __( 'Popular Posts', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', $submenu_base . '#/popular-posts' );
 
     if ( function_exists( 'aioseo' ) ) {
-        $seo_url = monsterinsights_aioseo_dashboard_url();
+	$seo_url = monsterinsights_aioseo_dashboard_url();
     } else {
-        $seo_url = $submenu_base . '#/seo';
+	$seo_url = $submenu_base . '#/seo';
     }
     // then SEO
     add_submenu_page( $hook, __( 'SEO', 'google-analytics-for-wordpress' ), __( 'SEO', 'google-analytics-for-wordpress' ), 'manage_options', $seo_url );
@@ -64,7 +64,7 @@ 
     // then addons
     $network_key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_network_license_key() : '';
     if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) {
-        add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' );
+	add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' );
     }
 
     // Add About us page.
@@ -97,9 +97,9 @@ 
 function monsterinsights_get_menu_hook() {
     $dashboards_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
     if ( $dashboards_disabled || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
-        return 'monsterinsights_settings';
+	return 'monsterinsights_settings';
     } else {
-        return 'monsterinsights_reports';
+	return 'monsterinsights_reports';
     }
 }
 
@@ -110,12 +110,12 @@ 
     // First, let's see if this is an MS network enabled plugin. If it is, we should load the license
     // menu page and the updater on the network panel
     if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-        require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+	require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
     }
 
     $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE );
     if ( ! is_plugin_active_for_network( $plugin ) ) {
-        return;
+	return;
     }
 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
@@ -128,9 +128,9 @@ 
     add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
     if ( function_exists( 'aioseo' ) ) {
-        $seo_url = monsterinsights_aioseo_dashboard_url();
+	$seo_url = monsterinsights_aioseo_dashboard_url();
     } else {
-        $seo_url = $submenu_base . '#/seo';
+	$seo_url = $submenu_base . '#/seo';
     }
     // then seo
     add_submenu_page( $hook, __( 'SEO:', 'google-analytics-for-wordpress' ), __( 'SEO', 'google-analytics-for-wordpress' ), 'manage_options', $seo_url, 'monsterinsights_seo_page' );
@@ -154,7 +154,7 @@ 
 function monsterinsights_add_admin_body_class( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
     if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return $classes;
+	return $classes;
     }
 
     return "$classes monsterinsights_page ";
@@ -171,7 +171,7 @@ 
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
 
     if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id  ) {
-        return $classes;
+	return $classes;
     }
 
     return "$classes insights_page_monsterinsights_tools ";
@@ -187,7 +187,7 @@ 
 function monsterinsights_add_admin_body_class_addons_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
     if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id  ) {
-        return $classes;
+	return $classes;
     }
 
     return "$classes insights_page_monsterinsights_addons ";
@@ -207,11 +207,11 @@ 
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );
     }
 
 	if ( is_network_admin() ) {
@@ -246,26 +246,26 @@ 
 function monsterinsights_load_admin_partial( $template, $data = array() ) {
 
     if ( monsterinsights_is_pro_version() ) {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
 
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}
     } else {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
 
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}
     }
 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
-        return true;
+	require_once(  $dir . $template . '.php' );
+	return true;
     }
 
     return false;
@@ -282,9 +282,9 @@ 
 function monsterinsights_admin_footer( $text ) {
     global $current_screen;
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
-        $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        // Translators: Placeholders add a link to the wordpress.org repository.
-        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+	$url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
+	// Translators: Placeholders add a link to the wordpress.org repository.
+	$text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -295,12 +295,12 @@ 
     // Don't show on MonsterInsights pages
     $screen = get_current_screen();
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-        return;
+	return;
     }
 
     // Make sure they have the permissions to do something
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     // Priority:
@@ -318,89 +318,89 @@ 
     // 1. Google Analytics not authenticated
 	if ( ! is_network_admin() && ! monsterinsights_get_ua() && ! defined( 'MONSTERINSIGHTS_DISABLE_TRACKING' ) ) {
 
-        $submenu_base = is_network_admin() ? add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) ) : add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
-        $title     = esc_html__( 'Please Setup Website Analytics to See Audience Insights', 'google-analytics-for-wordpress' );
-        $primary   = esc_html__( 'Connect MonsterInsights and Setup Website Analytics', 'google-analytics-for-wordpress' );
-        $urlone    = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights-onboarding' ) : admin_url( 'admin.php?page=monsterinsights-onboarding' );
-        $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
-        $urltwo    = $submenu_base . '#/about/getting-started';
-        $message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
-        echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
-        return;
+	$submenu_base = is_network_admin() ? add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) ) : add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
+	$title     = esc_html__( 'Please Setup Website Analytics to See Audience Insights', 'google-analytics-for-wordpress' );
+	$primary   = esc_html__( 'Connect MonsterInsights and Setup Website Analytics', 'google-analytics-for-wordpress' );
+	$urlone    = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights-onboarding' ) : admin_url( 'admin.php?page=monsterinsights-onboarding' );
+	$secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
+	$urltwo    = $submenu_base . '#/about/getting-started';
+	$message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
+	echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
+	return;
     }
 
     // 2. License key not entered for pro
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
-        $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        // Translators: Adds a link to retrieve the license.
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
+	// Translators: Adds a link to retrieve the license.
+	$message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</p></div>';
+	return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
-        $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
-            if ( MonsterInsights()->license->site_license_expired() ) {
-	            // Translators: Adds a link to the license renewal.
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->site_license_disabled() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->site_license_invalid() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        } else if ( MonsterInsights()->license->get_network_license_key() ) {
-            if ( MonsterInsights()->license->network_license_expired() ) {
-            	// Translators: Adds a link to renew license.
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->network_license_disabled() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->network_license_invalid() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        }
-        if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
-            return;
-        }
+	$message = '';
+	if ( MonsterInsights()->license->get_site_license_key() ){
+	    if ( MonsterInsights()->license->site_license_expired() ) {
+		    // Translators: Adds a link to the license renewal.
+		$message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->site_license_disabled() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->site_license_invalid() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	} else if ( MonsterInsights()->license->get_network_license_key() ) {
+	    if ( MonsterInsights()->license->network_license_expired() ) {
+	    	// Translators: Adds a link to renew license.
+		$message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->network_license_disabled() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->network_license_invalid() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	}
+	if ( ! empty( $message ) ) {
+	    echo '<div class="error"><p>'. $message.'</p></div>';
+	    return;
+	}
     }
 
     // 4. Notices for PHP/WP version deprecations
     if ( current_user_can( 'update_core' ) ) {
-        global $wp_version;
-
-        // PHP 5.2-5.5
-        if ( version_compare( phpversion(), '5.6', '<' ) ) {
-            $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
-            // Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break.
-            $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-            echo '<div class="error"><p>'. $message.'</p></div>';
-            return;
-        }
-        // WordPress 3.0 - 4.5
-        else if ( version_compare( $wp_version, '4.9', '<' ) ) {
-            $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
-            // Translators: Placeholders add the current WordPress version and links to the MonsterInsights blog
-            $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in 2020.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-            echo '<div class="error"><p>'. $message.'</p></div>';
-            return;
-        }
-        // PHP 5.4/5.5
-        // else if ( version_compare( phpversion(), '5.6', '<' ) ) {
-        //  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
-        //  $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-        //  echo '<div class="error"><p>'. $message.'</p></div>';
-        //  return;
-        // }
-        // // WordPress 4.6 - 4.8
-        // else if ( version_compare( $wp_version, '4.9', '<' ) ) {
-        //  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
-        //  $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in October, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-        //  echo '<div class="error"><p>'. $message.'</p></div>';
-        //  return;
-        // }
+	global $wp_version;
+
+	// PHP 5.2-5.5
+	if ( version_compare( phpversion(), '5.6', '<' ) ) {
+	    $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
+	    // Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break.
+	    $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+	    echo '<div class="error"><p>'. $message.'</p></div>';
+	    return;
+	}
+	// WordPress 3.0 - 4.5
+	else if ( version_compare( $wp_version, '4.9', '<' ) ) {
+	    $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
+	    // Translators: Placeholders add the current WordPress version and links to the MonsterInsights blog
+	    $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in 2020.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+	    echo '<div class="error"><p>'. $message.'</p></div>';
+	    return;
+	}
+	// PHP 5.4/5.5
+	// else if ( version_compare( phpversion(), '5.6', '<' ) ) {
+	//  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
+	//  $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+	//  echo '<div class="error"><p>'. $message.'</p></div>';
+	//  return;
+	// }
+	// // WordPress 4.6 - 4.8
+	// else if ( version_compare( $wp_version, '4.9', '<' ) ) {
+	//  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
+	//  $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in October, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+	//  echo '<div class="error"><p>'. $message.'</p></div>';
+	//  return;
+	// }
     }
 
     // 5. Optin setting not configured
@@ -430,7 +430,7 @@ 
 
     $notices   = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     // 6. Authenticate, not manual
@@ -474,75 +474,75 @@ 
 
     // 8. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    // Translators: Placeholders add a link to the MonsterInsights website.
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            echo '<style type="text/css">.monsterinsights-wooedd-upsell-left{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-right{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-image{width:100%;height:auto;padding:20px}.monsterinsights-wooedd-upsell-image-small{display:none}.monsterinsights-wooedd-upsell-row{display:table}.monsterinsights-wooedd-upsell-left p{margin:1em 0;font-size:16px}@media (max-width:900px){.monsterinsights-wooedd-upsell-left{width:100%}.monsterinsights-wooedd-upsell-right{display:none}.monsterinsights-wooedd-upsell-image-small{display:block}.monsterinsights-wooedd-upsell-image-large{display:none}}</style>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    // Translators: Placeholders add a link to the MonsterInsights website.
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    echo '<style type="text/css">.monsterinsights-wooedd-upsell-left{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-right{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-image{width:100%;height:auto;padding:20px}.monsterinsights-wooedd-upsell-image-small{display:none}.monsterinsights-wooedd-upsell-row{display:table}.monsterinsights-wooedd-upsell-left p{margin:1em 0;font-size:16px}@media (max-width:900px){.monsterinsights-wooedd-upsell-left{width:100%}.monsterinsights-wooedd-upsell-right{display:none}.monsterinsights-wooedd-upsell-image-small{display:block}.monsterinsights-wooedd-upsell-image-large{display:none}}</style>';
+	    return;
+	}
     }
 
     // 9. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    return;
+	}
     }
 
     if ( isset( $notices['monsterinsights_cross_domains_extracted'] ) && false === $notices['monsterinsights_cross_domains_extracted'] ) {
-        $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $page = $page . '#/advanced';
-        // Translators: Adds a link to the settings panel.
-        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
-        return;
+	$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
+	$page = $page . '#/advanced';
+	// Translators: Adds a link to the settings panel.
+	$message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
+	echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
+	return;
     }
 }
 add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' );
@@ -552,7 +552,7 @@ 
 // AM Notices
 function monsterinsights_am_notice_optout( $super_admin ) {
     if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) {
-        return false;
+	return false;
     }
     return $super_admin;
 }

Spacing +29 added lines, -29 removed lines

@@ -28,13 +28,13 @@ 
 
     if ( $hook === 'monsterinsights_settings' ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
+        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543' );
 
         add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
@@ -121,7 +121,7 @@ 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
     $hook = 'monsterinsights_network';
     $submenu_base = add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) );
-    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  $menu_icon_inline, '100.00013467543' );
+    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', $menu_icon_inline, '100.00013467543' );
 
     add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
@@ -170,7 +170,7 @@ 
 function monsterinsights_add_admin_body_class_tools_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
 
-    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id  ) {
+    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id ) {
         return $classes;
     }
 
@@ -186,7 +186,7 @@ 
  */
 function monsterinsights_add_admin_body_class_addons_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
-    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id  ) {
+    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id ) {
         return $classes;
     }
 
@@ -202,15 +202,15 @@ 
  * @return array $links
  */
 function monsterinsights_add_action_links( $links ) {
-    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="'. monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
+    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) . '">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
     array_unshift( $links, $docs );
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     }
 
@@ -224,7 +224,7 @@ 
 
 	// If lite, show a link where they can get pro from
 	if ( ! monsterinsights_is_pro_version() ) {
-		$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) .'" style="font-weight:700">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+		$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) . '" style="font-weight:700">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
 		array_unshift( $links, $get_pro );
 	}
 
@@ -249,14 +249,14 @@ 
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
 
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
 
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     }
@@ -264,7 +264,7 @@ 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
 
@@ -284,7 +284,7 @@ 
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
         // Translators: Placeholders add a link to the wordpress.org repository.
-        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -325,7 +325,7 @@ 
         $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
         $urltwo    = $submenu_base . '#/about/getting-started';
         $message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
-        echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
+        echo '<div class="notice notice-info"><p style="font-weight:700">' . $title . '</p><p>' . $message . '</p><p><a href="' . $urlone . '" class="button-primary">' . $primary . '</a>&nbsp;&nbsp;&nbsp;<a href="' . $urltwo . '" class="button-secondary">' . $secondary . '</a></p></div>';
         return;
     }
 
@@ -334,18 +334,18 @@ 
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
         // Translators: Adds a link to retrieve the license.
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
 	            // Translators: Adds a link to the license renewal.
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
                 $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->site_license_invalid() ) {
@@ -354,7 +354,7 @@ 
         } else if ( MonsterInsights()->license->get_network_license_key() ) {
             if ( MonsterInsights()->license->network_license_expired() ) {
             	// Translators: Adds a link to renew license.
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->network_license_disabled() ) {
                 $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->network_license_invalid() ) {
@@ -362,7 +362,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -376,7 +376,7 @@ 
             $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
             // Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break.
             $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
         // WordPress 3.0 - 4.5
@@ -384,7 +384,7 @@ 
             $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
             // Translators: Placeholders add the current WordPress version and links to the MonsterInsights blog
             $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in 2020.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
         // PHP 5.4/5.5
@@ -428,7 +428,7 @@ 
     //     }
     // }
 
-    $notices   = get_option( 'monsterinsights_notices' );
+    $notices = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
         $notices = array();
     }
@@ -474,7 +474,7 @@ 
 
     // 8. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -494,7 +494,7 @@ 
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
                     // Translators: Placeholders add a link to the MonsterInsights website.
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) . '">', ' &raquo;</a>' );
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -507,7 +507,7 @@ 
 
     // 9. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -526,7 +526,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) . '">', ' &raquo;</a>' );
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -540,8 +540,8 @@ 
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
         $page = $page . '#/advanced';
         // Translators: Adds a link to the settings panel.
-        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>' . $message . '</p></div>';
         return;
     }
 }

includes/admin/routes.php

Spacing +24 added lines, -24 removed lines

@@ -64,7 +64,7 @@ 
 			return;
 		}
 
-		$site_license    = array(
+		$site_license = array(
 			'key'         => MonsterInsights()->license->get_site_license_key(),
 			'type'        => MonsterInsights()->license->get_site_license_type(),
 			'is_disabled' => MonsterInsights()->license->site_license_disabled(),
@@ -124,8 +124,8 @@ 
 		// Array fields are needed even if empty.
 		$array_fields = array( 'view_reports', 'save_settings', 'ignore_users' );
 		foreach ( $array_fields as $array_field ) {
-			if ( ! isset( $options[ $array_field ] ) ) {
-				$options[ $array_field ] = array();
+			if ( ! isset( $options[$array_field] ) ) {
+				$options[$array_field] = array();
 			}
 		}
 		if ( isset( $options['custom_code'] ) ) {
@@ -260,7 +260,7 @@ 
 						}
 					}
 					if ( $empty ) {
-						unset( $value[ $key ] );
+						unset( $value[$key] );
 					}
 				}
 			}
@@ -310,7 +310,7 @@ 
 				} else {
 					$addon = $this->get_addon( $installed_plugins, $addons_type, $addon, $slug );
 				}
-				$parsed_addons[ $addon->slug ] = $addon;
+				$parsed_addons[$addon->slug] = $addon;
 			}
 		}
 
@@ -404,7 +404,7 @@ 
 			'slug'      => 'wp-mail-smtp',
 		);
 		// SeedProd.
-		$parsed_addons['coming-soon']    = array(
+		$parsed_addons['coming-soon'] = array(
 			'active'    => function_exists( 'seed_csp4_activation' ),
 			'icon'      => plugin_dir_url( MONSTERINSIGHTS_PLUGIN_FILE ) . 'assets/images/plugin-seedprod.png',
 			'title'     => 'SeedProd',
@@ -414,7 +414,7 @@ 
 			'slug'      => 'coming-soon',
 		);
 		// RafflePress
-		$parsed_addons['rafflepress']    = array(
+		$parsed_addons['rafflepress'] = array(
 			'active'    => function_exists( 'rafflepress_lite_activation' ),
 			'icon'      => plugin_dir_url( MONSTERINSIGHTS_PLUGIN_FILE ) . 'assets/images/pluign-rafflepress.png',
 			'title'     => 'RafflePress',
@@ -486,7 +486,7 @@ 
 		$installed       = false;
 		$plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug );
 
-		if ( isset( $installed_plugins[ $plugin_basename ] ) ) {
+		if ( isset( $installed_plugins[$plugin_basename] ) ) {
 			$installed = true;
 
 			if ( is_multisite() && is_network_admin() ) {
@@ -501,8 +501,8 @@ 
 
 		$active_version = false;
 		if ( $active ) {
-			if ( ! empty( $installed_plugins[ $plugin_basename ]['Version'] ) ) {
-				$active_version = $installed_plugins[ $plugin_basename ]['Version'];
+			if ( ! empty( $installed_plugins[$plugin_basename]['Version'] ) ) {
+				$active_version = $installed_plugins[$plugin_basename]['Version'];
 			}
 		}
 
@@ -637,8 +637,8 @@ 
 		);
 
 		foreach ( $exclude as $e ) {
-			if ( ! empty( $new_settings[ $e ] ) ) {
-				unset( $new_settings[ $e ] );
+			if ( ! empty( $new_settings[$e] ) ) {
+				unset( $new_settings[$e] );
 			}
 		}
 
@@ -649,8 +649,8 @@ 
 		}
 
 		foreach ( $exclude as $e ) {
-			if ( ! empty( $settings[ $e ] ) ) {
-				$new_settings = $settings[ $e ];
+			if ( ! empty( $settings[$e] ) ) {
+				$new_settings = $settings[$e];
 			}
 		}
 
@@ -810,7 +810,7 @@ 
 			),
 			admin_url( 'admin.php' )
 		);
-		$url    = esc_url( $url );
+		$url = esc_url( $url );
 
 		ob_start();
 		if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
@@ -916,7 +916,7 @@ 
 			$homepage = get_option( 'page_on_front' );
 			if ( ! $homepage ) {
 				$array[] = array(
-					'id'    => - 1,
+					'id'    => -1,
 					'title' => __( 'Homepage', 'google-analytics-for-wordpress' ),
 				);
 			}
@@ -990,7 +990,7 @@ 
 			if ( ! post_type_supports( $post_type->name, 'editor' ) || 'product' === $post_type->name ) {
 				continue;
 			}
-			$post_types_parsed[ $post_type->name ] = $post_type->labels->singular_name;
+			$post_types_parsed[$post_type->name] = $post_type->labels->singular_name;
 		}
 
 		$post_types_parsed = apply_filters( 'monsterinsights_vue_post_types_editor', $post_types_parsed );
@@ -1112,18 +1112,18 @@ 
 			$value        = sanitize_text_field( wp_unslash( $_POST['value'] ) ); // Value of custom style like 12px or #fff.
 			$settings     = get_option( $settings_key, array() );
 
-			if ( ! isset( $settings[ $type ] ) ) {
-				$settings[ $type ] = array();
+			if ( ! isset( $settings[$type] ) ) {
+				$settings[$type] = array();
 			}
-			if ( ! isset( $settings[ $type ][ $theme ] ) ) {
-				$settings[ $type ][ $theme ] = array();
+			if ( ! isset( $settings[$type][$theme] ) ) {
+				$settings[$type][$theme] = array();
 			}
 
-			if ( ! isset( $settings[ $type ][ $theme ][ $object ] ) ) {
-				$settings[ $type ][ $theme ][ $object ] = array();
+			if ( ! isset( $settings[$type][$theme][$object] ) ) {
+				$settings[$type][$theme][$object] = array();
 			}
 
-			$settings[ $type ][ $theme ][ $object ][ $key ] = $value;
+			$settings[$type][$theme][$object][$key] = $value;
 
 			update_option( $settings_key, $settings );