awesomemotive / google-analytics-for-wordpress

googleanalytics.php

Spacing +14 added lines, -14 removed lines

@@ -227,7 +227,7 @@ 
 				self::$instance->notices          = new MonsterInsights_Notice_Admin();
 				self::$instance->license_actions  = new MonsterInsights_License_Actions();
 				self::$instance->reporting 	      = new MonsterInsights_Reporting();
-				self::$instance->api_auth    	  = new MonsterInsights_API_Auth();
+				self::$instance->api_auth = new MonsterInsights_API_Auth();
 				if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 					self::$instance->require_updater();
 				} else {
@@ -351,19 +351,19 @@ 
 		}
 
 		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( 'GAWP_PATH' ) ) {
-			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR  );
+			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR );
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) );
 		}
 
 		if ( ! defined( 'GAWP_URL' ) ) {
-			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL  );
+			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL );
 		}
 	}	
 
@@ -383,7 +383,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
@@ -440,7 +440,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' );
 		}
 		?>
@@ -461,7 +461,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' );
 		}
 		?>
@@ -487,7 +487,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();
 	}
 
 
@@ -501,7 +501,7 @@ 
 	 * 
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php';
 			self::$instance->license = new MonsterInsights_License();
@@ -672,7 +672,7 @@ 
 		$instance->api_auth->delete_auth();
 
 		// Delete network data
-		$instance->reporting->delete_aggregate_data('network');
+		$instance->reporting->delete_aggregate_data( 'network' );
 
 		// Delete network license
 		$instance->license->delete_network_license();
@@ -686,7 +686,7 @@ 
 			$instance->api_auth->delete_auth();
 
 			// Delete data
-			$instance->reporting->delete_aggregate_data('site');
+			$instance->reporting->delete_aggregate_data( 'site' );
 
 			// Delete license
 			$instance->license->delete_site_license();
@@ -698,7 +698,7 @@ 
 		$instance->api_auth->delete_auth();
 
 		// Delete data
-		$instance->reporting->delete_aggregate_data('site');
+		$instance->reporting->delete_aggregate_data( 'site' );
 
 		// Delete license
 		$instance->license->delete_site_license();
@@ -793,7 +793,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' );
 }
 

Braces +2 added lines, -2 removed lines

@@ -501,7 +501,7 @@ 
 	 * 
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php';
 			self::$instance->license = new MonsterInsights_License();
@@ -793,7 +793,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' );
 }
 

lite/includes/admin/reports/report-ecommerce.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

lite/includes/admin/reports/report-publisher.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

includes/admin/admin.php

Indentation +139 added lines, -139 removed lines

@@ -33,24 +33,24 @@ 
     $hook = 'monsterinsights_settings';
 
     if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
-        // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
-        $hook = 'monsterinsights_settings';
+	// If dashboards disabled, first settings page
+	add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+	$hook = 'monsterinsights_settings';
 
-        add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
-        add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
+	add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
+	add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
-        // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+	// if dashboards enabled, first dashboard
+	add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
-        $hook = 'monsterinsights_reports';
+	$hook = 'monsterinsights_reports';
 
-        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, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
+	// then settings page
+	add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
 
-        add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
+	add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
 
     }
     
@@ -60,7 +60,7 @@ 
     // then addons
     $network_key = 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:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' );
+	add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' );
     }
 }
 add_action( 'admin_menu', 'monsterinsights_admin_menu' );
@@ -74,12 +74,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;
     }
 
     $hook = 'monsterinsights_network';
@@ -103,7 +103,7 @@ 
 function monsterinsights_add_admin_body_class( $classes ) {
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return $classes;
+	return $classes;
     }
        
     return "$classes monsterinsights_page ";
@@ -123,17 +123,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="https://www.monsterinsights.com/lite/">' . 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="https://www.monsterinsights.com/lite/">' . 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="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="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="https://wordpress.org/support/plugin/google-analytics-for-wordpress">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );      
+	$support = '<a title="MonsterInsights Lite Support" href="https://wordpress.org/support/plugin/google-analytics-for-wordpress">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );      
     }
 
     $settings_link = '<a href="' . esc_url( admin_url( 'admin.php?page=monsterinsights_settings' ) ) . '">' . esc_html__( 'Settings', 'google-analytics-for-wordpress' ) . '</a>';
