awesomemotive / google-analytics-for-wordpress

includes/admin/admin.php

Indentation +17 added lines, -17 removed lines

@@ -467,26 +467,26 @@
     $profile = is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile() : MonsterInsights()->auth->get_analytics_profile();
 
     if ( !empty($profile['ua']) && empty($profile['v4']) && !monsterinsights_is_own_admin_page() ) {
-        $title = __('Urgent: Your Website is Not Tracking Any Google Analytics Data!', 'google-analytics-for-wordpress');
-        $message = __('Google Analytics 3 (UA) and support was sunset on July 1, 2023. Your website is currently NOT tracking any analytics. </br>Create or connect a new Google Analytics 4 property immediately to start tracking.', 'google-analytics-for-wordpress');
+	$title = __('Urgent: Your Website is Not Tracking Any Google Analytics Data!', 'google-analytics-for-wordpress');
+	$message = __('Google Analytics 3 (UA) and support was sunset on July 1, 2023. Your website is currently NOT tracking any analytics. </br>Create or connect a new Google Analytics 4 property immediately to start tracking.', 'google-analytics-for-wordpress');
 
-        $wizard_url     = admin_url('admin.php?page=monsterinsights-onboarding');
+	$wizard_url     = admin_url('admin.php?page=monsterinsights-onboarding');
 
-        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_ua_sunset">';
-        echo '<p><strong>' . $title . '</strong></p>';
-        echo '<p>' . $message . '</p>';
-        echo '<p>';
-        echo '<a href="https://www.monsterinsights.com/docs/connect-google-analytics/"
+	echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_ua_sunset">';
+	echo '<p><strong>' . $title . '</strong></p>';
+	echo '<p>' . $message . '</p>';
+	echo '<p>';
+	echo '<a href="https://www.monsterinsights.com/docs/connect-google-analytics/"
                    target="_blank" rel="noopener noreferrer">' .
-            __( 'Learn How to Create a GA4 Property', 'google-analytics-for-wordpress' ) .
-            '</a><br>';
-        echo '<a href="' . $wizard_url . '">' .
-            __( 'Connect a Property', 'google-analytics-for-wordpress' ) .
-            '</a><br>';
-        echo '</p>';
-        echo '</div>';
-
-        return;
+	    __( 'Learn How to Create a GA4 Property', 'google-analytics-for-wordpress' ) .
+	    '</a><br>';
+	echo '<a href="' . $wizard_url . '">' .
+	    __( 'Connect a Property', 'google-analytics-for-wordpress' ) .
+	    '</a><br>';
+	echo '</p>';
+	echo '</div>';
+
+	return;
     }
 
 	$is_plugins_page = 'plugins' === get_current_screen()->id;

Spacing +193 added lines, -193 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if (!defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -27,7 +27,7 @@ 
 {
 	$hook             = monsterinsights_get_menu_hook();
 	$menu_icon_inline = monsterinsights_get_inline_menu_icon();
-	$new_indicator     = sprintf(
+	$new_indicator = sprintf(
 		'<span class="monsterinsights-menu-new-indicator">&nbsp;%s</span>',
 		__( 'NEW', 'google-analytics-for-wordpress' )
 	);
@@ -38,15 +38,15 @@ 
 		$menu_notification_indicator = MonsterInsights()->notifications->get_license_expired_indicator();
 	}
 
-	if ($hook === 'monsterinsights_settings') {
+	if ( $hook === 'monsterinsights_settings' ) {
 		// If dashboards disabled, first settings page
-		add_menu_page(__('MonsterInsights', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress') . $menu_notification_indicator, 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543');
+		add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . $menu_notification_indicator, 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543' );
 		$hook = 'monsterinsights_settings';
 
-		add_submenu_page($hook, __('MonsterInsights', 'google-analytics-for-wordpress'), __('Settings', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_settings');
+		add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
 	} else {
 		// if dashboards enabled, first dashboard
-		add_menu_page(__('General:', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress') . $menu_notification_indicator, 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543');
+		add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . $menu_notification_indicator, 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543' );
 
 		if ( ! MonsterInsights()->setup_checklist->is_dismissed() ) {
 			add_submenu_page( $hook, __( 'Setup Checklist', 'google-analytics-for-wordpress' ), __( 'Setup Checklist', 'google-analytics-for-wordpress' ) . MonsterInsights()->setup_checklist->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings#/setup-checklist', 'monsterinsights_settings_page' );
@@ -73,7 +73,7 @@ 
 		}
 	}
 
-	$submenu_base = add_query_arg('page', 'monsterinsights_settings', admin_url('admin.php'));
+	$submenu_base = add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
 
     //  Site Notes
 	add_submenu_page( $hook, __( 'Site Notes:', 'google-analytics-for-wordpress' ), __( 'Site Notes', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', $submenu_base . '#/site-notes' );
@@ -102,113 +102,113 @@ 
 		$seo_url = $submenu_base . '#/seo';
 	}
 	// then SEO
-	add_submenu_page($hook, __('SEO', 'google-analytics-for-wordpress'), __('SEO', 'google-analytics-for-wordpress'), 'manage_options', $seo_url);
+	add_submenu_page( $hook, __( 'SEO', 'google-analytics-for-wordpress' ), __( 'SEO', 'google-analytics-for-wordpress' ), 'manage_options', $seo_url );
 
 	// then tools
-	add_submenu_page($hook, __('Tools:', 'google-analytics-for-wordpress'), __('Tools', 'google-analytics-for-wordpress'), 'manage_options', $submenu_base . '#/tools');
+	add_submenu_page( $hook, __( 'Tools:', 'google-analytics-for-wordpress' ), __( 'Tools', 'google-analytics-for-wordpress' ), 'manage_options', $submenu_base . '#/tools' );
 
 	// then addons
 	$network_key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_network_license_key() : '';
-	if (!monsterinsights_is_network_active() || (monsterinsights_is_network_active() && empty($network_key))) {
-		add_submenu_page($hook, __('Addons:', 'google-analytics-for-wordpress'), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __('Addons', 'google-analytics-for-wordpress') . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons');
+	if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) {
+		add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' );
 	}
 
 	add_submenu_page(
 		$hook,
-		__('UserFeedback:', 'google-analytics-for-wordpress'),
-		__('UserFeedback', 'google-analytics-for-wordpress') . $new_indicator,
+		__( 'UserFeedback:', 'google-analytics-for-wordpress' ),
+		__( 'UserFeedback', 'google-analytics-for-wordpress' ) . $new_indicator,
 		'manage_options',
 		$submenu_base . '#/userfeedback'
 	);
 
 	// then About Us page.
-	add_submenu_page($hook, __('About Us:', 'google-analytics-for-wordpress'), __('About Us', 'google-analytics-for-wordpress'), 'manage_options', $submenu_base . '#/about');
+	add_submenu_page( $hook, __( 'About Us:', 'google-analytics-for-wordpress' ), __( 'About Us', 'google-analytics-for-wordpress' ), 'manage_options', $submenu_base . '#/about' );
 
-	if (!monsterinsights_is_pro_version() && !strstr(plugin_basename(__FILE__), 'dashboard-for')) {
+	if ( ! monsterinsights_is_pro_version() && ! strstr( plugin_basename( __FILE__ ), 'dashboard-for' ) ) {
 		// automated promotion
-		monsterinsights_automated_menu($hook);
+		monsterinsights_automated_menu( $hook );
 	}
 
-	add_submenu_page($hook, __('Growth Tools:', 'google-analytics-for-wordpress'), __('Growth Tools', 'google-analytics-for-wordpress'), 'manage_options', $submenu_base . '#/growth-tools');
+	add_submenu_page( $hook, __( 'Growth Tools:', 'google-analytics-for-wordpress' ), __( 'Growth Tools', 'google-analytics-for-wordpress' ), 'manage_options', $submenu_base . '#/growth-tools' );
 
 	// then Upgrade To Pro.
-	if (!monsterinsights_is_pro_version()) {
-		add_submenu_page($hook, __('Upgrade to Pro:', 'google-analytics-for-wordpress'), '<span class="monsterinsights-upgrade-submenu"> ' . __('Upgrade to Pro', 'google-analytics-for-wordpress') . '</span>', 'monsterinsights_save_settings', monsterinsights_get_upgrade_link('admin-menu', 'submenu', "https://www.monsterinsights.com/lite/"));
+	if ( ! monsterinsights_is_pro_version() ) {
+		add_submenu_page( $hook, __( 'Upgrade to Pro:', 'google-analytics-for-wordpress' ), '<span class="monsterinsights-upgrade-submenu"> ' . __( 'Upgrade to Pro', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', monsterinsights_get_upgrade_link( 'admin-menu', 'submenu', "https://www.monsterinsights.com/lite/" ) );
 	}
 
 	if ( class_exists( 'WooCommerce' ) ) {
 		// Show the Payments submenu only when WooCommerce is active.
 		add_submenu_page(
 			$hook,
-			__('Payments:', 'google-analytics-for-wordpress'),
-			__('Payments', 'google-analytics-for-wordpress'),
+			__( 'Payments:', 'google-analytics-for-wordpress' ),
+			__( 'Payments', 'google-analytics-for-wordpress' ),
 			'manage_options',
 			$submenu_base . '#/payments'
 		);
 	}
 }
 
-add_action('admin_menu', 'monsterinsights_admin_menu');
+add_action( 'admin_menu', 'monsterinsights_admin_menu' );
 
 
-function monsterinsights_automated_menu($hook){
+function monsterinsights_automated_menu( $hook ) {
 	$display = false;
 
-	$now = apply_filters('monsterinsights_automated_promotion_date', wp_date('M d, Y h:i:s a'));
+	$now = apply_filters( 'monsterinsights_automated_promotion_date', wp_date( 'M d, Y h:i:s a' ) );
 	$conditions = [
 		[
-			'title' => __('Earth Day', 'google-analytics-for-wordpress'),
-			'start_time' => wp_date('M d, Y h:i:s a', strtotime('Apr 17, 2023')),
-			'end_time' => wp_date('M d, Y h:i:s a', strtotime('Apr 18, 2023')),
+			'title' => __( 'Earth Day', 'google-analytics-for-wordpress' ),
+			'start_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Apr 17, 2023' ) ),
+			'end_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Apr 18, 2023' ) ),
 			'utm_campaign' => 'lite-promo',
 			'utm_source' => 'liteplugin',
 			'utm_medium' => 'earth-day',
 		],
 		[
-			'title' => __('Cinco De Mayo!', 'google-analytics-for-wordpress'),
-			'start_time' => wp_date('M d, Y h:i:s a', strtotime('May 01, 2023')),
-			'end_time' => wp_date('M d, Y h:i:s a', strtotime('May 08, 2023')),
+			'title' => __( 'Cinco De Mayo!', 'google-analytics-for-wordpress' ),
+			'start_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'May 01, 2023' ) ),
+			'end_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'May 08, 2023' ) ),
 			'utm_campaign' => 'lite-promo',
 			'utm_source' => 'liteplugin',
 			'utm_medium' => 'cinco-de-mayo',
 		],
 		[
-			'title' => __('Upgrade to GA4', 'google-analytics-for-wordpress'),
-			'start_time' => wp_date('M d, Y h:i:s a', strtotime('Jun 01, 2023')),
-			'end_time' => wp_date('M d, Y h:i:s a', strtotime('July 01, 2023')),
+			'title' => __( 'Upgrade to GA4', 'google-analytics-for-wordpress' ),
+			'start_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Jun 01, 2023' ) ),
+			'end_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'July 01, 2023' ) ),
 			'utm_campaign' => 'lite-promo',
 			'utm_source' => 'liteplugin',
 			'utm_medium' => 'goodbye-ga3',
 		],
 		[
-			'title' => __('Summer Sale', 'google-analytics-for-wordpress'),
-			'start_time' => wp_date('M d, Y h:i:s a', strtotime('Jul 29, 2023')),
-			'end_time' => wp_date('M d, Y h:i:s a', strtotime('Aug 05, 2023')),
+			'title' => __( 'Summer Sale', 'google-analytics-for-wordpress' ),
+			'start_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Jul 29, 2023' ) ),
+			'end_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Aug 05, 2023' ) ),
 			'utm_campaign' => 'lite-promo',
 			'utm_source' => 'liteplugin',
 			'utm_medium' => 'dogdays',
 		],
 		[
-			'title' => __('Fortune Cookie Day', 'google-analytics-for-wordpress'),
-			'start_time' => wp_date('M d, Y h:i:s a', strtotime('Sep 12, 2023')),
-			'end_time' => wp_date('M d, Y h:i:s a', strtotime('Sep 13, 2023')),
+			'title' => __( 'Fortune Cookie Day', 'google-analytics-for-wordpress' ),
+			'start_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Sep 12, 2023' ) ),
+			'end_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Sep 13, 2023' ) ),
 			'utm_campaign' => 'lite-promo',
 			'utm_source' => 'liteplugin',
 			'utm_medium' => 'fortune-cookie',
 		],
 		[
-			'title' => __('Halloween Sale', 'google-analytics-for-wordpress'),
-			'start_time' => wp_date('M d, Y h:i:s a', strtotime('Oct 26, 2023')),
-			'end_time' => wp_date('M d, Y h:i:s a', strtotime('Nov 04, 2023')),
+			'title' => __( 'Halloween Sale', 'google-analytics-for-wordpress' ),
+			'start_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Oct 26, 2023' ) ),
+			'end_time' => wp_date( 'M d, Y h:i:s a', strtotime( 'Nov 04, 2023' ) ),
 			'utm_campaign' => 'lite-promo',
 			'utm_source' => 'liteplugin',
 			'utm_medium' => 'halloween',
 		],
 	];
 
