awesomemotive / google-analytics-for-wordpress

includes/admin/common.php

Spacing +22 added lines, -22 removed lines

@@ -353,7 +353,7 @@ 
 		'kad_admin_js', // Pinnacle theme
 		'dt-chart', // DesignThemes core features plugin
 		'tweeetshare_font_script', // TweetShare - Click To Tweet
-		'tweeetshare_jquery_script',  // TweetShare - Click To Tweet
+		'tweeetshare_jquery_script', // TweetShare - Click To Tweet
 		'tweeetshare_jqueryui_script', // TweetShare - Click To Tweet
 		'tweeetshare_custom_script', // TweetShare - Click To Tweet
 		'imagify-promise-polyfill', // Imagify
@@ -372,16 +372,16 @@ 
 		'rml-modal', // WP Real Media Library
 		'rml-order', // WP Real Media Library
 		'rml-meta', // WP Real Media Library
-		'rml-uploader',  // WP Real Media Library
-		'rml-options',  // WP Real Media Library
-		'rml-usersettings',  // WP Real Media Library
+		'rml-uploader', // WP Real Media Library
+		'rml-options', // WP Real Media Library
+		'rml-usersettings', // WP Real Media Library
 		'rml-main', // WP Real Media Library
 		'control-panel-sweet-alert', // Ken Theme
 		'sweet-alert-js', // Vitrine Theme
 		'theme-admin-script', // Vitrine Theme
 		'sweetalert', //  Church Suite Theme by Webnus
 		'be_alerts_charts', //  WooCommerce bolder product alerts
-		'magayo-lottery-results',  //  Magayo Lottery Results
+		'magayo-lottery-results', //  Magayo Lottery Results
 		'control-panel-sweet-alert', // Ken Theme
 		'cpm_chart', // WP Project Manager
 		'adminscripts', //  Artisan Nayma Theme