@@ -158,26 +158,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;
@@ -193,15 +193,15 @@ 
     // Get the current screen, and check whether we're viewing a MonsterInsights screen;
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return;
+	return;
     }
 
     // If here, we're on an MonsterInsights screen, so output the header.
     monsterinsights_load_admin_partial( 'header', array(
-        'mascot'   => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ),
-        'logo'     => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ),
-        '2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', MonsterInsights()->file ),
-        '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
+	'mascot'   => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ),
+	'logo'     => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ),
+	'2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', MonsterInsights()->file ),
+	'2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
     ) );
 }
 add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
@@ -209,7 +209,7 @@ 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
     if ( ! get_transient( '_monsterinsights_activation_redirect' ) ) {
-        return;
+	return;
     }
 
     // Delete the redirect transient
@@ -217,15 +217,15 @@ 
 
     // Bail if activating from network, or bulk
     if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-        return;
+	return;
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
     if( ! $upgrade ) { // First time install
-        //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
+	//wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
-        return;
-        //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
+	return;
+	//wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
 }
 //add_action( 'admin_init', 'monsterinsights_welcome_redirect', 11 ); @todo: Investigate
@@ -241,8 +241,8 @@ 
 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';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+	$url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
+	$text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -253,12 +253,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:
@@ -271,45 +271,45 @@ 
 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
-        $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = admin_url( 'admin.php?page=monsterinsights_settings' );
+	$message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</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' );
-        $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' );
+	$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() ) {
-                $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="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() ) {
-                $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="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() ) {
+		$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="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() ) {
+		$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="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. Optin setting not configured
@@ -339,7 +339,7 @@ 
 
     $notices   = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     // 5. Authenticate, not manual
@@ -347,12 +347,12 @@ 
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
     if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
-        echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
-            echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
-            echo '</p>';
-        echo '</div>';
-        return;
+	echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
+	    echo '<p>';
+	    echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+	    echo '</p>';
+	echo '</div>';
+	return;
     }
 
     // 6. Automatic updates not configured
@@ -372,64 +372,64 @@ 
 
     // 7. 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>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=woocommercelite">', ' &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_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>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=woocommercelite">', ' &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;
+	}
     }
 
     // 8. 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="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=eddlite">', ' &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="https://www.monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=eddlite">', ' &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;
+	}
     }
 }
 add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' );

Spacing +21 added lines, -21 removed lines

@@ -34,14 +34,14 @@ 
 
     if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
         add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
         $hook = 'monsterinsights_reports';
 
@@ -83,7 +83,7 @@ 
     }
 
     $hook = 'monsterinsights_network';
-    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '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' );
 
@@ -123,7 +123,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="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $get_pro );
     }   
     
@@ -161,14 +161,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;
         }   
     }
@@ -176,7 +176,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;
     }
                 
@@ -204,7 +204,7 @@ 
         '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
     ) );
 }
-add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
+add_action( 'in_admin_header', 'monsterinsights_admin_header', 100 );
 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
@@ -221,7 +221,7 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if ( ! $upgrade ) { // First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
         return;
@@ -242,7 +242,7 @@ 
     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';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%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">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -272,8 +272,8 @@ 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
         $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ), '<a href="' . $page . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
@@ -281,15 +281,15 @@ 
     $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' );
-        $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() ) {
                 $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
@@ -307,7 +307,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -337,7 +337,7 @@ 
     //     }
     // }
 
-    $notices   = get_option( 'monsterinsights_notices' );
+    $notices = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
         $notices = array();
     }
@@ -346,10 +346,10 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual'] ) ) { 
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
         return;
@@ -372,7 +372,7 @@ 
 
     // 7. 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>';
@@ -403,7 +403,7 @@ 
 
     // 8. 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>';

Braces +8 added lines, -6 removed lines