-	foreach($conditions as $key => $condition){
-		if(strtotime($now) >= strtotime($condition['start_time']) && strtotime($now) <= strtotime($condition['end_time'])){
-			add_submenu_page($hook, $condition['title'], '<span class="monsterinsights-automated-submenu"> ' . $condition['title'] . '</span>', 'monsterinsights_save_settings', monsterinsights_get_upgrade_link($condition['utm_medium'], $condition['utm_campaign'], "https://www.monsterinsights.com/lite-promo/"));
+	foreach ( $conditions as $key => $condition ) {
+		if ( strtotime( $now ) >= strtotime( $condition['start_time'] ) && strtotime( $now ) <= strtotime( $condition['end_time'] ) ) {
+			add_submenu_page( $hook, $condition['title'], '<span class="monsterinsights-automated-submenu"> ' . $condition['title'] . '</span>', 'monsterinsights_save_settings', monsterinsights_get_upgrade_link( $condition['utm_medium'], $condition['utm_campaign'], "https://www.monsterinsights.com/lite-promo/" ) );
 			break;
 		}
 	}
@@ -219,22 +219,22 @@ 
  */
 function monsterinsights_woocommerce_menu_item()
 {
-	if (class_exists('WooCommerce')) {
+	if ( class_exists( 'WooCommerce' ) ) {
 		// Add "Insights" sub menu item for WooCommerce Analytics menu
-		if (class_exists('MonsterInsights_eCommerce')) {
-			add_submenu_page('wc-admin&path=/analytics/overview', __('Insights', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress'), 'monsterinsights_view_dashboard', admin_url('admin.php?page=monsterinsights_reports#/ecommerce'), '', 2);
+		if ( class_exists( 'MonsterInsights_eCommerce' ) ) {
+			add_submenu_page( 'wc-admin&path=/analytics/overview', __( 'Insights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', admin_url( 'admin.php?page=monsterinsights_reports#/ecommerce' ), '', 2 );
 		} else {
-			$submenu_base = add_query_arg('page', 'monsterinsights_settings', admin_url('admin.php'));
-			add_submenu_page('wc-admin&path=/analytics/overview', __('Insights', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress'), 'manage_options', $submenu_base . '#/woocommerce-insights', '', 1);
+			$submenu_base = add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
+			add_submenu_page( 'wc-admin&path=/analytics/overview', __( 'Insights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'manage_options', $submenu_base . '#/woocommerce-insights', '', 1 );
 		}		
 	}
 }
-add_action('admin_menu', 'monsterinsights_woocommerce_menu_item', 11);
+add_action( 'admin_menu', 'monsterinsights_woocommerce_menu_item', 11 );
 
 function monsterinsights_get_menu_hook()
 {
-	$dashboards_disabled = monsterinsights_get_option('dashboards_disabled', false);
-	if ($dashboards_disabled || (current_user_can('monsterinsights_save_settings') && !current_user_can('monsterinsights_view_dashboard'))) {
+	$dashboards_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
+	if ( $dashboards_disabled || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
 		return 'monsterinsights_settings';
 	} else {
 		return 'monsterinsights_reports';
@@ -248,12 +248,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');
+	if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
+		require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
 	}
 
-	$plugin = plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE);
-	if (!is_plugin_active_for_network($plugin)) {
+	$plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE );
+	if ( ! is_plugin_active_for_network( $plugin ) ) {
 		return;
 	}
 
@@ -265,31 +265,31 @@ 
 
 	$menu_icon_inline = monsterinsights_get_inline_menu_icon();
 	$hook             = 'monsterinsights_network';
-	$submenu_base     = add_query_arg('page', 'monsterinsights_network', network_admin_url('admin.php'));
-	add_menu_page(__('Network Settings:', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress') . $menu_notification_indicator, 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', $menu_icon_inline, '100.00013467543');
+	$submenu_base     = add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) );
+	add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . $menu_notification_indicator, 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', $menu_icon_inline, '100.00013467543' );
 
-	add_submenu_page($hook, __('Network Settings:', 'google-analytics-for-wordpress'), __('Network Settings', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page');
+	add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
-	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' );
 
-	if (function_exists('aioseo')) {
+	if ( function_exists( 'aioseo' ) ) {
 		$seo_url = monsterinsights_aioseo_dashboard_url();
 	} else {
 		$seo_url = $submenu_base . '#/seo';
 	}
 	// then seo
-	add_submenu_page($hook, __('SEO:', 'google-analytics-for-wordpress'), __('SEO', 'google-analytics-for-wordpress'), 'manage_options', $seo_url, 'monsterinsights_seo_page');
+	add_submenu_page( $hook, __( 'SEO:', 'google-analytics-for-wordpress' ), __( 'SEO', 'google-analytics-for-wordpress' ), 'manage_options', $seo_url, 'monsterinsights_seo_page' );
 
 	// then addons
-	add_submenu_page($hook, __('Addons:', 'google-analytics-for-wordpress'), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __('Addons', 'google-analytics-for-wordpress') . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons');
+	add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' );
 
-	$submenu_base = add_query_arg('page', 'monsterinsights_network', network_admin_url('admin.php'));
+	$submenu_base = add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) );
 
 	// Add About us page.
-	add_submenu_page($hook, __('About Us:', 'google-analytics-for-wordpress'), __('About Us', 'google-analytics-for-wordpress'), 'manage_options', $submenu_base . '#/about');
+	add_submenu_page( $hook, __( 'About Us:', 'google-analytics-for-wordpress' ), __( 'About Us', 'google-analytics-for-wordpress' ), 'manage_options', $submenu_base . '#/about' );
 }
 
-add_action('network_admin_menu', 'monsterinsights_network_admin_menu', 5);
+add_action( 'network_admin_menu', 'monsterinsights_network_admin_menu', 5 );
 
 /**
  * Adds one or more classes to the body tag in the dashboard.
@@ -298,17 +298,17 @@ 
  *
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class($classes)
+function monsterinsights_add_admin_body_class( $classes )
 {
-	$screen = function_exists('get_current_screen') ? get_current_screen() : false;
-	if (empty($screen) || empty($screen->id) || strpos($screen->id, 'monsterinsights') === false) {
+	$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
+	if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
 		return $classes;
 	}
 
 	return "$classes monsterinsights_page ";
 }
 
-add_filter('admin_body_class', 'monsterinsights_add_admin_body_class', 10, 1);
+add_filter( 'admin_body_class', 'monsterinsights_add_admin_body_class', 10, 1 );
 
 /**
  * Adds one or more classes to the body tag in the dashboard.
@@ -317,18 +317,18 @@ 
  *
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class_tools_page($classes)
+function monsterinsights_add_admin_body_class_tools_page( $classes )
 {
-	$screen = function_exists('get_current_screen') ? get_current_screen() : false;
+	$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
 
-	if (empty($screen) || empty($screen->id) || strpos($screen->id, 'monsterinsights_tools') === false || 'insights_page_monsterinsights_tools' === $screen->id) {
+	if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id ) {
 		return $classes;
 	}
 
 	return "$classes insights_page_monsterinsights_tools ";
 }
 
-add_filter('admin_body_class', 'monsterinsights_add_admin_body_class_tools_page', 10, 1);
+add_filter( 'admin_body_class', 'monsterinsights_add_admin_body_class_tools_page', 10, 1 );
 
 /**
  * Adds one or more classes to the body tag in the dashboard.
@@ -337,17 +337,17 @@ 
  *
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class_addons_page($classes)
+function monsterinsights_add_admin_body_class_addons_page( $classes )
 {
-	$screen = function_exists('get_current_screen') ? get_current_screen() : false;
-	if (empty($screen) || empty($screen->id) || strpos($screen->id, 'monsterinsights_addons') === false || 'insights_page_monsterinsights_addons' === $screen->id) {
+	$screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
+	if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id ) {
 		return $classes;
 	}
 
 	return "$classes insights_page_monsterinsights_addons ";
 }
 
-add_filter('admin_body_class', 'monsterinsights_add_admin_body_class_addons_page', 10, 1);
+add_filter( 'admin_body_class', 'monsterinsights_add_admin_body_class_addons_page', 10, 1 );
 
 /**
  * Add a link to the settings page to the plugins list
@@ -356,39 +356,39 @@ 
  *
  * @return array $links
  */
-function monsterinsights_add_action_links($links)
+function monsterinsights_add_action_links( $links )
 {
-	$docs = '<a title="' . esc_attr__('MonsterInsights Knowledge Base', 'google-analytics-for-wordpress') . '" href="' . monsterinsights_get_url('all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/") . '">' . esc_html__('Documentation', 'google-analytics-for-wordpress') . '</a>';
-	array_unshift($links, $docs);
+	$docs = '<a title="' . esc_attr__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) . '">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $docs );
 
 	// If Lite, support goes to forum. If pro, it goes to our website
-	if (monsterinsights_is_pro_version()) {
-		$support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url('all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/") . '">' . esc_html__('Support', 'google-analytics-for-wordpress') . '</a>';
-		array_unshift($links, $support);
+	if ( monsterinsights_is_pro_version() ) {
+		$support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+		array_unshift( $links, $support );
 	} else {
-		$support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url('all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/") . '">' . esc_html__('Support', 'google-analytics-for-wordpress') . '</a>';
-		array_unshift($links, $support);
+		$support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+		array_unshift( $links, $support );
 	}
 
-	if (is_network_admin()) {
-		$settings_link = '<a href="' . esc_url(network_admin_url('admin.php?page=monsterinsights_network')) . '">' . esc_html__('Network Settings', 'google-analytics-for-wordpress') . '</a>';
+	if ( is_network_admin() ) {
+		$settings_link = '<a href="' . esc_url( network_admin_url( 'admin.php?page=monsterinsights_network' ) ) . '">' . esc_html__( 'Network Settings', 'google-analytics-for-wordpress' ) . '</a>';
 	} else {
-		$settings_link = '<a href="' . esc_url(admin_url('admin.php?page=monsterinsights_settings')) . '">' . esc_html__('Settings', 'google-analytics-for-wordpress') . '</a>';
+		$settings_link = '<a href="' . esc_url( admin_url( 'admin.php?page=monsterinsights_settings' ) ) . '">' . esc_html__( 'Settings', 'google-analytics-for-wordpress' ) . '</a>';
 	}
 
-	array_unshift($links, $settings_link);
+	array_unshift( $links, $settings_link );
 
 	// If lite, show a link where they can get pro from
-	if (!monsterinsights_is_pro_version()) {
-		$get_pro = '<a title="' . esc_attr__('Get MonsterInsights Pro', 'google-analytics-for-wordpress') . '" target="_blank" rel="noopener" href="' . monsterinsights_get_upgrade_link('all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/") . '" style="font-weight:700; color: #1da867;">' . esc_html__('Get MonsterInsights Pro', 'google-analytics-for-wordpress') . '</a>';
-		array_unshift($links, $get_pro);
+	if ( ! monsterinsights_is_pro_version() ) {
+		$get_pro = '<a title="' . esc_attr__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" target="_blank" rel="noopener" href="' . monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) . '" style="font-weight:700; color: #1da867;">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+		array_unshift( $links, $get_pro );
 	}
 
 	return $links;
 }
 
-add_filter('plugin_action_links_' . plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE), 'monsterinsights_add_action_links');
-add_filter('network_admin_plugin_action_links_' . plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE), 'monsterinsights_add_action_links');
+add_filter( 'plugin_action_links_' . plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ), 'monsterinsights_add_action_links' );
+add_filter( 'network_admin_plugin_action_links_' . plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ), 'monsterinsights_add_action_links' );
 
 /**
  * Loads a partial view for the Administration screen
@@ -402,31 +402,31 @@ 
  * @since 6.0.0
  *
  */
-function monsterinsights_load_admin_partial($template, $data = array())
+function monsterinsights_load_admin_partial( $template, $data = array() )
 {
 
-	if (monsterinsights_is_pro_version()) {
-		$dir = trailingslashit(plugin_dir_path(MonsterInsights()->file) . 'pro/includes/admin/partials');
+	if ( monsterinsights_is_pro_version() ) {
+		$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
 
-		if (file_exists($dir . $template . '.php')) {
-			require_once($dir . $template . '.php');
+		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');
+		if ( file_exists( $dir . $template . '.php' ) ) {
+			require_once( $dir . $template . '.php' );
 
 			return true;
 		}
 	}
 
-	$dir = trailingslashit(plugin_dir_path(MonsterInsights()->file) . 'includes/admin/partials');
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
-	if (file_exists($dir . $template . '.php')) {
-		require_once($dir . $template . '.php');
+	if ( file_exists( $dir . $template . '.php' ) ) {
+		require_once( $dir . $template . '.php' );
 
 		return true;
 	}
@@ -443,7 +443,7 @@ 
  * @return string
  * @since 6.0.0
  */
-function monsterinsights_admin_footer($text)
+function monsterinsights_admin_footer( $text )
 {
 	global $current_screen;
 	if (
@@ -453,18 +453,18 @@ 
 	) {
 		$url = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
 		// Translators: Placeholders add a link to the wordpress.org repository.
-		$text = sprintf(esc_html__('Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress'), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>');
+		$text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
 	}
 
 	return $text;
 }
 
-add_filter('admin_footer_text', 'monsterinsights_admin_footer', 1, 2);
+add_filter( 'admin_footer_text', 'monsterinsights_admin_footer', 1, 2 );
 
 function monsterinsights_admin_setup_notices()
 {
 	// Make sure they have the permissions to do something
-	if (!current_user_can('monsterinsights_save_settings')) {
+	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
 		return;
 	}
 
@@ -483,11 +483,11 @@ 
     //  0. UA sunset supported alert
     $profile = is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile() : MonsterInsights()->auth->get_analytics_profile();
 
-    if ( !empty($profile['ua']) && empty($profile['v4']) && !monsterinsights_is_own_admin_page() ) {
-        $title = __('Urgent: Your Website is Not Tracking Any Google Analytics Data!', 'google-analytics-for-wordpress');
-        $message = __('Google Analytics 3 (UA) and support was sunset on July 1, 2023. Your website is currently NOT tracking any analytics. </br>Create or connect a new Google Analytics 4 property immediately to start tracking.', 'google-analytics-for-wordpress');
+    if ( ! empty( $profile['ua'] ) && empty( $profile['v4'] ) && ! monsterinsights_is_own_admin_page() ) {
+        $title = __( 'Urgent: Your Website is Not Tracking Any Google Analytics Data!', 'google-analytics-for-wordpress' );
+        $message = __( 'Google Analytics 3 (UA) and support was sunset on July 1, 2023. Your website is currently NOT tracking any analytics. </br>Create or connect a new Google Analytics 4 property immediately to start tracking.', 'google-analytics-for-wordpress' );
 
-        $wizard_url     = admin_url('admin.php?page=monsterinsights-onboarding');
+        $wizard_url = admin_url( 'admin.php?page=monsterinsights-onboarding' );
 
         echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_ua_sunset">';
         echo '<p><strong>' . $title . '</strong></p>';
@@ -525,38 +525,38 @@ 
 
 	// 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');
+	if ( monsterinsights_is_pro_version() && empty( $key ) ) {
+		$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		// Translators: Adds a link to retrieve the license.
-		$message = sprintf(esc_html__('Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress'), '<a href="' . esc_url($page) . '">', '</a>');
+		$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>'; // phpcs:ignore
 
 		return;
 	}
 
 	// 3. License key not valid/okay for pro
-	if (monsterinsights_is_pro_version()) {
+	if ( monsterinsights_is_pro_version() ) {
 		$message = '';
-		if (MonsterInsights()->license->get_site_license_key()) {
-			if (MonsterInsights()->license->site_license_expired()) {
+		if ( MonsterInsights()->license->get_site_license_key() ) {
+			if ( MonsterInsights()->license->site_license_expired() ) {
 				// Translators: Adds a link to the license renewal.
-				$message = sprintf(esc_html__('Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress'), '<a href="' . monsterinsights_get_url('admin-notices', 'expired-license', "https://www.monsterinsights.com/login/") . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>');
-			} else if (MonsterInsights()->license->site_license_disabled()) {
-				$message = esc_html__('Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress');
-			} else if (MonsterInsights()->license->site_license_invalid()) {
-				$message = esc_html__('Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress');
+				$message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			} else if ( MonsterInsights()->license->site_license_disabled() ) {
+				$message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+			} else if ( MonsterInsights()->license->site_license_invalid() ) {
+				$message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
 			}
-		} else if (MonsterInsights()->license->get_network_license_key()) {
-			if (MonsterInsights()->license->network_license_expired()) {
+		} else if ( MonsterInsights()->license->get_network_license_key() ) {
+			if ( MonsterInsights()->license->network_license_expired() ) {
 				// Translators: Adds a link to renew license.
-				$message = sprintf(esc_html__('Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress'), '<a href="' . monsterinsights_get_url('admin-notices', 'expired-license', "https://www.monsterinsights.com/login/") . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>');
-			} else if (MonsterInsights()->license->network_license_disabled()) {
-				$message = esc_html__('Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress');
-			} else if (MonsterInsights()->license->network_license_invalid()) {
-				$message = esc_html__('Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress');
+				$message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			} else if ( MonsterInsights()->license->network_license_disabled() ) {
+				$message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+			} else if ( MonsterInsights()->license->network_license_invalid() ) {
+				$message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
 			}
 		}
-		if (!empty($message)) {
+		if ( ! empty( $message ) ) {
 			echo '<div class="error"><p>' . $message . '</p></div>'; // phpcs:ignore
 
 			return;
@@ -564,28 +564,28 @@ 
 	}
 
 	// 4. Notices for PHP/WP version deprecations
-	if (current_user_can('update_core')) {
+	if ( current_user_can( 'update_core' ) ) {
 		global $wp_version;
 
-		$compatible_php_version = apply_filters('monsterinsights_compatible_php_version', false);
-		$compatible_wp_version  = apply_filters('monsterinsights_compatible_wp_version', false);
+		$compatible_php_version = apply_filters( 'monsterinsights_compatible_php_version', false );
+		$compatible_wp_version  = apply_filters( 'monsterinsights_compatible_wp_version', false );
 
-		$url = monsterinsights_get_url('global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/');
+		$url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
 
 		$message = false;
-		if (version_compare(phpversion(), $compatible_php_version['required'], '<')) {
+		if ( version_compare( phpversion(), $compatible_php_version['required'], '<' ) ) {
 			// Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break.
-			$message = sprintf(esc_html__('Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress'), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>');
-		} else if (version_compare(phpversion(), $compatible_php_version['warning'], '<')) {
+			$message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+		} else if ( version_compare( phpversion(), $compatible_php_version['warning'], '<' ) ) {
 			// Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break.
-			$message = sprintf(esc_html__('Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in November, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress'), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>');
-		} else if (version_compare(phpversion(), $compatible_php_version['recommended'], '<')) {
+			$message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress stopped supporting your PHP version in November, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+		} else if ( version_compare( phpversion(), $compatible_php_version['recommended'], '<' ) ) {
 			// Translators: Placeholders add the PHP version, a link to the MonsterInsights blog and a line break.
-			$message = sprintf(esc_html__('Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress is working towards discontinuing support for your PHP version.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress'), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>');
+			$message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress is working towards discontinuing support for your PHP version.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
 		}
 
-		if ($message) {
-			echo '<div class="error"><p>' . wp_kses($message, [
+		if ( $message ) {
+			echo '<div class="error"><p>' . wp_kses( $message, [
 				'br' => array(),
 				'b' => array(),
 				'strong' => array(),
@@ -595,7 +595,7 @@ 
 					'target' => array(),
 					'title' => array(),
 				),
-			]) . '</p></div>';
+			] ) . '</p></div>';
 			return;
 		}
 
@@ -649,26 +649,26 @@ 
 	//     }
 	// }
 
-	$notices = get_option('monsterinsights_notices');
-	if (!is_array($notices)) {
+	$notices = get_option( 'monsterinsights_notices' );
+	if ( ! is_array( $notices ) ) {
 		$notices = array();
 	}
 
 	// 6. Authenticate, not manual
 	$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');
+	$url     = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 	$tracking_code = monsterinsights_get_v4_id_to_output();
 	// Translators: Placeholders add links to the settings panel.
-	$manual_text = sprintf(esc_html__('Important: You are currently using manual GA4 Measurement ID 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>');
-	$migrated    = monsterinsights_get_option('gadwp_migrated', 0);
-	if ($migrated > 0) {
-		$url = admin_url('admin.php?page=monsterinsights-getting-started&monsterinsights-migration=1');
+	$manual_text = sprintf( esc_html__( 'Important: You are currently using manual GA4 Measurement ID 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>' );
+	$migrated    = monsterinsights_get_option( 'gadwp_migrated', 0 );
+	if ( $migrated > 0 ) {
+		$url = admin_url( 'admin.php?page=monsterinsights-getting-started&monsterinsights-migration=1' );
 		// Translators: Placeholders add links to the settings panel.
-		$text        = esc_html__('Click %1$shere%2$s to reauthenticate to be able to access reports. For more information why this is required, see our %3$sblog post%4$s.', 'google-analytics-for-wordpress');
-		$manual_text = sprintf($text, '<a href="' . esc_url($url) . '">', '</a>', '<a href="' . monsterinsights_get_url('notice', 'manual-ua', 'https://www.exactmetrics.com/why-did-we-implement-the-new-google-analytics-authentication-flow-challenges-explained/') . '" target="_blank">', '</a>');
+		$text        = esc_html__( 'Click %1$shere%2$s to reauthenticate to be able to access reports. For more information why this is required, see our %3$sblog post%4$s.', 'google-analytics-for-wordpress' );
+		$manual_text = sprintf( $text, '<a href="' . esc_url( $url ) . '">', '</a>', '<a href="' . monsterinsights_get_url( 'notice', 'manual-ua', 'https://www.exactmetrics.com/why-did-we-implement-the-new-google-analytics-authentication-flow-challenges-explained/' ) . '" target="_blank">', '</a>' );
 	}
 
-	if (empty($authed) && !isset($notices['monsterinsights_auth_not_manual']) && !empty($tracking_code)) {
+	if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual'] ) && ! empty( $tracking_code ) ) {
 		echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
 		echo '<p>';
 		echo $manual_text; // phpcs:ignore
@@ -694,8 +694,8 @@ 
 	// }
 
 	// 8. WooUpsell
-	if (!monsterinsights_is_pro_version() && class_exists('WooCommerce') && $is_plugins_page) {
-		if (!isset($notices['monsterinsights_woocommerce_tracking_available'])) {
+	if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) && $is_plugins_page ) {
+		if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) {
 			$woo_notice_template = '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">
 				%1$s
 				<div class="monsterinsights-wooedd-upsell-left">
@@ -711,28 +711,28 @@ 
 
 			$woo_notice_button = sprintf(
 				// Translators: Placeholders add a link to the MonsterInsights website.
-				esc_html__('%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress'),
-				'<a class="button button-primary button-hero" target="_blank" href="' . esc_url(monsterinsights_get_upgrade_link('admin-notices', 'woocommerce-upgrade')) . '">',
+				esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ),
+				'<a class="button button-primary button-hero" target="_blank" href="' . esc_url( monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) ) . '">',
 				' &raquo;</a>'
 			);
 
 			$woo_notice_offer = sprintf(
 				'<div class="monsterinsights-wooedd-upsell-offer">%1$s</div>',
-				__('Save <span>50%</span> Off MonsterInsights Pro', 'google-analytics-for-wordpress')
+				__( 'Save <span>50%</span> Off MonsterInsights Pro', 'google-analytics-for-wordpress' )
 			);
 
-			$woo_notice_bg = esc_url(trailingslashit(MONSTERINSIGHTS_PLUGIN_URL)) . 'assets/images/upsell/monsterinsights-woo-edd-upsell.svg';
-			$woo_notice_offer_icon = esc_url(trailingslashit(MONSTERINSIGHTS_PLUGIN_URL)) . 'assets/images/upsell/woo-offer-icon.svg';
+			$woo_notice_bg = esc_url( trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) ) . 'assets/images/upsell/monsterinsights-woo-edd-upsell.svg';
+			$woo_notice_offer_icon = esc_url( trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) ) . 'assets/images/upsell/woo-offer-icon.svg';
 			$woo_notice_style = "<style>.monsterinsights-wooedd-upsell-left .button-hero,.monsterinsights-wooedd-upsell-offer{width:270px;margin-bottom:20px;text-align:center}.monsterinsights-wooedd-upsell-row{display:flex;background-image:url($woo_notice_bg);background-repeat:no-repeat;background-position:96% bottom}.monsterinsights-wooedd-upsell-left{margin-left:20px}.monsterinsights-wooedd-upsell-offer{background:#fafeb0;padding:6px 0;position:relative;font-weight:700;font-size:15px;line-height:28px}.monsterinsights-wooedd-upsell-offer span{color:#338eef}.monsterinsights-wooedd-upsell-offer:before{content:url('$woo_notice_offer_icon');position:absolute;left:-23px;bottom:-30px}@media (max-width:1300px){.monsterinsights-wooedd-upsell-row{background-size:60%}}@media (max-width:900px){.monsterinsights-wooedd-upsell-row{background-image:none}.monsterinsights-wooedd-upsell-left,.monsterinsights-wooedd-upsell-left .button-hero,.monsterinsights-wooedd-upsell-offer{width:100%}}</style>";
 
 			echo sprintf(
 				$woo_notice_template,
 				$woo_notice_style,
-				__('Add eCommerce Analytics to your WooCommerce Store', 'google-analytics-for-wordpress'),
-				__('Unlock all of our advanced eCommerce features specifically designed to help your store make more money..', 'google-analytics-for-wordpress'),
-				__('MonsterInsights Pro users instantly gain access to valuable insights such as average order value, conversion rates, as well as marketing performance with UTM tracking.', 'google-analytics-for-wordpress'),
-				__('And by upgrading, Pro users also get enhanced tracking for Forms, User Journeys, PPC Pixels, Custom UserID tracking, SEO Reports, and much more.', 'google-analytics-for-wordpress'),
-				__('Start making better data-driven decisions today!', 'google-analytics-for-wordpress'),
+				__( 'Add eCommerce Analytics to your WooCommerce Store', 'google-analytics-for-wordpress' ),
+				__( 'Unlock all of our advanced eCommerce features specifically designed to help your store make more money..', 'google-analytics-for-wordpress' ),
+				__( 'MonsterInsights Pro users instantly gain access to valuable insights such as average order value, conversion rates, as well as marketing performance with UTM tracking.', 'google-analytics-for-wordpress' ),
+				__( 'And by upgrading, Pro users also get enhanced tracking for Forms, User Journeys, PPC Pixels, Custom UserID tracking, SEO Reports, and much more.', 'google-analytics-for-wordpress' ),
+				__( 'Start making better data-driven decisions today!', 'google-analytics-for-wordpress' ),
 				$woo_notice_offer,
 				$woo_notice_button
 			);
@@ -741,30 +741,30 @@ 
 	}
 
 	// 9. EDDUpsell
-	if (!monsterinsights_is_pro_version() && class_exists('Easy_Digital_Downloads') && $is_plugins_page) {
-		if (!isset($notices['monsterinsights_edd_tracking_available'])) {
+	if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) && $is_plugins_page ) {
+		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 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="' . esc_url(trailingslashit(MONSTERINSIGHTS_PLUGIN_URL)) . 'assets/images/upsell/woo-edd-upsell.png">';
+			echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . esc_url( 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 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 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 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 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" target="_blank" href="' . esc_url(monsterinsights_get_upgrade_link('admin-notices', 'edd-upgrade')) . '">', ' &raquo;</a>');
+			echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" target="_blank" href="' . esc_url( monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) ) . '">', ' &raquo;</a>' );
 			echo '</p>';
 			echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-			echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . esc_url(trailingslashit(MONSTERINSIGHTS_PLUGIN_URL)) . 'assets/images/upsell/woo-edd-upsell.png">';
+			echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . esc_url( trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) ) . 'assets/images/upsell/woo-edd-upsell.png">';
 			echo '</div>';
 			echo '</div>';
 
@@ -773,32 +773,32 @@ 
 	}
 
 
-	if (isset($notices['monsterinsights_cross_domains_extracted']) && false === $notices['monsterinsights_cross_domains_extracted']) {
-		$page = is_network_admin() ? network_admin_url('admin.php?page=monsterinsights_network') : admin_url('admin.php?page=monsterinsights_settings');
+	if ( isset( $notices['monsterinsights_cross_domains_extracted'] ) && false === $notices['monsterinsights_cross_domains_extracted'] ) {
+		$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$page = $page . '#/advanced';
 		// Translators: Adds a link to the settings panel.
-		$message = sprintf(esc_html__('Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress'), '<a href="' . esc_url($page) . '">', '</a>');
+		$message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
 		echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>' . $message . '</p></div>'; // phpcs:ignore
 
 		return;
 	}
 }
 
-add_action('admin_notices', 'monsterinsights_admin_setup_notices');
-add_action('network_admin_notices', 'monsterinsights_admin_setup_notices');
+add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' );
+add_action( 'network_admin_notices', 'monsterinsights_admin_setup_notices' );
 
 
 // AM Notices
-function monsterinsights_am_notice_optout($super_admin)
+function monsterinsights_am_notice_optout( $super_admin )
 {
-	if (monsterinsights_get_option('hide_am_notices', false) || monsterinsights_get_option('network_hide_am_notices', false)) {
+	if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) {
 		return false;
 	}
 
 	return $super_admin;
 }
 
-add_filter("am_notifications_display", 'monsterinsights_am_notice_optout', 10, 1);
+add_filter( "am_notifications_display", 'monsterinsights_am_notice_optout', 10, 1 );
 
 /**
  * Inline critical css for the menu to prevent breaking the layout when our scripts get blocked by browsers.
@@ -827,20 +827,20 @@ 
 <?php
 }
 
-add_action('admin_head', 'monsterinsights_admin_menu_inline_styles', 300);
+add_action( 'admin_head', 'monsterinsights_admin_menu_inline_styles', 300 );
 
 /**
  * Display notice in admin when measurement protocol is left blank
  */
 function monsterinsights_empty_measurement_protocol_token()
 {
-	if (!class_exists('MonsterInsights_eCommerce') && !class_exists('MonsterInsights_Forms')) {
+	if ( ! class_exists( 'MonsterInsights_eCommerce' ) && ! class_exists( 'MonsterInsights_Forms' ) ) {
 		return;
 	}
 
 	$page = is_network_admin()
-		? network_admin_url('admin.php?page=monsterinsights_network')
-		: admin_url('admin.php?page=monsterinsights_settings');
+		? network_admin_url( 'admin.php?page=monsterinsights_network' )
+		: admin_url( 'admin.php?page=monsterinsights_settings' );
 
 	$api_secret = is_network_admin()
 		? MonsterInsights()->auth->get_network_measurement_protocol_secret()
@@ -848,7 +848,7 @@ 
 
 	$current_code = monsterinsights_get_v4_id_to_output();
 
-	if (empty($current_code) || !empty($api_secret)) {
+	if ( empty( $current_code ) || ! empty( $api_secret ) ) {
 		return;
 	}
 
@@ -858,7 +858,7 @@ 
 			'Your Measurement Protocol API Secret is currently left blank. To see more advanced analytics please enter a Measurement API Secret. %1$sLearn how to find your API Secret%2$s.',
 			'google-analytics-for-wordpress'
 		),
-		'<a target="_blank" href="' . monsterinsights_get_url('notice', 'empty-measurement-protocol-secret', 'https://www.monsterinsights.com/docs/how-to-create-your-measurement-protocol-api-secret-in-ga4/') . '">',
+		'<a target="_blank" href="' . monsterinsights_get_url( 'notice', 'empty-measurement-protocol-secret', 'https://www.monsterinsights.com/docs/how-to-create-your-measurement-protocol-api-secret-in-ga4/' ) . '">',
 		'</a>'
 	);
 	echo '<div class="error"><p>' . $message . '</p></div>'; // phpcs:ignore

Braces +17 added lines, -31 removed lines

@@ -23,8 +23,7 @@ 
  * @access public
  *
  */
-function monsterinsights_admin_menu()
-{
+function monsterinsights_admin_menu() {
 	$hook             = monsterinsights_get_menu_hook();
 	$menu_icon_inline = monsterinsights_get_inline_menu_icon();
 	$new_indicator     = sprintf(
@@ -151,7 +150,7 @@ 
 add_action('admin_menu', 'monsterinsights_admin_menu');
 
 
-function monsterinsights_automated_menu($hook){
+function monsterinsights_automated_menu($hook) {
 	$display = false;
 
 	$now = apply_filters('monsterinsights_automated_promotion_date', wp_date('M d, Y h:i:s a'));
@@ -206,8 +205,8 @@ 
 		],
 	];
 
-	foreach($conditions as $key => $condition){
-		if(strtotime($now) >= strtotime($condition['start_time']) && strtotime($now) <= strtotime($condition['end_time'])){
+	foreach($conditions as $key => $condition) {
+		if(strtotime($now) >= strtotime($condition['start_time']) && strtotime($now) <= strtotime($condition['end_time'])) {
 			add_submenu_page($hook, $condition['title'], '<span class="monsterinsights-automated-submenu"> ' . $condition['title'] . '</span>', 'monsterinsights_save_settings', monsterinsights_get_upgrade_link($condition['utm_medium'], $condition['utm_campaign'], "https://www.monsterinsights.com/lite-promo/"));
 			break;
 		}
@@ -217,8 +216,7 @@ 
 /**
  * Add this separately so all the Woo menu items are loaded and the position parameter works correctly.
  */
-function monsterinsights_woocommerce_menu_item()
-{
+function monsterinsights_woocommerce_menu_item() {
 	if (class_exists('WooCommerce')) {
 		// Add "Insights" sub menu item for WooCommerce Analytics menu
 		if (class_exists('MonsterInsights_eCommerce')) {
@@ -231,8 +229,7 @@ 
 }
 add_action('admin_menu', 'monsterinsights_woocommerce_menu_item', 11);
 
-function monsterinsights_get_menu_hook()
-{
+function monsterinsights_get_menu_hook() {
 	$dashboards_disabled = monsterinsights_get_option('dashboards_disabled', false);
 	if ($dashboards_disabled || (current_user_can('monsterinsights_save_settings') && !current_user_can('monsterinsights_view_dashboard'))) {
 		return 'monsterinsights_settings';
@@ -241,8 +238,7 @@ 
 	}
 }
 
-function monsterinsights_network_admin_menu()
-{
+function monsterinsights_network_admin_menu() {
 	// Get the base class object.
 	$base = MonsterInsights();
 
@@ -298,8 +294,7 @@ 
  *
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class($classes)
-{
+function monsterinsights_add_admin_body_class($classes) {
 	$screen = function_exists('get_current_screen') ? get_current_screen() : false;
 	if (empty($screen) || empty($screen->id) || strpos($screen->id, 'monsterinsights') === false) {
 		return $classes;
@@ -317,8 +312,7 @@ 
  *
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class_tools_page($classes)
-{
+function monsterinsights_add_admin_body_class_tools_page($classes) {
 	$screen = function_exists('get_current_screen') ? get_current_screen() : false;
 
 	if (empty($screen) || empty($screen->id) || strpos($screen->id, 'monsterinsights_tools') === false || 'insights_page_monsterinsights_tools' === $screen->id) {
@@ -337,8 +331,7 @@ 
  *
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class_addons_page($classes)
-{
+function monsterinsights_add_admin_body_class_addons_page($classes) {
 	$screen = function_exists('get_current_screen') ? get_current_screen() : false;
 	if (empty($screen) || empty($screen->id) || strpos($screen->id, 'monsterinsights_addons') === false || 'insights_page_monsterinsights_addons' === $screen->id) {
 		return $classes;
@@ -356,8 +349,7 @@ 
  *
  * @return array $links
  */
-function monsterinsights_add_action_links($links)
-{
+function monsterinsights_add_action_links($links) {
 	$docs = '<a title="' . esc_attr__('MonsterInsights Knowledge Base', 'google-analytics-for-wordpress') . '" href="' . monsterinsights_get_url('all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/") . '">' . esc_html__('Documentation', 'google-analytics-for-wordpress') . '</a>';
 	array_unshift($links, $docs);
 
@@ -402,8 +394,7 @@ 
  * @since 6.0.0
  *
  */
-function monsterinsights_load_admin_partial($template, $data = array())
-{
+function monsterinsights_load_admin_partial($template, $data = array()) {
 
 	if (monsterinsights_is_pro_version()) {
 		$dir = trailingslashit(plugin_dir_path(MonsterInsights()->file) . 'pro/includes/admin/partials');
@@ -443,8 +434,7 @@ 
  * @return string
  * @since 6.0.0
  */
-function monsterinsights_admin_footer($text)
-{
+function monsterinsights_admin_footer($text) {
 	global $current_screen;
 	if (
 		! empty( $current_screen->id )
@@ -461,8 +451,7 @@ 
 
 add_filter('admin_footer_text', 'monsterinsights_admin_footer', 1, 2);
 
-function monsterinsights_admin_setup_notices()
-{
+function monsterinsights_admin_setup_notices() {
 	// Make sure they have the permissions to do something
 	if (!current_user_can('monsterinsights_save_settings')) {
 		return;
@@ -789,8 +778,7 @@ 
 
 
 // AM Notices
-function monsterinsights_am_notice_optout($super_admin)
-{
+function monsterinsights_am_notice_optout($super_admin) {
 	if (monsterinsights_get_option('hide_am_notices', false) || monsterinsights_get_option('network_hide_am_notices', false)) {
 		return false;
 	}
@@ -803,8 +791,7 @@ 
 /**
  * Inline critical css for the menu to prevent breaking the layout when our scripts get blocked by browsers.
  */
-function monsterinsights_admin_menu_inline_styles()
-{
+function monsterinsights_admin_menu_inline_styles() {
 ?>
 	<style>
 		#toplevel_page_monsterinsights_reports .wp-menu-image img,
@@ -832,8 +819,7 @@ 
 /**
  * Display notice in admin when measurement protocol is left blank
  */
-function monsterinsights_empty_measurement_protocol_token()
-{
+function monsterinsights_empty_measurement_protocol_token() {
 	if (!class_exists('MonsterInsights_eCommerce') && !class_exists('MonsterInsights_Forms')) {
 		return;
 	}

includes/admin/exclude-page-metabox.php

Spacing +5 added lines, -5 removed lines

@@ -12,14 +12,14 @@ 
 	class MonsterInsights_MetaBox_ExcludePage {
 
 		public function __construct() {
-			add_action( 'init', [ $this, 'register_meta' ] );
+			add_action( 'init', [$this, 'register_meta'] );
 
 			if ( ! is_admin() ) {
 				return;
 			}
 
-			add_action( 'load-post.php', [ $this, 'meta_box_init' ] );
-			add_action( 'load-post-new.php', [ $this, 'meta_box_init' ] );
+			add_action( 'load-post.php', [$this, 'meta_box_init'] );
+			add_action( 'load-post-new.php', [$this, 'meta_box_init'] );
 		}
 
 		private function is_gutenberg_editor() {
@@ -75,7 +75,7 @@ 
 			if ( $this->is_gutenberg_editor() && $this->posttype_supports_gutenberg() ) {
 				return;
 			}
-			add_action( 'add_meta_boxes', [ $this, 'create_meta_box' ] );
+			add_action( 'add_meta_boxes', [$this, 'create_meta_box'] );
 		}
 
 		public function register_meta() {
@@ -100,7 +100,7 @@ 
 			add_meta_box(
 				'monsterinsights-metabox',
 				'MonsterInsights',
-				[ $this, 'print_metabox_html' ],
+				[$this, 'print_metabox_html'],
 				null,
 				'side',
 				'high'

includes/admin/ajax.php

Indentation +8 added lines, -8 removed lines

@@ -332,20 +332,20 @@
     $site_key = is_network_admin() ? $auth->get_network_key() : $auth->get_key();
 
     if ( !hash_equals( $site_key, $key ) ) {
-        wp_send_json_error([
-            'error'     => __( 'Invalid site key.', 'google-analytics-for-wordpress' )
-        ], 401);
+	wp_send_json_error([
+	    'error'     => __( 'Invalid site key.', 'google-analytics-for-wordpress' )
+	], 401);
     }
 
     $v4 = is_network_admin() ? $auth->get_network_v4_id() :  $auth->get_v4_id();
     $has_secret = is_network_admin() ?
-        !empty( $auth->get_network_measurement_protocol_secret() ) :
-        !empty( $auth->get_measurement_protocol_secret() );
+	!empty( $auth->get_network_measurement_protocol_secret() ) :
+	!empty( $auth->get_measurement_protocol_secret() );
 
     wp_send_json([
-        'v4'                => $v4,
-        'has_mp_secret'     => $has_secret,
-        'plugin_version'    => MonsterInsights()->version
+	'v4'                => $v4,
+	'has_mp_secret'     => $has_secret,
+	'plugin_version'    => MonsterInsights()->version
     ]);
 }
 

Spacing +15 added lines, -16 removed lines

@@ -73,7 +73,7 @@ 
 			),
 			admin_url( 'admin.php' )
 		);
-		$url    = esc_url( $url );
+		$url = esc_url( $url );
 
 		// Start output bufferring to catch the filesystem form if credentials are needed.
 		ob_start();
@@ -139,7 +139,7 @@ 
 		if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
 			$activate = activate_plugin( $plugin, null, true );
 		} else {
-			$activate = activate_plugin( $plugin  );
+			$activate = activate_plugin( $plugin );
 		}
 
 		/* Restrict thirt-party redirections on activation */
@@ -327,26 +327,25 @@ 
     $auth = MonsterInsights()->auth;
 
     //  Authenticate with public key
-    $key = sanitize_text_field($_REQUEST['key']);
+    $key = sanitize_text_field( $_REQUEST['key'] );
 
     $site_key = is_network_admin() ? $auth->get_network_key() : $auth->get_key();
 
-    if ( !hash_equals( $site_key, $key ) ) {
-        wp_send_json_error([
+    if ( ! hash_equals( $site_key, $key ) ) {
+        wp_send_json_error( [
             'error'     => __( 'Invalid site key.', 'google-analytics-for-wordpress' )
-        ], 401);
+        ], 401 );
     }
 
-    $v4 = is_network_admin() ? $auth->get_network_v4_id() :  $auth->get_v4_id();
+    $v4 = is_network_admin() ? $auth->get_network_v4_id() : $auth->get_v4_id();
     $has_secret = is_network_admin() ?
-        !empty( $auth->get_network_measurement_protocol_secret() ) :
-        !empty( $auth->get_measurement_protocol_secret() );
+        ! empty( $auth->get_network_measurement_protocol_secret() ) : ! empty( $auth->get_measurement_protocol_secret() );
 
-    wp_send_json([
+    wp_send_json( [
         'v4'                => $v4,
         'has_mp_secret'     => $has_secret,
         'plugin_version'    => MonsterInsights()->version
-    ]);
+    ] );
 }
 
 add_action( 'wp_ajax_nopriv_monsterinsights_get_plugin_info', 'monsterinsights_handle_get_plugin_info' );
@@ -364,16 +363,16 @@ 
 	$mediums   = array( 'cpc', 'banner', 'email' );
 	$campaigns = array( 'campaign-name', 'slogan', 'promo-code' );
 
-	for ( $i = 1; $i <= 13; $i ++ ) {
+	for ( $i = 1; $i <= 13; $i++ ) {
 		$rand_key = array_rand( $sources );
 
 		$report[] = array(
 			'transaction_id' => wp_rand( 12, 30 ),
 			'steps'          => wp_rand( 3, 8 ),
 			'order_total'    => wp_rand( 10, 50 ),
-			'utm_source'     => $sources[ $rand_key ],
-			'utm_medium'     => $mediums[ $rand_key ],
-			'utm_campaign'   => $campaigns[ $rand_key ],
+			'utm_source'     => $sources[$rand_key],
+			'utm_medium'     => $mediums[$rand_key],
+			'utm_campaign'   => $campaigns[$rand_key],
 			'purchase_date'  => '--',
 		);
 	}
@@ -409,7 +408,7 @@ 
 	// Run a security check first.
 	check_ajax_referer( 'monsterinsights-funnelkit-stripe-woo-nonce', 'nonce' );
 
-	$fkwcs_con_status = get_option('fkwcs_con_status'); 
+	$fkwcs_con_status = get_option( 'fkwcs_con_status' ); 
 
 	if ( 'success' === $fkwcs_con_status ) {
 		echo json_encode( true );

includes/admin/tracking.php

Indentation +7 added lines, -7 removed lines

@@ -72,10 +72,10 @@ 
 			$usesauth = 'Network';
 		}
 
-        //  Get auth connection type
-        $auth = MonsterInsights()->auth;
+	//  Get auth connection type
+	$auth = MonsterInsights()->auth;
 
-        $auth_mode = 'v4';
+	$auth_mode = 'v4';
 
 		$data['php_version']    = phpversion();
 		$data['mi_version']     = MONSTERINSIGHTS_VERSION;
@@ -99,7 +99,7 @@ 
 		$data['usercount']      = function_exists( 'get_user_count' ) ? get_user_count() : 'Not Set';
 		$data['usesauth']       = $usesauth;
 		$data['timezoneoffset'] = date( 'P' );
-        $data['ga_auth_mode']   = $auth_mode;
+	$data['ga_auth_mode']   = $auth_mode;
 
 		// Retrieve current plugin information
 		if ( ! function_exists( 'get_plugins' ) ) {
@@ -168,9 +168,9 @@ 
 			$tracking['minute']   = rand( 0, 59 );
 			$tracking['second']   = rand( 0, 59 );
 			$tracking['offset']   = ( $tracking['day'] * DAY_IN_SECONDS ) +
-			                        ( $tracking['hour'] * HOUR_IN_SECONDS ) +
-			                        ( $tracking['minute'] * MINUTE_IN_SECONDS ) +
-			                        $tracking['second'];
+						( $tracking['hour'] * HOUR_IN_SECONDS ) +
+						( $tracking['minute'] * MINUTE_IN_SECONDS ) +
+						$tracking['second'];
 			$tracking['initsend'] = strtotime( "next sunday" ) + $tracking['offset'];
 
 			wp_schedule_event( $tracking['initsend'], 'weekly', 'monsterinsights_usage_tracking_cron' );

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
 		$data['usercount']      = function_exists( 'get_user_count' ) ? get_user_count() : 'Not Set';
 		$data['usesauth']       = $usesauth;
 		$data['timezoneoffset'] = date( 'P' );
-        $data['ga_auth_mode']   = $auth_mode;
+        $data['ga_auth_mode'] = $auth_mode;
 
 		// Retrieve current plugin information
 		if ( ! function_exists( 'get_plugins' ) ) {
@@ -112,7 +112,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] );
 			}
 		}
 

includes/admin/eea-compliance.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 			return;
 		}
 
-		$authed  = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
+		$authed = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
 
 		if ( ! $authed ) {
 			wp_send_json_error();
@@ -164,7 +164,7 @@ 
 	 * If the authenticated website is found to be requiring EEA consent but does not have a cookie plugin installed.
 	 */
 	public function add_site_health_tests( $tests ) {
-		$authed  = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
+		$authed = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
 
 		if ( ! $authed ) {
 			return $tests;
@@ -199,7 +199,7 @@ 
 	 * Callback for EEA Compliance Check site health test.
 	 */
 	public function test_eea_compliance_checker() {
-		$link = admin_url('admin.php?page=monsterinsights_settings#/tools/eea-compliance');
+		$link = admin_url( 'admin.php?page=monsterinsights_settings#/tools/eea-compliance' );
 
 		return array(
 			'label'       => __( 'Check EEA Compliance with MonsterInsights', 'google-analytics-for-wordpress' ),

includes/admin/api-auth.php

Indentation +28 added lines, -28 removed lines

@@ -128,18 +128,18 @@ 
 
 		$sitei = $this->get_sitei();
 
-        $auth_request_args = array(
-            'tt'        => $this->get_tt(),
-            'sitei'     => $sitei,
-            'miversion' => MONSTERINSIGHTS_VERSION,
-            'ajaxurl'   => admin_url( 'admin-ajax.php' ),
-            'network'   => is_network_admin() ? 'network' : 'site',
-            'siteurl'   => is_network_admin() ? network_admin_url() : home_url(),
-            'return'    => is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ),
-            'testurl'   => 'https://' . monsterinsights_get_api_url() . 'test/',
-        );
-
-        $auth_request_args = apply_filters('monsterinsights_auth_request_body', $auth_request_args);
+	$auth_request_args = array(
+	    'tt'        => $this->get_tt(),
+	    'sitei'     => $sitei,
+	    'miversion' => MONSTERINSIGHTS_VERSION,
+	    'ajaxurl'   => admin_url( 'admin-ajax.php' ),
+	    'network'   => is_network_admin() ? 'network' : 'site',
+	    'siteurl'   => is_network_admin() ? network_admin_url() : home_url(),
+	    'return'    => is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ),
+	    'testurl'   => 'https://' . monsterinsights_get_api_url() . 'test/',
+	);
+
+	$auth_request_args = apply_filters('monsterinsights_auth_request_body', $auth_request_args);
 
 		$siteurl = add_query_arg($auth_request_args, $this->get_route( 'https://' . monsterinsights_get_api_url() . 'auth/new/{type}' ) );
 
@@ -225,7 +225,7 @@ 
 			return;
 		}
 
-        $code_value = monsterinsights_is_valid_v4_id( $_REQUEST['v4'] ); // phpcs:ignore
+	$code_value = monsterinsights_is_valid_v4_id( $_REQUEST['v4'] ); // phpcs:ignore
 
 		if ( empty( $code_value ) ) {
 			return;
@@ -323,20 +323,20 @@ 
 			wp_send_json_error( array( 'message' => $message ) );
 		}
 
-        $auth_request_args = array(
-            'tt'        => $this->get_tt(),
-            'sitei'     => $this->get_sitei(),
-            'miversion' => MONSTERINSIGHTS_VERSION,
-            'ajaxurl'   => admin_url( 'admin-ajax.php' ),
-            'network'   => is_network_admin() ? 'network' : 'site',
-            'siteurl'   => is_network_admin() ? network_admin_url() : home_url(),
-            'key'       => is_network_admin() ? MonsterInsights()->auth->get_network_key() : MonsterInsights()->auth->get_key(),
-            'token'     => is_network_admin() ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token(),
-            'return'    => is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ),
-            'testurl'   => 'https://' . monsterinsights_get_api_url() . 'test/',
-        );
+	$auth_request_args = array(
+	    'tt'        => $this->get_tt(),
+	    'sitei'     => $this->get_sitei(),
+	    'miversion' => MONSTERINSIGHTS_VERSION,
+	    'ajaxurl'   => admin_url( 'admin-ajax.php' ),
+	    'network'   => is_network_admin() ? 'network' : 'site',
+	    'siteurl'   => is_network_admin() ? network_admin_url() : home_url(),
+	    'key'       => is_network_admin() ? MonsterInsights()->auth->get_network_key() : MonsterInsights()->auth->get_key(),
+	    'token'     => is_network_admin() ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token(),
+	    'return'    => is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' ),
+	    'testurl'   => 'https://' . monsterinsights_get_api_url() . 'test/',
+	);
 
-        $auth_request_args = apply_filters('monsterinsights_auth_request_body', $auth_request_args);
+	$auth_request_args = apply_filters('monsterinsights_auth_request_body', $auth_request_args);
 
 		$siteurl = add_query_arg( $auth_request_args, $this->get_route( 'https://' . monsterinsights_get_api_url() . 'auth/reauth/{type}' ) );
 
@@ -368,7 +368,7 @@ 
 
 		// Make sure has required params
 		if (
-            empty( $_REQUEST['v4'] ) ||
+	    empty( $_REQUEST['v4'] ) ||
 			empty( $_REQUEST['miview'] ) ||
 			empty( $_REQUEST['a'] ) ||
 			empty( $_REQUEST['w'] ) ||
@@ -377,7 +377,7 @@ 
 			return;
 		}
 
-        $code_value = monsterinsights_is_valid_v4_id( $_REQUEST['v4'] ); // phpcs:ignore
+	$code_value = monsterinsights_is_valid_v4_id( $_REQUEST['v4'] ); // phpcs:ignore
 
 		if ( empty( $code_value ) ) {
 			return;

Spacing +9 added lines, -9 removed lines

@@ -139,9 +139,9 @@ 
             'testurl'   => 'https://' . monsterinsights_get_api_url() . 'test/',
         );
 
-        $auth_request_args = apply_filters('monsterinsights_auth_request_body', $auth_request_args);
+        $auth_request_args = apply_filters( 'monsterinsights_auth_request_body', $auth_request_args );
 
-		$siteurl = add_query_arg($auth_request_args, $this->get_route( 'https://' . monsterinsights_get_api_url() . 'auth/new/{type}' ) );
+		$siteurl = add_query_arg( $auth_request_args, $this->get_route( 'https://' . monsterinsights_get_api_url() . 'auth/new/{type}' ) );
 
 		if ( monsterinsights_is_pro_version() ) {
 			$key     = is_network_admin() ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
@@ -172,7 +172,7 @@ 
 		}
 
 		foreach ( $reqd_args as $arg ) {
-			if ( empty( $_REQUEST[ $arg ] ) ) {
+			if ( empty( $_REQUEST[$arg] ) ) {
 				$this->send_missing_args_error( $arg );
 			}
 		}
@@ -288,7 +288,7 @@ 
 			wp_send_json_error( array( 'message' => $message ) );
 		}
 
-		if ( ! empty( $_REQUEST['isnetwork'] ) && filter_var($_REQUEST['isnetwork'], FILTER_VALIDATE_BOOLEAN) ) {
+		if ( ! empty( $_REQUEST['isnetwork'] ) && filter_var( $_REQUEST['isnetwork'], FILTER_VALIDATE_BOOLEAN ) ) {
 			define( 'WP_NETWORK_ADMIN', true );
 		}
 
@@ -336,7 +336,7 @@ 
             'testurl'   => 'https://' . monsterinsights_get_api_url() . 'test/',
         );
 
-        $auth_request_args = apply_filters('monsterinsights_auth_request_body', $auth_request_args);
+        $auth_request_args = apply_filters( 'monsterinsights_auth_request_body', $auth_request_args );
 
 		$siteurl = add_query_arg( $auth_request_args, $this->get_route( 'https://' . monsterinsights_get_api_url() . 'auth/reauth/{type}' ) );
 
@@ -441,7 +441,7 @@ 
 			wp_send_json_error( array( 'message' => $message ) );
 		}
 
-		if ( ! empty( $_REQUEST['isnetwork'] ) && filter_var($_REQUEST['isnetwork'], FILTER_VALIDATE_BOOL) ) {
+		if ( ! empty( $_REQUEST['isnetwork'] ) && filter_var( $_REQUEST['isnetwork'], FILTER_VALIDATE_BOOL ) ) {
 			define( 'WP_NETWORK_ADMIN', true );
 		}
 
@@ -513,7 +513,7 @@ 
 			'token'   => $creds['token'],
 			'testurl' => 'https://' . monsterinsights_get_api_url() . 'test/'
 		) );
-		$ret     = $api->request();
+		$ret = $api->request();
 
 		$this->rotate_tt();
 		if ( is_wp_error( $ret ) ) {
@@ -541,7 +541,7 @@ 
 			wp_send_json_error( array( 'message' => $message ) );
 		}
 
-		if ( ! empty( $_REQUEST['isnetwork'] ) && filter_var($_REQUEST['isnetwork'], FILTER_VALIDATE_BOOL) ) {
+		if ( ! empty( $_REQUEST['isnetwork'] ) && filter_var( $_REQUEST['isnetwork'], FILTER_VALIDATE_BOOL ) ) {
 			define( 'WP_NETWORK_ADMIN', true );
 		}
 
@@ -768,7 +768,7 @@ 
 			: $auth->get_key();
 
 		$hashed_data = array(
-			'mp_token'  => sanitize_text_field($_POST['mp_token']),
+			'mp_token'  => sanitize_text_field( $_POST['mp_token'] ),
 			'timestamp' => $timestamp,
 		);
 

Braces +6 added lines, -3 removed lines

@@ -95,7 +95,8 @@ 
 			wp_send_json_error( array( 'message' => $message ) );
 		}
 
-		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) { // phpcs:ignore
+		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
+// phpcs:ignore
 			define( 'WP_NETWORK_ADMIN', true );
 		}
 
@@ -181,7 +182,8 @@ 
 			define( 'WP_NETWORK_ADMIN', true );
 		}
 
-		if ( ! $this->validate_tt( $_REQUEST['tt'] ) ) { // phpcs:ignore
+		if ( ! $this->validate_tt( $_REQUEST['tt'] ) ) {
+// phpcs:ignore
 			wp_send_json_error(
 				array(
 					'error'   => 'authenticate_invalid_tt',
@@ -362,7 +364,8 @@ 
 		}
 
 		// Invalid request
-		if ( empty( $_REQUEST['tt'] ) || ! $this->validate_tt( $_REQUEST['tt'] ) ) { // phpcs:ignore
+		if ( empty( $_REQUEST['tt'] ) || ! $this->validate_tt( $_REQUEST['tt'] ) ) {
+// phpcs:ignore
 			return;
 		}
 

includes/admin/reports/abstract-report.php

Indentation +9 added lines, -9 removed lines

@@ -420,15 +420,15 @@
 
 		$params = $this->get_ga_report_range( $data );
 
-        $format = 'https://analytics.google.com/analytics/web/#/%1$s/' . ( $is_real_time ? 'realtime' : 'reports' ) . '/%5$s?params=%3$s%4$s&r=%2$s';
-
-        if ( empty( $v4_name ) ) {
-            $report_name = '';
-        } else {
-            $report_name = $v4_name;
-        }
-        $extra_params = '&' . $v4_extra_params;
-        $endpoint     = $v4_endpoint;
+	$format = 'https://analytics.google.com/analytics/web/#/%1$s/' . ( $is_real_time ? 'realtime' : 'reports' ) . '/%5$s?params=%3$s%4$s&r=%2$s';
+
+	if ( empty( $v4_name ) ) {
+	    $report_name = '';
+	} else {
+	    $report_name = $v4_name;
+	}
+	$extra_params = '&' . $v4_extra_params;
+	$endpoint     = $v4_endpoint;
 
 		return sprintf(
 			$format,

Spacing +3 added lines, -3 removed lines

@@ -310,9 +310,9 @@
 				// Success
 
 				// Strip any HTML tags from API response
-				$ret['data'] = json_encode($ret['data']);
-				$ret['data'] = strip_tags($ret['data']);
-				$ret['data'] = json_decode($ret['data'], true);
+				$ret['data'] = json_encode( $ret['data'] );
+				$ret['data'] = strip_tags( $ret['data'] );
+				$ret['data'] = json_decode( $ret['data'], true );
 
 				$data = array(
 					'expires' => time() + $expiration,

includes/admin/reports/site-insights.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		if ( ! empty( $data['data']['countries'] ) ) {
 			$country_names = monsterinsights_get_country_list( true );
 			foreach ( $data['data']['countries'] as $key => $country ) {
-				$data['data']['countries'][ $key ]['name'] = isset( $country_names[ $country['iso'] ] ) ? $country_names[ $country['iso'] ] : $country['iso'];
+				$data['data']['countries'][$key]['name'] = isset( $country_names[$country['iso']] ) ? $country_names[$country['iso']] : $country['iso'];
 			}
 		}
 

includes/admin/reports/overview.php

Spacing +6 added lines, -6 removed lines

@@ -47,17 +47,17 @@ 
 		if ( ! empty( $data['data']['countries'] ) ) {
 			$country_names = monsterinsights_get_country_list( true );
 			foreach ( $data['data']['countries'] as $key => $country ) {
-				$data['data']['countries'][ $key ]['name'] = isset( $country_names[ $country['iso'] ] ) ? $country_names[ $country['iso'] ] : $country['iso'];
+				$data['data']['countries'][$key]['name'] = isset( $country_names[$country['iso']] ) ? $country_names[$country['iso']] : $country['iso'];
 			}
 		}
 
 		// Escape urls for the top pages report.
 		if ( ! empty( $data['data']['toppages'] ) ) {
 			foreach ( $data['data']['toppages'] as $key => $page ) {
-				$title = $data['data']['toppages'][ $key ]['title'];
-				$url   = '(not set)' === $title ? '' : esc_url( $data['data']['toppages'][ $key ]['hostname'] );
+				$title = $data['data']['toppages'][$key]['title'];
+				$url   = '(not set)' === $title ? '' : esc_url( $data['data']['toppages'][$key]['hostname'] );
 
-				$data['data']['toppages'][ $key ]['hostname'] = $url;
+				$data['data']['toppages'][$key]['hostname'] = $url;
 			}
 		}
 
@@ -108,8 +108,8 @@ 
 
 			// Generate random chart data.
 			for ( $i = 0; $i < $data['data']['overviewgraph']['count']; $i++ ) {
-				$data['data']['overviewgraph']['sessions']['datapoints'][ $i ] = wp_rand(1, 5);
-				$data['data']['overviewgraph']['pageviews']['datapoints'][ $i ] = wp_rand(1, 5);
+				$data['data']['overviewgraph']['sessions']['datapoints'][$i] = wp_rand( 1, 5 );
+				$data['data']['overviewgraph']['pageviews']['datapoints'][$i] = wp_rand( 1, 5 );
 			}
 
 		}