@@ -472,20 +472,20 @@ 
 
 	global $wp_styles;
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( strpos( $wp_styles->registered[ $handle ]->src, 'wp-content' ) === false ) {
+		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 
-		if ( strpos( $wp_styles->registered[ $handle ]->handle, 'monsterinsights' ) !== false ) {
+		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
 		foreach ( $third_party as $partial ) {
-			if ( strpos( $wp_styles->registered[ $handle ]->handle, $partial ) !== false ) {
+			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
 				break;
-			} else if ( strpos( $wp_styles->registered[ $handle ]->src, $partial ) !== false ) {
+			} else if ( strpos( $wp_styles->registered[$handle]->src, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
 				break;
@@ -495,20 +495,20 @@ 
 
 	global $wp_scripts;
 	foreach ( $wp_scripts->queue as $handle ) {
-		if ( strpos( $wp_scripts->registered[ $handle ]->src, 'wp-content' ) === false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 
-		if ( strpos( $wp_scripts->registered[ $handle ]->handle, 'monsterinsights' ) !== false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
 		foreach ( $third_party as $partial ) {
-			if ( strpos( $wp_scripts->registered[ $handle ]->handle, $partial ) !== false ) {
+			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
 				break;
-			} else if ( strpos( $wp_scripts->registered[ $handle ]->src, $partial ) !== false ) {
+			} else if ( strpos( $wp_scripts->registered[$handle]->src, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
 				break;
@@ -582,14 +582,14 @@ 
 		foreach ( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
 				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
@@ -599,14 +599,14 @@ 
 		foreach ( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
 				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
@@ -616,14 +616,14 @@ 
 		foreach ( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
 				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
@@ -684,10 +684,10 @@ 
 	// Put together redirect URL
 	$url = add_query_arg(
 		array(
-			'utm_source'   => $source,   // Pro/Lite Plugin
-			'utm_medium'   => sanitize_key( $medium ),   // Area of MonsterInsights (example Reports)
+			'utm_source'   => $source, // Pro/Lite Plugin
+			'utm_medium'   => sanitize_key( $medium ), // Area of MonsterInsights (example Reports)
 			'utm_campaign' => sanitize_key( $campaign ), // Which link (example eCommerce Report)
-			'utm_content'  => $content,  // Version number of MI
+			'utm_content'  => $content, // Version number of MI
 		),
 		trailingslashit( $url )
 	);

googleanalytics.php

Spacing +14 added lines, -14 removed lines

@@ -347,11 +347,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 ) );
 		}
 	}
 
@@ -371,7 +371,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
@@ -410,7 +410,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' );
 		}
 		?>
@@ -431,7 +431,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' );
 		}
 		?>
@@ -457,7 +457,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();
 	}
 
 
@@ -471,7 +471,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();
@@ -640,7 +640,7 @@ 
 			$instance->api_auth->delete_auth();
 
 			// Delete data
-			$instance->reporting->delete_aggregate_data('site');
+			$instance->reporting->delete_aggregate_data( 'site' );
 
 			restore_current_blog();
 		}
@@ -648,22 +648,22 @@ 
 		$instance->api_auth->uninstall_network_auth();
 
 		// Delete network data
-		$instance->reporting->delete_aggregate_data('network');
+		$instance->reporting->delete_aggregate_data( 'network' );
 	} else {
 		// Delete auth
 		$instance->api_auth->delete_auth();
 
 		// Delete data
-		$instance->reporting->delete_aggregate_data('site');
+		$instance->reporting->delete_aggregate_data( 'site' );
 	}
 
 	// Clear notification cron schedules
 	$schedules = wp_get_schedules();
 
-	if  ( is_array( $schedules ) && ! empty( $schedules ) ) {
+	if ( is_array( $schedules ) && ! empty( $schedules ) ) {
 		foreach ( $schedules as $key => $value ) {
-			if ( 0 === strpos($key, "monsterinsights_notification_") ) {
-				$cron_hook = implode("_", explode( "_", $key, -2 ) ) . '_cron';
+			if ( 0 === strpos( $key, "monsterinsights_notification_" ) ) {
+				$cron_hook = implode( "_", explode( "_", $key, -2 ) ) . '_cron';
 				wp_clear_scheduled_hook( $cron_hook );
 			}
 		}
@@ -754,7 +754,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/helpers.php

Spacing +39 added lines, -39 removed lines

@@ -32,8 +32,8 @@ 
 		$user = new WP_User( $user_id );
 	}
 
-	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
+	$track_user = true;
+	$roles = monsterinsights_get_option( 'ignore_users', array() );
 
 	if ( ! empty( $roles ) && is_array( $roles ) ) {
 		foreach ( $roles as $role ) {
@@ -182,7 +182,7 @@ 
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+	return rand( 100000000, 999999999 ) . '.' . time();
 }
 
 
@@ -202,7 +202,7 @@ 
 		$stop = time();
 	}
 
-	$diff = (int) abs( $stop -  $start );
+	$diff = (int) abs( $stop - $start );
 	$hours = round( $diff / HOUR_IN_SECONDS );
 	return $hours;
 }
@@ -260,7 +260,7 @@ 
 	$editable_roles = apply_filters( 'editable_roles', $all_roles );
 
 	foreach ( $editable_roles as $id => $name ) {
-		$roles[ $id ] = translate_user_role( $name['name'] );
+		$roles[$id] = translate_user_role( $name['name'] );
 	}
 
 	return $roles;
@@ -286,7 +286,7 @@ 
 
 	foreach ( $editable_roles as $id => $role ) {
 		if ( isset( $role['capabilities']['manage_options'] ) && $role['capabilities']['manage_options'] ) {
-			$roles[ $id ] = translate_user_role( $role['name'] );
+			$roles[$id] = translate_user_role( $role['name'] );
 		}
 	}
 
@@ -332,7 +332,7 @@ 
 
 		}
 		if ( substr_count( $host, '.' ) > 1 ) {
-			$subdomains_to_check =  array( 'dev.', '*.staging.', 'beta.', 'test.' );
+			$subdomains_to_check = array( 'dev.', '*.staging.', 'beta.', 'test.' );
 			foreach ( $subdomains_to_check as $subdomain ) {
 				$subdomain = str_replace( '.', '(.)', $subdomain );
 				$subdomain = str_replace( array( '*', '(.)' ), '(.*)', $subdomain );
@@ -348,16 +348,16 @@ 
 
 // Set cookie to expire in 2 years
 function monsterinsights_get_cookie_expiration_date( $time ) {
-	return date('D, j F Y H:i:s', time() + $time );
+	return date( 'D, j F Y H:i:s', time() + $time );
 }
 
 function monsterinsights_string_ends_with( $string, $ending ) {
-	$strlen = strlen($string);
-	$endinglen = strlen($ending);
+	$strlen = strlen( $string );
+	$endinglen = strlen( $ending );
 	if ( $endinglen > $strlen ) {
 		return false;
 	}
-	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
+	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen ) === 0;
 }
 
 function monsterinsights_string_starts_with( $string, $start ) {
@@ -887,11 +887,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'api.monsterinsights.com/v2/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -935,7 +935,7 @@ 
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists( 'remove_class_filter' ) ) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -956,7 +956,7 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[$tag] ) ) return FALSE;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -965,33 +965,33 @@ 
 		 *
 		 * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
 		 */
-		if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-			$callbacks = &$wp_filter[ $tag ]->callbacks;
+		if ( is_object( $wp_filter[$tag] ) && isset( $wp_filter[$tag]->callbacks ) ) {
+			$callbacks = &$wp_filter[$tag]->callbacks;
 		} else {
-			$callbacks = &$wp_filter[ $tag ];
+			$callbacks = &$wp_filter[$tag];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[$priority] ) || empty( $callbacks[$priority] ) ) return FALSE;
 		// Loop through each filter for the specified priority, looking for our class & method
-		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
+		foreach ( (array) $callbacks[$priority] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter['function'] ) || ! is_array( $filter['function'] ) ) continue;
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter['function'][0] ) ) continue;
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter['function'][1] !== $method_name ) continue;
 			// Method matched, now let's check the Class