@@ -221,9 +221,11 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if( ! $upgrade ) {
+// First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
-    } else { // Update
+    } else {
+// Update
         return;
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
@@ -289,7 +291,7 @@ 
     // 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() ) {
                 $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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
@@ -346,7 +348,7 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) {
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
             echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
@@ -372,7 +374,7 @@ 
 
     // 7. 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>';
@@ -403,7 +405,7 @@ 
 
     // 8. 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>';

includes/api-request.php

Spacing +14 added lines, -14 removed lines

@@ -136,21 +136,21 @@ 
 		$this->method    = $method;
 
 		$default_token   = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token();
-		$default_key     = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_key()   : MonsterInsights()->auth->get_key();
+		$default_key     = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_key() : MonsterInsights()->auth->get_key();
 		
 		
-		$this->token     = ! empty( $args['token'] )     ? $args['token']  : $default_token;
-		$this->key       = ! empty( $args['key'] ) 	     ? $args['key']    : $default_key;
-		$this->tt        = ! empty( $args['tt'] ) 		 ? $args['tt']     : '';
-		$this->return    = ! empty( $args['return'] )    ? $args['return'] : '';
-		$this->start     = ! empty( $args['start'] )	 ? $args['start']  : '';
-		$this->end       = ! empty( $args['end'] )  	 ? $args['end']    : '';
+		$this->token     = ! empty( $args['token'] ) ? $args['token'] : $default_token;
+		$this->key       = ! empty( $args['key'] ) ? $args['key'] : $default_key;
+		$this->tt        = ! empty( $args['tt'] ) ? $args['tt'] : '';
+		$this->return    = ! empty( $args['return'] ) ? $args['return'] : '';
+		$this->start     = ! empty( $args['start'] ) ? $args['start'] : '';
+		$this->end       = ! empty( $args['end'] ) ? $args['end'] : '';
 
 		// We need to do this hack so that the network panel + the site_url of the main site are distinct
 		$this->site_url  = is_network_admin() ? network_admin_url() : site_url();
 
 		if ( monsterinsights_is_pro_version() ) {
-			$this->license   = is_network_admin() || ( ! empty( $args['network'] ) && $args['network'] ) ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
+			$this->license = is_network_admin() || ( ! empty( $args['network'] ) && $args['network'] ) ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
 		}
 		$this->plugin    = MonsterInsights()->plugin_slug;
 		$this->miversion = MONSTERINSIGHTS_VERSION;
@@ -220,12 +220,12 @@ 
 		}
 
 		if ( 'GET' == $this->method ) {
-			$body['time']   = time(); // just to avoid caching
+			$body['time'] = time(); // just to avoid caching
 		}
 
-		$body['timezone'] = date('e');
+		$body['timezone'] = date( 'e' );
 
-		$body['ip']   = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
+		$body['ip'] = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
 
 		// This filter will be removed in the future.
 		$body   = apply_filters( 'monsterinsights_api_request_body', $body );
@@ -269,7 +269,7 @@ 
 
 		// If not a 200 status header, send back error.
 		if ( 200 != $response_code ) {
-			$type  = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
+			$type = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
 			
 			if ( empty( $response_code ) ) {
 				return new WP_Error( $type, __( 'The API was unreachable.', 'google-analytics-for-wordpress' ) );
@@ -374,7 +374,7 @@ 
 						'body'          => ''
 					);
 					$response = wp_remote_get( $testurl, $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+					if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 						return false;
 					} else {
 						return true;
@@ -392,7 +392,7 @@ 
 			);
 			$response = wp_remote_get( $testurl, $params );
 			
-			if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 				return false;
 			} else {
 				return true;

includes/admin/reports/overview.php

Braces +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Outputs the report.
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		ob_start();
 		if ( ! empty( $data['overviewgraph']['count'] ) && $data['overviewgraph']['count'] > 0 ) {
 			?>
@@ -508,7 +508,7 @@ 
 						foreach( $data['countries'] as $icountry => $countrydata ) {
 							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
-							} else { 
+							} else {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
 							$i++;

Spacing +47 added lines, -47 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Outputs the report.
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		ob_start();
 		if ( ! empty( $data['overviewgraph']['count'] ) && $data['overviewgraph']['count'] > 0 ) {
 			?>
@@ -97,7 +97,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['sessions']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['sessions']['prev'] ) ) . '%'; ?>
@@ -124,7 +124,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['pageviews']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['pageviews']['prev'] ) ) . '%'; ?>
@@ -151,10 +151,10 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['duration']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
-					<?php echo esc_html( absint(  $data['infobox']['duration']['prev'] ) ) . '%'; ?>
+					<?php echo esc_html( absint( $data['infobox']['duration']['prev'] ) ) . '%'; ?>
 				</div>
 				<?php } ?>
 				<div class="monsterinsights-reports-infobox-compare">
@@ -178,7 +178,7 @@ 
 					<img src="<?php echo $upred; ?>" srcset="<?php echo $upred2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['bounce']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $downgrn; ?>" srcset="<?php echo $downgrn2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['bounce']['prev'] ) ) . '%'; ?>
@@ -190,12 +190,12 @@ 
 			  </div>
 			</div>
 		<?php } ?>
-		<?php if ( ! empty( $data['newvsreturn'] ) &&  ! empty( $data['devices'] ) ) { ?>
+		<?php if ( ! empty( $data['newvsreturn'] ) && ! empty( $data['devices'] ) ) { ?>
 			<div class="monsterinsights-reports-2-column-container row">
 			  <div class="monsterinsights-reports-2-column-item col-md-6">
 				<div class="monsterinsights-reports-2-column-panel panel monsterinsights-pie-chart-panel chart-panel">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This graph shows what percent of your user sessions come from new versus repeat visitors.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-pie-graph monsterinsights-clear">
@@ -285,8 +285,8 @@ 
 										}],
 										values: [<?php echo esc_js( $data['newvsreturn']['new'] ); ?>,<?php echo esc_js( $data['newvsreturn']['returning'] ); ?> ],
 										labels: [
-											"<?php echo esc_js( __('New', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Returning', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'New', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Returning', 'google-analytics-for-wordpress' ) ); ?>",
 										]
 									},
 									options: {
@@ -344,7 +344,7 @@ 
 			<div class="monsterinsights-reports-2-column-item col-md-6">
 				<div class="monsterinsights-reports-2-column-panel panel monsterinsights-pie-chart-panel chart-panel">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Device Breakdown', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Device Breakdown', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Device Breakdown', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This graph shows what percent of your visitor sessions are done using a traditional computer or laptop, tablet or mobile device to view your site.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-pie-graph monsterinsights-clear">
@@ -436,9 +436,9 @@ 
 										}],
 										values: [<?php echo esc_js( $data['devices']['desktop'] ); ?>,<?php echo esc_js( $data['devices']['tablet'] ); ?>,<?php echo esc_js( $data['devices']['mobile'] ); ?>  ],
 										labels: [
-											"<?php echo esc_js( __('Desktop', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Tablet', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Mobile', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Desktop', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Tablet', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Mobile', 'google-analytics-for-wordpress' ) ); ?>",
 										]
 									},
 									options: {
@@ -496,12 +496,12 @@ 
 			</div>
 		<?php } ?>
 