-			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
+			if ( get_class( $filter['function'][0] ) === $class_name ) {
 				// Now let's remove it from the array
-				unset( $callbacks[ $priority ][ $filter_id ] );
+				unset( $callbacks[$priority][$filter_id] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[$priority] ) ) unset( $callbacks[$priority] );
 				// and if the only filter for that tag, set the tag to an empty array
 				if ( empty( $callbacks ) ) $callbacks = array();
 				// If using WordPress older than 4.7
-				if ( ! is_object( $wp_filter[ $tag ] ) ) {
+				if ( ! is_object( $wp_filter[$tag] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
-					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
+					unset( $GLOBALS['merged_filters'][$tag] );
 				}
 				return TRUE;
 			}
@@ -1000,7 +1000,7 @@ 
 	}
 } // End function exists
 
-if ( ! function_exists ( 'remove_class_action' ) ) {
+if ( ! function_exists( 'remove_class_action' ) ) {
 	/**
 	 * Remove Class Action Without Access to Class Object
 	 *
@@ -1070,7 +1070,7 @@ 
 		}
 
 		foreach ( $translations->entries as $msgid => $entry ) {
-			$locale[ $msgid ] = $entry->translations;
+			$locale[$msgid] = $entry->translations;
 		}
 
 		return $locale;
@@ -1213,7 +1213,7 @@ 
 
 		$pattern = '/UA-[0-9-]+/';
 		if ( isset( $options['ga-UID'] ) && preg_match( $pattern, $options['ga-UID'] ) ) {
-			++ $count;
+			++$count;
 		}
 	}
 
@@ -1224,7 +1224,7 @@ 
 
 		$pattern = '/UA-[0-9-]+/';
 		if ( ! empty( $code ) && preg_match( $pattern, $code ) ) {
-			++ $count;
+			++$count;
 		}
 	}
 
@@ -1443,22 +1443,22 @@ 
  *
  * @return trimed sentence
  */
-function monsterinsights_trim_text( $text, $count ){
-	$text 	= str_replace("  ", " ", $text);
-	$string = explode(" ", $text);
+function monsterinsights_trim_text( $text, $count ) {
+	$text = str_replace( "  ", " ", $text );
+	$string = explode( " ", $text );
 	$trimed = "";
 
 	for ( $wordCounter = 0; $wordCounter <= $count; $wordCounter++ ) {
 		$trimed .= isset( $string[$wordCounter] ) ? $string[$wordCounter] : '';
 
-		if ( $wordCounter < $count ){
+		if ( $wordCounter < $count ) {
 			$trimed .= " ";
 		} else {
 			$trimed .= "...";
 		}
 	}
 
-	$trimed = trim($trimed);
+	$trimed = trim( $trimed );
 
 	return $trimed;
 }
@@ -1534,7 +1534,7 @@ 
 	$monsterinsights_reference = isset( $_GET['monsterinsights_reference'] ) ? $_GET['monsterinsights_reference'] : '';
 
 	if ( 'post-new.php' === $pagenow && 'pretty-link' === $post_type && 'url_builder' === $monsterinsights_reference ) {
-		$onboard  = get_option( 'prli_onboard' );
+		$onboard = get_option( 'prli_onboard' );
 
 		if ( $onboard == 'welcome' || $onboard == 'update' ) {
 			update_option( 'monsterinsights_backup_prli_onboard_value', $onboard );
@@ -1554,7 +1554,7 @@ 
 	$post_type = isset( $_GET['post_type'] ) ? $_GET['post_type'] : '';
 
 	if ( 'edit.php' === $pagenow && 'pretty-link' === $post_type ) {
-		$onboard   = get_option( 'monsterinsights_backup_prli_onboard_value' );
+		$onboard = get_option( 'monsterinsights_backup_prli_onboard_value' );
 
 		if ( class_exists( 'PrliBaseController' ) && ( $onboard == 'welcome' || $onboard == 'update' ) ) {
 			update_option( 'prli_onboard', $onboard );

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

Spacing +13 added lines, -13 removed lines

@@ -98,8 +98,8 @@ 
 
 		if ( $create && ! empty( $create ) && is_array( $create ) ) {
 			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+			$create = str_replace( '"', "'", $create );
+			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "', " . $create;
 		} else {
 			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
 		}
@@ -191,37 +191,37 @@ 
 	 * @return string Javascript to output.
 	 */
 	public function frontend_output( ) {
-		$options        = $this->frontend_tracking_options();
+		$options = $this->frontend_tracking_options();
 		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
-		$compat_mode     = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
+		$compat_mode = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
 		$compat    	 	= $compat_mode ? 'window.ga = __gaTracker;' : '';
 		$track_user 	= monsterinsights_track_user();
 		$ua         	= monsterinsights_get_ua();
 		$output     	= '';
 		$reason     	= '';
-		$attr_string    = monsterinsights_get_frontend_analytics_script_atts();
+		$attr_string = monsterinsights_get_frontend_analytics_script_atts();
 		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 ( ! $track_user ) {
 	if ( empty( $ua ) ) {
 		$reason = __( 'Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-		$reason = __( 'Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'. PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+		$reason = __( 'Note: MonsterInsights does not track you as a logged-in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.' . PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else {
 		$reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	}
 	echo $output;
 } ?>
 <?php if ( $ua ) { ?>
-<script<?php echo $attr_string;?>>
+<script<?php echo $attr_string; ?>>
     (window.gaDevIds=window.gaDevIds||[]).push("dZGIzZG");
 	var mi_version         = '<?php echo MONSTERINSIGHTS_VERSION; ?>';
 	var mi_track_user      = <?php echo ( $track_user ? 'true' : 'false' ); ?>;
-	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason)  . "'": "''" ); ?>;
+	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason ) . "'" : "''" ); ?>;
 	<?php do_action( 'monsterinsights_tracking_analytics_frontend_output_after_mi_track_user' ); ?>
 
 <?php if ( $this->should_do_optout() ) { ?>
@@ -275,7 +275,7 @@ 
 	?>
 	} else {
 <?php if ( $this->should_do_optout() ) { ?>
-		console.log( "<?php echo esc_js( $reason );?>" );
+		console.log( "<?php echo esc_js( $reason ); ?>" );
 		(function() {
 			/* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */
 			var noopfn = function() {
@@ -298,7 +298,7 @@ 
 				}
 				var f = arguments[len-1];
 				if ( typeof f !== 'object' || f === null || typeof f.hitCallback !== 'function' ) {
-					console.log( '<?php echo esc_js( __("Not running function", "google-analytics-for-wordpress" ) );?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) );?> " + mi_no_track_reason );
+					console.log( '<?php echo esc_js( __( "Not running function", "google-analytics-for-wordpress" ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) ); ?> " + mi_no_track_reason );
 					return;
 				}
 				try {

includes/measurement-protocol.php

Spacing +9 added lines, -9 removed lines

@@ -22,16 +22,16 @@ 
 
 	$defaults = array(
 		't'  => 'event', // Required: Hit type
-		'ec' => '',      // Optional: Event category
-		'ea' => '', 	 // Optional: Event Action
-		'el' => '', 	 // Optional: Event Label
-		'ev' => null, 	 // Optional: Event Value
+		'ec' => '', // Optional: Event category
+		'ea' => '', // Optional: Event Action
+		'el' => '', // Optional: Event Label
+		'ev' => null, // Optional: Event Value
 	);
 
-	$body  = array_merge( $defaults , $args );
+	$body = array_merge( $defaults, $args );
 
 	// We want to get the user's IP address when possible
-	$ip     = '';
+	$ip = '';
 	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) && ! filter_var( $_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP ) === false ) {
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
 	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) && ! filter_var( $_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) === false ) {
@@ -79,7 +79,7 @@ 
 		'uip' => $ip,
 
 		// Optional: User Agent
-		'ua'  => ! empty( $user_agent ) ?  $user_agent : $_SERVER['HTTP_USER_AGENT'],
+		'ua'  => ! empty( $user_agent ) ? $user_agent : $_SERVER['HTTP_USER_AGENT'],
 
 		// Optional: Time of the event
 		'z'   => time(),
@@ -100,7 +100,7 @@ 
 	// Unset empty values to reduce request size
 	foreach ( $body as $key => $value ) {
 		if ( empty( $value ) ) {
-			unset( $body[ $key ] );
+			unset( $body[$key] );
 		}
 	}
 
@@ -138,7 +138,7 @@ 
 		// Optional: Event Value
 		'ev' => null,
 	);
-	$args  = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
 	//$args = apply_filters( 'monsterinsights_mp_track_event_call', $args );
 
 	return monsterinsights_mp_api_call( $args );

includes/popular-posts/class-popular-posts-themes.php

Spacing +7 added lines, -7 removed lines

@@ -64,7 +64,7 @@ 
 		if ( method_exists( $this, 'get_themes_' . $type ) ) {
 			$this->themes = call_user_func( array( $this, 'get_themes_' . $type ) );
 			if ( ! empty( $theme ) ) {
-				$this->theme = isset( $this->themes[ $theme ] ) ? $this->themes[ $theme ] : array();
+				$this->theme = isset( $this->themes[$theme] ) ? $this->themes[$theme] : array();
 
 				return $this->theme;
 			} else {
@@ -114,14 +114,14 @@ 
 
 		$settings = $this->get_theme_stored_styles();
 
-		if ( ! empty( $settings[ $type ] ) ) {
+		if ( ! empty( $settings[$type] ) ) {
 			foreach ( $themes as $theme_key => $theme_values ) {
-				if ( ! empty( $settings[ $type ][ $theme_key ] ) ) {
-					foreach ( $themes[ $theme_key ]['styles'] as $object => $props ) {
-						if ( ! empty( $settings[ $type ][ $theme_key ][ $object ] ) ) {
+				if ( ! empty( $settings[$type][$theme_key] ) ) {
+					foreach ( $themes[$theme_key]['styles'] as $object => $props ) {
+						if ( ! empty( $settings[$type][$theme_key][$object] ) ) {
 							foreach ( $props as $style_key => $style_value ) {
-								if ( ! empty( $settings[ $type ][ $theme_key ][ $object ][ $style_key ] ) ) {
-									$themes[ $theme_key ]['styles'][ $object ][ $style_key ] = $settings[ $type ][ $theme_key ][ $object ][ $style_key ];
+								if ( ! empty( $settings[$type][$theme_key][$object][$style_key] ) ) {
+									$themes[$theme_key]['styles'][$object][$style_key] = $settings[$type][$theme_key][$object][$style_key];
 								}
 							}
 						}

includes/popular-posts/class-popular-posts.php

Spacing +9 added lines, -9 removed lines

@@ -521,13 +521,13 @@ 
 						continue;
 					}
 
-					if ( ! empty( $atts[ $atts_key ] ) ) {
-						if ( is_bool( $atts[ $atts_key ] ) || 'on' === $atts[ $atts_key ] ) {
+					if ( ! empty( $atts[$atts_key] ) ) {
+						if ( is_bool( $atts[$atts_key] ) || 'on' === $atts[$atts_key] ) {
 							continue;
 						}
 						if ( 'size' === $style_key ) {
-							$style_key         = 'font-size';
-							$atts[ $atts_key ] .= 'px';
+							$style_key = 'font-size';
+							$atts[$atts_key] .= 'px';
 						}
 						if ( 'background' === $style_key || 'background' === $element && 'color' === $style_key ) {
 							$style_key = 'background-color';
@@ -535,7 +535,7 @@ 
 						if ( 'border' === $element || 'border' === $style_key ) {
 							$style_key = 'border-color';
 						}
-						$style_css .= $style_key . ':' . $atts[ $atts_key ] . ';';
+						$style_css .= $style_key . ':' . $atts[$atts_key] . ';';
 					}
 				}
 			}
@@ -558,11 +558,11 @@ 
 
 		$class = get_called_class();
 
-		if ( ! isset( self::$instances[ $class ] ) ) {
-			self::$instances[ $class ] = new $class;
+		if ( ! isset( self::$instances[$class] ) ) {
+			self::$instances[$class] = new $class;
 		}
 
-		return self::$instances[ $class ];
+		return self::$instances[$class];
 
 	}
 
@@ -723,7 +723,7 @@ 
 	public function get_themes_styles_for_output() {
 
 		$stored_styles = $this->get_theme_props()->get_theme_stored_styles();
-		$themes        = ! empty( $stored_styles[ $this->type ] ) && is_array( $stored_styles[ $this->type ] ) ? $stored_styles[ $this->type ] : array();
+		$themes        = ! empty( $stored_styles[$this->type] ) && is_array( $stored_styles[$this->type] ) ? $stored_styles[$this->type] : array();
 
 		return $themes;
 

includes/admin/admin.php

Indentation +176 added lines, -176 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' ) );
@@ -56,7 +56,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.
@@ -67,9 +67,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';
     }
 }
 
@@ -80,12 +80,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();
@@ -116,7 +116,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 ";
@@ -133,7 +133,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 ";
@@ -149,7 +149,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 ";
@@ -169,17 +169,17 @@ 
 
     // 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/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $get_pro );
+	$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/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $get_pro );
     }
 
     // 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() ) {
@@ -208,26 +208,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;
@@ -244,9 +244,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;
 }
@@ -257,12 +257,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:
@@ -280,89 +280,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 2 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 2 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
@@ -392,7 +392,7 @@ 
 
     $notices   = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     // 6. Authenticate, not manual
@@ -436,75 +436,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' );
@@ -514,7 +514,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;
 }

includes/admin/notification-event.php

Indentation +3 added lines, -3 removed lines

@@ -229,9 +229,9 @@
 		$schedule['minute'] = rand( 0, 59 );
 		$schedule['second'] = rand( 0, 59 );
 		$schedule['offset'] = ( $schedule['day'] * DAY_IN_SECONDS ) +
-		                      ( $schedule['hour'] * HOUR_IN_SECONDS ) +
-		                      ( $schedule['minute'] * MINUTE_IN_SECONDS ) +
-		                      $schedule['second'];
+				      ( $schedule['hour'] * HOUR_IN_SECONDS ) +
+				      ( $schedule['minute'] * MINUTE_IN_SECONDS ) +
+				      $schedule['second'];
 		$date               = strtotime( $this->notification_first_run_time ) + $schedule['offset'];
 
 		return $date;

Spacing +8 added lines, -8 removed lines

@@ -126,14 +126,14 @@ 
 			$this->notification_recurrence_name = $this->notification_id . '_' . $this->notification_interval . '_days';
 			$this->notification_id              = $this->notification_id . '_' . time();
 			$this->notification_active_for      = date( "m/d/Y", strtotime( "+" . ( $this->notification_interval - 2 ) . " day" ) );
-			$this->report_start_from            = "-". $this->notification_interval ." day";
+			$this->report_start_from            = "-" . $this->notification_interval . " day";
 
-			if( ! isset( $this->notification_first_run_time ) || empty( $this->notification_first_run_time ) ) {
-				$this->notification_first_run_time = "+". $this->notification_interval ." day";
+			if ( ! isset( $this->notification_first_run_time ) || empty( $this->notification_first_run_time ) ) {
+				$this->notification_first_run_time = "+" . $this->notification_interval . " day";
 			}
 
-			if( ! isset( $this->notification_icon ) || empty( $this->notification_icon ) ) {
-				$this->notification_icon        = '<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+			if ( ! isset( $this->notification_icon ) || empty( $this->notification_icon ) ) {
+				$this->notification_icon = '<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <circle cx="16" cy="16" r="16" fill="#D3F8EA"/>
 <path d="M21.8634 18.6429C21.8634 18.8571 21.7831 19.0268 21.6224 19.1518C21.5688 19.3482 21.542 19.6786 21.542 20.1429C21.542 20.6071 21.5688 20.9375 21.6224 21.1339C21.7831 21.2768 21.8634 21.4464 21.8634 21.6429V22.0714C21.8634 22.25 21.8009 22.4018 21.6759 22.5268C21.5509 22.6518 21.3992 22.7143 21.2206 22.7143H12.4349C11.7206 22.7143 11.1134 22.4643 10.6134 21.9643C10.1134 21.4643 9.86345 20.8571 9.86345 20.1429V11.5714C9.86345 10.8571 10.1134 10.25 10.6134 9.75C11.1134 9.25 11.7206 9 12.4349 9H21.2206C21.3992 9 21.5509 9.0625 21.6759 9.1875C21.8009 9.3125 21.8634 9.46429 21.8634 9.64286V18.6429ZM13.292 12.5893V13.125C13.292 13.2321 13.3456 13.2857 13.4527 13.2857H19.1313C19.2384 13.2857 19.292 13.2321 19.292 13.125V12.5893C19.292 12.4821 19.2384 12.4286 19.1313 12.4286H13.4527C13.3456 12.4286 13.292 12.4821 13.292 12.5893ZM13.292 14.3036V14.8393C13.292 14.9464 13.3456 15 13.4527 15H19.1313C19.2384 15 19.292 14.9464 19.292 14.8393V14.3036C19.292 14.1964 19.2384 14.1429 19.1313 14.1429H13.4527C13.3456 14.1429 13.292 14.1964 13.292 14.3036ZM20.0688 21C20.0152 20.4286 20.0152 19.8571 20.0688 19.2857H12.4349C12.2027 19.2857 11.9974 19.375 11.8188 19.5536C11.6581 19.7143 11.5777 19.9107 11.5777 20.1429C11.5777 20.375 11.6581 20.5804 11.8188 20.7589C11.9974 20.9196 12.2027 21 12.4349 21H20.0688Z" fill="#1EC185"/>
 </svg>';
@@ -232,7 +232,7 @@ 
 		                      ( $schedule['hour'] * HOUR_IN_SECONDS ) +
 		                      ( $schedule['minute'] * MINUTE_IN_SECONDS ) +
 		                      $schedule['second'];
-		$date               = strtotime( $this->notification_first_run_time ) + $schedule['offset'];
+		$date = strtotime( $this->notification_first_run_time ) + $schedule['offset'];
 
 		return $date;
 	}
@@ -266,7 +266,7 @@ 
 		$notification['start']   = $this->notification_active_from;
 		$notification['end']     = $this->notification_active_for;
 
-		$notification_data =  apply_filters( $this->notification_id, $notification );
+		$notification_data = apply_filters( $this->notification_id, $notification );
 
 		if ( is_array( $notification_data ) && ! empty( $notification_data ) ) {
 			MonsterInsights()->notifications->add( $notification_data );
@@ -284,7 +284,7 @@ 
 	 *
 	 * @since 7.12.3
 	 */
-	public function get_report( $report_name="overview", $report_start_from="-30 day", $report_end_to="-1 day" ) {
+	public function get_report( $report_name = "overview", $report_start_from = "-30 day", $report_end_to = "-1 day" ) {
 		// get overview report data
 		$data      = array();
 		$report    = MonsterInsights()->reporting->get_report( $report_name );