-		<?php if ( ! empty( $data['countries'] ) &&  ! empty( $data['referrals'] ) ) { ?>
+		<?php if ( ! empty( $data['countries'] ) && ! empty( $data['referrals'] ) ) { ?>
 			<div class="monsterinsights-reports-2-column-container row">
 			  <div class="monsterinsights-reports-2-column-item col-md-6 list-has-icons">
 				<div class="monsterinsights-reports-2-column-panel panel nopadding">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Top 10 Countries', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Top 10 Countries', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Top 10 Countries', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the top countries your website visitors are from.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-list">
@@ -509,11 +509,11 @@ 
 						<?php 
 						$countries = monsterinsights_get_country_list( true );
 						$i = 1;
-						foreach( $data['countries'] as $icountry => $countrydata ) {
-							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+						foreach ( $data['countries'] as $icountry => $countrydata ) {
+							if ( ! empty( $countries[$countrydata['iso']] ) ) {
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[$countrydata['iso']] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							} else { 
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
 							$i++;
 						}
@@ -521,35 +521,35 @@ 
 						</ul>
 					</div>
 					<?php 
-					$referral_url = 'https://analytics.google.com/analytics/web/#report/visitors-geo/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+					$referral_url = 'https://analytics.google.com/analytics/web/#report/visitors-geo/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 					?>
 					<div class="monsterinsights-reports-panel-footer">
-						<a href="<?php echo $referral_url; ?>" target="_blank"  title="<?php echo esc_html__( 'View Full Countries Report', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Countries Report', 'google-analytics-for-wordpress' );?></a>
+						<a href="<?php echo $referral_url; ?>" target="_blank"  title="<?php echo esc_html__( 'View Full Countries Report', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Countries Report', 'google-analytics-for-wordpress' ); ?></a>
 					</div>
 				</div>
 			  </div>
 			  <div class="monsterinsights-reports-2-column-item col-md-6 list-has-icons">
 				<div class="monsterinsights-reports-2-column-panel panel nopadding">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Referrals', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Referrals', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Referrals', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the top websites that send your website traffic, known as "referral traffic".', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-list">
 						<ul class="monsterinsights-reports-referral-list list-group">
 						<?php
 						$i = 1;
-						foreach( $data['referrals'] as $ireferrals => $referralsdata ) {
-								echo '<li class="list-group-item">'.
+						foreach ( $data['referrals'] as $ireferrals => $referralsdata ) {
+								echo '<li class="list-group-item">' .
 										'<span class="monsterinsights-reports-list-count">'
 											. $i .
-										'</span>'.
-										'<img class="monsterinsights-reports-referral-icon"  src="https://www.google.com/s2/favicons?domain=' . $referralsdata['url'] . '" width="16px" height="16px" />'.
+										'</span>' .
+										'<img class="monsterinsights-reports-referral-icon"  src="https://www.google.com/s2/favicons?domain=' . $referralsdata['url'] . '" width="16px" height="16px" />' .
 										'<span class="monsterinsights-reports-list-text">' 
 											. $referralsdata['url'] . 
 										'</span>
 										<span class="monsterinsights-reports-list-number">'
 											. number_format_i18n( $referralsdata['sessions'] ) . 
-										'</span>'.
+										'</span>' .
 									'</li>';
 							$i++;
 						}
@@ -557,10 +557,10 @@ 
 						</ul>
 					</div>
 					<?php 
-					$referral_url = 'https://analytics.google.com/analytics/web/#report/trafficsources-referrals/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+					$referral_url = 'https://analytics.google.com/analytics/web/#report/trafficsources-referrals/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 					?>
 					<div class="monsterinsights-reports-panel-footer">
-						<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' );?></a>
+						<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' ); ?></a>
 					</div>
 				</div>
 			  </div>
@@ -570,7 +570,7 @@ 
 		<?php if ( ! empty( $data['toppages'] ) ) { ?>
 			<div class="monsterinsights-reports-1-column-row panel row container-fluid nopadding list-no-icons" style="position: relative;">
 				<div class="monsterinsights-reports-panel-title">
-					<?php echo esc_html__( 'Top Posts / Pages', 'google-analytics-for-wordpress' );?>
+					<?php echo esc_html__( 'Top Posts / Pages', 'google-analytics-for-wordpress' ); ?>
 				</div>
 				
 				<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Top Posts / Pages', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the most viewed posts and pages on your website.', 'google-analytics-for-wordpress' ) ); ?>"></div>
@@ -578,23 +578,23 @@ 
 					<ul class="monsterinsights-reports-pages-list list-group">
 						<?php
 						$i = 1;
-						foreach( $data['toppages'] as $itoppages => $toppagesdata ) {
-								$hide     = $i > 10 ? ' style="display: none;" ': '';
+						foreach ( $data['toppages'] as $itoppages => $toppagesdata ) {
+								$hide     = $i > 10 ? ' style="display: none;" ' : '';
 								$protocol = is_ssl() ? 'https://' : 'http://';
-								$opening  = ! empty( $toppagesdata['url'] ) && ! empty( $toppagesdata['hostname'] ) ? '<a href="' . $protocol . esc_attr( $toppagesdata['hostname'] . $toppagesdata['url'] ) .'" target="_blank">' : '';
+								$opening  = ! empty( $toppagesdata['url'] ) && ! empty( $toppagesdata['hostname'] ) ? '<a href="' . $protocol . esc_attr( $toppagesdata['hostname'] . $toppagesdata['url'] ) . '" target="_blank">' : '';
 								$closing = ! empty( $opening ) ? '</a>' : '';
-								echo '<li class="list-group-item  monsterinsights-listing-table-row"'. $hide . '>'.
+								echo '<li class="list-group-item  monsterinsights-listing-table-row"' . $hide . '>' .
 										'<span class="monsterinsights-reports-list-count">'
 											. $i .
-										'. </span>&nbsp;'.
+										'. </span>&nbsp;' .
 										'<span class="monsterinsights-reports-list-text">' 
 											. $opening
 											. $toppagesdata['title']
 											. $closing .
-										'</span>'.
+										'</span>' .
 										'<span class="monsterinsights-reports-list-number">' . 
 											number_format_i18n( $toppagesdata['sessions'] ) . 
-										'</span>'.
+										'</span>' .
 									'</li>';
 							$i++;
 						}
@@ -602,16 +602,16 @@ 
 					</ul>
 				</div>
 				<?php 
-				$referral_url = 'https://analytics.google.com/analytics/web/#report/content-pages/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+				$referral_url = 'https://analytics.google.com/analytics/web/#report/content-pages/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 				?>
 				<div class="monsterinsights-reports-panel-footer monsterinsights-reports-panel-footer-large">
-					<?php echo esc_html__( 'Show', 'google-analytics-for-wordpress' );?>&nbsp;
-					<div class="monsterinsights-reports-show-selector-group btn-group" role="group" aria-label="<?php echo esc_html__( 'How many to show', 'google-analytics-for-wordpress' );?>">
+					<?php echo esc_html__( 'Show', 'google-analytics-for-wordpress' ); ?>&nbsp;
+					<div class="monsterinsights-reports-show-selector-group btn-group" role="group" aria-label="<?php echo esc_html__( 'How many to show', 'google-analytics-for-wordpress' ); ?>">
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button ten btn btn-default active" disabled="disabled">10</button>
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button twentyfive btn btn-default">25</button>
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button fifty btn btn-default">50</button>
 					</div>
-					<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button alignright" style="margin-right: 20px;"><?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' );?></a>
+					<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button alignright" style="margin-right: 20px;"><?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' ); ?></a>
 				</div>
 			</div>
 		<?php } ?>
@@ -648,7 +648,7 @@ 
 
 		ob_start(); ?>
 		<div class="monsterinsights-reports-box-datagraph" style="position:relative;">
-			<canvas id="monsterinsights-overview-<?php echo $class;?>" width="400px" height="400px"></canvas>
+			<canvas id="monsterinsights-overview-<?php echo $class; ?>" width="400px" height="400px"></canvas>
 			<script>
 				jQuery(document).ready(function() {
 					if ( window.uorigindetected != null){
@@ -679,7 +679,7 @@ 
 						   }
 						});
 						
-						var ctx = document.getElementById("monsterinsights-overview-<?php echo $class;?>");
+						var ctx = document.getElementById("monsterinsights-overview-<?php echo $class; ?>");
 						var data = {
 							labels: [<?php echo implode( ', ', $labels ); ?>],
 							datasets: [
@@ -704,8 +704,8 @@ 
 									pointHoverRadius: 6,//The radius of the point when hovered.
 
 
-									labels: [<?php echo implode( ', ', $labels );   ?>],
-									data: [<?php echo implode( ', ', $datapoints );   ?>],
+									labels: [<?php echo implode( ', ', $labels ); ?>],
+									data: [<?php echo implode( ', ', $datapoints ); ?>],
 									trend: [<?php echo implode( ', ', $trendpoints ); ?>],
 								},
 							]
@@ -787,7 +787,7 @@ 
 						  });
 						};
 
-						var MonsterInsightsOverview<?php echo time();?> = new Chart(ctx, {
+						var MonsterInsightsOverview<?php echo time(); ?> = new Chart(ctx, {
 							type: 'LineWithLine',
 							data: data,
 							plugins: [{

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

includes/admin/settings/register-settings.php

Spacing +26 added lines, -26 removed lines

@@ -176,13 +176,13 @@ 
 			)
 		),
 		/** Demographics Settings */
-		'demographics' => apply_filters('monsterinsights_settings_demographics',
+		'demographics' => apply_filters( 'monsterinsights_settings_demographics',
 			array(
 				'demographics' => array(
 					'id'          => 'demographics',
 					'name'        => __( 'Enable Demographics and Interests Reports for Remarketing and Advertising', 'google-analytics-for-wordpress' ),
 					'desc'        => sprintf( esc_html__( 'Check this setting to add the Demographics and Remarketing features to your Google Analytics tracking code. Make sure to enable Demographics and Remarketing in your Google Analytics account. We have a guide for how to do that in our %1$sknowledge base%2$s. For more information about Remarketing, we refer you to %3$sGoogle\'s documentation%2$s. Note that usage of this function is affected by privacy and cookie laws around the world. Be sure to follow the laws that affect your target audience.', 'google-analytics-for-wordpress' ), '<a href="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
-									'</a>','<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
+									'</a>', '<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
 					),
 					'type' 		  => 'checkbox',
 				),
@@ -195,7 +195,7 @@ 
 			)
 		),
 		/** Enhanced Link Attribution Settings */
-		'links' => apply_filters('monsterinsights_settings_links',
+		'links' => apply_filters( 'monsterinsights_settings_links',
 			array(
 				'enhanced_link_attribution' => array(
 					'id'          => 'enhanced_link_attribution',
@@ -230,7 +230,7 @@ 
 			)
 		),
 		/** File Download Settings */
-		'files' => apply_filters('monsterinsights_settings_files',
+		'files' => apply_filters( 'monsterinsights_settings_files',
 			array(
 				'track_download_as' => array(
 					'id'          => 'track_download_as',
@@ -252,7 +252,7 @@ 
 			)
 		),
 		/** Affiliate Tracking Settings */
-		'affiliates' => apply_filters('monsterinsights_settings_affiliates',
+		'affiliates' => apply_filters( 'monsterinsights_settings_affiliates',
 			array(
 				'track_internal_as_outbound' => array(
 					'id'          => 'track_internal_as_outbound',
@@ -269,68 +269,68 @@ 
 			)
 		),
 		/** Social Tracking Settings */
-		'social' => apply_filters('monsterinsights_settings_social',
+		'social' => apply_filters( 'monsterinsights_settings_social',
 			array()
 		),
 		/** Ad Tracking Settings */
-		'ads' => apply_filters('monsterinsights_settings_ads',
+		'ads' => apply_filters( 'monsterinsights_settings_ads',
 			array()
 		),
 		/** Forms Tracking Settings */
-		'forms' => apply_filters('monsterinsights_settings_forms',
+		'forms' => apply_filters( 'monsterinsights_settings_forms',
 			array()
 		),
 		/** eCommerce Tracking Settings */
-		'ecommerce' => apply_filters('monsterinsights_settings_ecommerce',
+		'ecommerce' => apply_filters( 'monsterinsights_settings_ecommerce',
 			array()
 		),
 		/** Media Tracking Settings */
-		'media' => apply_filters('monsterinsights_settings_media',
+		'media' => apply_filters( 'monsterinsights_settings_media',
 			array()
 		),
 		/** Members Tracking Settings */
-		'memberships' => apply_filters('monsterinsights_settings_memberships',
+		'memberships' => apply_filters( 'monsterinsights_settings_memberships',
 			array()
 		),
 		/** Dimensions Tracking Settings */
-		'dimensions' => apply_filters('monsterinsights_settings_dimensions',
+		'dimensions' => apply_filters( 'monsterinsights_settings_dimensions',
 			array()
 		),
 		/** Performance Tracking Settings */
-		'performance' => apply_filters('monsterinsights_settings_performance',
+		'performance' => apply_filters( 'monsterinsights_settings_performance',
 			array()
 		),
 		/** AMP Tracking Settings */
-		'amp' => apply_filters('monsterinsights_settings_amp',
+		'amp' => apply_filters( 'monsterinsights_settings_amp',
 			array()
 		),
 		/** Google Optimize Tracking Settings */
-		'goptimize' => apply_filters('monsterinsights_settings_goptimize',
+		'goptimize' => apply_filters( 'monsterinsights_settings_goptimize',
 			array()
 		),
 		/** Facebook Instant Articles Tracking Settings */
-		'fbia' => apply_filters('monsterinsights_settings_fbia',
+		'fbia' => apply_filters( 'monsterinsights_settings_fbia',
 			array()
 		),
 		/** Bounce Reduction Settings */
-		'bounce' => apply_filters('monsterinsights_settings_bounce',
+		'bounce' => apply_filters( 'monsterinsights_settings_bounce',
 			array()
 		),
 		/** Reporting Tracking Settings */
-		'reporting' => apply_filters('monsterinsights_settings_reporting',
+		'reporting' => apply_filters( 'monsterinsights_settings_reporting',
 			array()
 		),
 		/** Notifications Tracking Settings */
-		'notifications' => apply_filters('monsterinsights_settings_notifications',
+		'notifications' => apply_filters( 'monsterinsights_settings_notifications',
 			array()
 		),
 		/** Compatibility Tracking Settings */
-		'compatibility' => apply_filters('monsterinsights_settings_compatibility',
+		'compatibility' => apply_filters( 'monsterinsights_settings_compatibility',
 			array(
 				'subdomain_tracking' => array(
 					'id'          => 'subdomain_tracking',
 					'name'        => __( 'Domain to track as:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' ,'</a>' ),
+					'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ),
 					'type' 		  => 'text',
 				),
 				'custom_code' => array(
@@ -342,22 +342,22 @@ 
 				'debug_mode' => array(
 					'id'          => 'debug_mode',
 					'name'        => __( 'Enable Debug Mode', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress'),
+					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress' ),
 					'type' 		  => 'checkbox',
 				),
 			)
 		),
 		/** EU Compliance Tracking Settings */
-		'eucompliance' => apply_filters('monsterinsights_settings_eucompliance',
+		'eucompliance' => apply_filters( 'monsterinsights_settings_eucompliance',
 			array()
 		),
 		/** Permissions Tracking Settings */
-		'permissions' => apply_filters('monsterinsights_settings_permissions',
+		'permissions' => apply_filters( 'monsterinsights_settings_permissions',
 			array(
 				'view_reports' => array(
 					'id'          => 'view_reports',
 					'name'        => __( 'Let these user roles see reports:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>'),
+					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>' ),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,
@@ -367,7 +367,7 @@ 
 				'save_settings' => array(
 					'id'          => 'save_settings',
 					'name'        => __( 'Let these user roles save settings:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>' ),
+					'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>' ),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,

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

Spacing +16 added lines, -16 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 ) . "'";
 		}
@@ -175,22 +175,22 @@ 
 	 */
 	public function frontend_output( ) {
 		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
+		$is_debug_mode  = monsterinsights_is_debug_mode();
+		$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
 		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src       = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+			$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
 		}
 		$compat     	= monsterinsights_get_option( 'gatracker_compatibility_mode', false );
-		$compat    	 	= $compat ? 'window.ga = __gaTracker;' : '';
+		$compat = $compat ? 'window.ga = __gaTracker;' : '';
 		$track_user 	= monsterinsights_track_user();
 		$ua         	= monsterinsights_get_ua();
 		$output     	= '';
 		$reason     	= '';
 		$cookie_notice  = class_exists( 'Cookie_Notice' );
-		$attributes     = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false'  ) );
+		$attributes     = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false' ) );
 		$attr_string    = '';
 		if ( ! empty( $attributes ) ) {
-			foreach( $attributes as $attr_name => $attr_value ) {
+			foreach ( $attributes as $attr_name => $attr_value ) {
 	 			if ( ! empty( $attr_name ) ) {
 	 				$attr_string .= ' ' . sanitize_key( $attr_name ) . '="' . esc_attr( $attr_value ) . '"';
 	 			} else {
@@ -204,20 +204,20 @@ 
 <?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; ?>>
 	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() ) { ?>
@@ -265,7 +265,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() {
@@ -288,7 +288,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 {