awesomemotive / google-analytics-for-wordpress

includes/admin/admin.php

Indentation +140 added lines, -140 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' );
@@ -439,7 +439,7 @@ 
 // AM Notices
 function monsterinsights_am_notice_optout( $super_admin ) {
     if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) {
-        return false;
+	return false;
     }
     return $super_admin;
 }

includes/admin/pages/addons.php

Indentation +105 added lines, -105 removed lines

@@ -18,20 +18,20 @@ 
     global $admin_page_hooks;
    
     if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
-        return false;
+	return false;
     }
 
     $settings_page = false;
     if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_addons' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( ! empty( $admin_page_hooks['monsterinsights_settings'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] . '_page_monsterinsights_addons' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( ! empty( $admin_page_hooks['monsterinsights_network'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_network'] . '_page_monsterinsights_addons-network' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     return $settings_page;
@@ -46,16 +46,16 @@ 
  */
 function monsterinsights_maybe_refresh_addons() {
     if ( ! monsterinsights_is_addons_page() ) {
-        return;
+	return;
     }
 
 
     if ( empty( $_POST['google-analytics-for-wordpress-refresh-addons-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['google-analytics-for-wordpress-refresh-addons'], 'google-analytics-for-wordpress-refresh-addons' ) ) {
-        return;
+	return;
     }
 
     monsterinsights_get_addons_data( MonsterInsights()->license->get_valid_license_key() );
@@ -93,14 +93,14 @@ 
     <div id="monsterinsights-addons" class="wrap">
         <div class="monsterinsights-clear">
             <?php
-            /** 
-             * Developer Alert:
-             *
-             * Per the README, this is considered an internal hook and should
-             * not be used by other developers. This hook's behavior may be modified
-             * or the hook may be removed at any time, without warning.
-             */
-            ?>
+	    /** 
+	     * Developer Alert:
+	     *
+	     * Per the README, this is considered an internal hook and should
+	     * not be used by other developers. This hook's behavior may be modified
+	     * or the hook may be removed at any time, without warning.
+	     */
+	    ?>
             <?php do_action( 'monsterinsights_addons_section' ); ?>
         </div>
     </div>
@@ -117,14 +117,14 @@ 
 
     // If error(s) occurred during license key verification, display them and exit now.
     if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->get_valid_license_key() ) {
-        ?>
+	?>
         <div class="error below-h2">
             <p>
                 <?php esc_html_e( 'In order to get access to Addons, you need to resolve your license key errors.', 'google-analytics-for-wordpress' ); ?>
             </p>
         </div>
         <?php
-        return;
+	return;
     }
 
     // Get Addons
@@ -133,7 +133,7 @@ 
     // If no Addon(s) were returned, our API call returned an error.
     // Show an error message with a button to reload the page, which will trigger another API call.
     if ( ! $addons ) {
-        ?>
+	?>
         <form id="monsterinsights-addons-refresh-addons-form" method="post">
             <p>
                 <?php esc_html_e( 'There was an issue retrieving the addons for this site. Please click on the button below the refresh the addons data.', 'google-analytics-for-wordpress' ); ?>
@@ -143,7 +143,7 @@ 
             </p>
         </form>
         <?php
-        return;
+	return;
     }
 
     // If here, we have Addons to display, so let's output them now.
@@ -153,9 +153,9 @@ 
     ?>
     <div id="monsterinsights-addons">
         <?php
-        // Output Addons the User is licensed to use.
-        if ( count( $addons['licensed'] )> 0 ) {
-            ?>
+	// Output Addons the User is licensed to use.
+	if ( count( $addons['licensed'] )> 0 ) {
+	    ?>
             <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3>
                 
@@ -163,19 +163,19 @@ 
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['licensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
-                        }
-                        ?>
+			foreach ( (array) $addons['licensed'] as $i => $addon ) {
+			    monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
+			}
+			?>
                     </div>
                 </div>
             </div>
             <?php
-        } // Close licensed addons
+	} // Close licensed addons
 
-        // Output Addons the User isn't licensed to use.
-        if ( count( $addons['unlicensed'] ) > 0 ) {
-            ?>
+	// Output Addons the User isn't licensed to use.
+	if ( count( $addons['unlicensed'] ) > 0 ) {
+	    ?>
             <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3>
                 <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p>
@@ -184,16 +184,16 @@ 
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
-                        }
-                        ?>
+			foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
+			    monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
+			}
+			?>
                     </div>
                 </div>
             </div>
             <?php
-        } // Close unlicensed addons
-        ?>
+	} // Close unlicensed addons
+	?>
     </div>
     <?php
 
@@ -215,37 +215,37 @@ 
     
     // Get addons data from transient or perform API query if no transient.
     if ( false === ( $addons = get_transient( '_monsterinsights_addons' ) ) ) {
-        $addons = monsterinsights_get_addons_data( $key );
+	$addons = monsterinsights_get_addons_data( $key );
     }
 
     // If no Addons exist, return false
     if ( ! $addons ) {
-        return false;
+	return false;
     }
 
     // Iterate through Addons, to build two arrays: 
     // - Addons the user is licensed to use,
     // - Addons the user isn't licensed to use.
     $results = array(
-        'licensed'  => array(),
-        'unlicensed'=> array(),
+	'licensed'  => array(),
+	'unlicensed'=> array(),
     );
     foreach ( (array) $addons as $i => $addon ) {
 
-        // Determine whether the user is licensed to use this Addon or not.
-        if ( 
-            empty( $type ) ||
-            ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
-            ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
-            ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
-        ) {
-            // Unlicensed
-            $results['unlicensed'][] = $addon;
-            continue;
-        }
-
-        // Licensed
-        $results['licensed'][] = $addon;
+	// Determine whether the user is licensed to use this Addon or not.
+	if ( 
+	    empty( $type ) ||
+	    ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
+	    ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
+	    ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
+	) {
+	    // Unlicensed
+	    $results['unlicensed'][] = $addon;
+	    continue;
+	}
+
+	// Licensed
+	$results['licensed'][] = $addon;
 
     }
 
@@ -268,21 +268,21 @@ 
     // Get Addons
     // If the key is valid, we'll get personalised upgrade URLs for each Addon (if necessary) and plugin update information.
     if ( $key ) {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
     } else {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
     }
     
     // If there was an API error, set transient for only 10 minutes.
     if ( ! $addons ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // If there was an error retrieving the addons, set the error.
     if ( isset( $addons->error ) ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // Otherwise, our request worked. Save the data and return it.
@@ -303,9 +303,9 @@ 
     $keys = array_keys( get_plugins() );
 
     foreach ( $keys as $key ) {
-        if ( preg_match( '|^' . $slug . '|', $key ) ) {
-            return $key;
-        }
+	if ( preg_match( '|^' . $slug . '|', $key ) ) {
+	    return $key;
+	}
     }
 
     return $slug;
@@ -328,24 +328,24 @@ 
     $slug = str_replace( 'monsterinsights-', '', $addon->slug );
     $slug = 'monsterinsights-' . $addon->slug;
     if ( $slug === 'monsterinsights-ecommerce' ) {
-        $slug = 'ga-ecommerce';
+	$slug = 'ga-ecommerce';
     } 
 
     $plugin_basename   = monsterinsights_get_plugin_basename_from_slug( $slug );
     $categories = implode( ',', $addon->categories );
     if ( ! $installed_plugins ) {
-        $installed_plugins = get_plugins();
+	$installed_plugins = get_plugins();
     }
    
     // If the Addon doesn't supply an upgrade_url key, it's because the user hasn't provided a license
     // get_upgrade_link() will return the Lite or Pro link as necessary for us.
     if ( ! isset( $addon->upgrade_url ) ) {
-        $addon->upgrade_url = monsterinsights_get_upgrade_link();
+	$addon->upgrade_url = monsterinsights_get_upgrade_link();
     }
 
     // Link user to doc to install MI pro to install addons
     if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-        $addon->url = 'https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons';
+	$addon->url = 'https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons';
     }
 
     // Output the card
@@ -353,19 +353,19 @@ 
     <div class="monsterinsights-addon">
         <h3 class="monsterinsights-addon-title"><?php echo esc_html( $addon->title ); ?></h3>
         <?php
-        if ( ! empty( $addon->image ) ) {
-            ?>
+	if ( ! empty( $addon->image ) ) {
+	    ?>
             <img class="monsterinsights-addon-thumb" src="<?php echo esc_attr( esc_url( $addon->image ) ); ?>" alt="<?php echo esc_attr( $addon->title ); ?>" />
             <?php
-        }
-        ?>
+	}
+	?>
 
         <p class="monsterinsights-addon-excerpt"><?php echo esc_html( $addon->excerpt ); ?></p>
 
         <?php
-        // If the Addon is unlicensed, show the upgrade button 
-        if ( ! $is_licensed ) {
-            ?>
+	// If the Addon is unlicensed, show the upgrade button 
+	if ( ! $is_licensed ) {
+	    ?>
             <div class="monsterinsights-addon-active monsterinsights-addon-message">
                 <div class="interior">
                     <div class="monsterinsights-addon-upgrade">
@@ -377,15 +377,15 @@ 
                 </div>
             </div>
             <?php
-        } else {
-            // Addon is licensed
-
-            // If the plugin is not installed, display an install message and button.
-            if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-                if ( empty( $addon->url ) ) {
-                    $addon->url = '';
-                }
-                ?>
+	} else {
+	    // Addon is licensed
+
+	    // If the plugin is not installed, display an install message and button.
+	    if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+		if ( empty( $addon->url ) ) {
+		    $addon->url = '';
+		}
+		?>
                 <div class="monsterinsights-addon-not-installed monsterinsights-addon-message">
                     <div class="interior">
                          <?php if ( monsterinsights_is_pro_version() ) { ?>
@@ -408,22 +408,22 @@ 
                     </div>
                 </div>
                 <?php
-            } else {
-                // Plugin is installed.
+	    } else {
+		// Plugin is installed.
                 
-                $active = false;
-                $ms_active = is_plugin_active_for_network( $plugin_basename );
-                $ss_active = is_plugin_active( $plugin_basename );
-
-                if ( is_multisite() && is_network_admin() ) {
-                    $active = is_plugin_active_for_network( $plugin_basename );
-                } else {
-                    $active = is_plugin_active( $plugin_basename );
-                }
-
-                if ( $active ) {
-                    // Plugin is active. Display the active message and deactivate button.
-                    ?>
+		$active = false;
+		$ms_active = is_plugin_active_for_network( $plugin_basename );
+		$ss_active = is_plugin_active( $plugin_basename );
+
+		if ( is_multisite() && is_network_admin() ) {
+		    $active = is_plugin_active_for_network( $plugin_basename );
+		} else {
+		    $active = is_plugin_active( $plugin_basename );
+		}
+
+		if ( $active ) {
+		    // Plugin is active. Display the active message and deactivate button.
+		    ?>
                     <div class="monsterinsights-addon-active monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
@@ -449,9 +449,9 @@ 
                         </div>
                     </div>
                     <?php
-                } else {
-                    // Plugin is inactivate. Display the inactivate mesage and activate button.
-                    ?>
+		} else {
+		    // Plugin is inactivate. Display the inactivate mesage and activate button.
+		    ?>
                     <div class="monsterinsights-addon-inactive monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
@@ -474,10 +474,10 @@ 
                         </div>
                     </div>
                     <?php
-                }
-            }
-        }
-        ?>
+		}
+	    }
+	}
+	?>
     </div>
     <?php
 }
\ No newline at end of file

includes/admin/pages/network-settings.php

Indentation +36 added lines, -36 removed lines

@@ -38,28 +38,28 @@ 
             <div id="monsterinsights-main-tab-general" class="monsterinsights-main-nav-tab monsterinsights-nav-tab monsterinsights-active">
                 <div id="monsterinsights-network-settings-general">
                     <?php 
-                    // Output any notices now
-                    /** 
-                     * Developer Alert:
-                     *
-                     * Per the README, this is considered an internal hook and should
-                     * not be used by other developers. This hook's behavior may be modified
-                     * or the hook may be removed at any time, without warning.
-                     */
-                    do_action( 'monsterinsights_network_settings_general_tab_notice' );
-                    ?>
+		    // Output any notices now
+		    /** 
+		     * Developer Alert:
+		     *
+		     * Per the README, this is considered an internal hook and should
+		     * not be used by other developers. This hook's behavior may be modified
+		     * or the hook may be removed at any time, without warning.
+		     */
+		    do_action( 'monsterinsights_network_settings_general_tab_notice' );
+		    ?>
                     <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress'); ?></h1>
                     <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
                     <table class="form-table">
                         <tbody>
                             <?php if ( monsterinsights_is_pro_version() ) { 
 
-                                    $license_key  = MonsterInsights()->license->get_network_license_key();
-                                    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
+				    $license_key  = MonsterInsights()->license->get_network_license_key();
+				    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
 
-                                    $license_type = MonsterInsights()->license->get_network_license_type();
+				    $license_type = MonsterInsights()->license->get_network_license_type();
 
-                                ?>
+				?>
                                 <tr id="monsterinsights-settings-key-box">
                                     <th scope="row">
                                         <label for="monsterinsights-settings-key"><?php esc_html_e( 'License Key', 'google-analytics-for-wordpress' ); ?></label>
@@ -134,8 +134,8 @@ 
                             </tr>
 
                             <?php if ( ! MonsterInsights()->auth->get_network_viewname() ) {
-                                $network_ua = MonsterInsights()->auth->get_network_manual_ua();
-                            ?>
+				$network_ua = MonsterInsights()->auth->get_network_manual_ua();
+			    ?>
                             <tr id="monsterinsights-google-ua-box" <?php echo (empty( $network_ua ) ? 'class="monsterinsights-hideme"' : ''); ?> >
                                 <form id="monsterinsights-network-general-tab" method="post">
                                     <th scope="row">
@@ -166,10 +166,10 @@ 
                             </tr>
                             <?php } ?>
                             <?php
-                            $title       = esc_html__( 'Hide Announcements', 'google-analytics-for-wordpress' );
-                            $description = esc_html__( 'Hides plugin announcements and update details. This includes critical notices we use to inform about deprecations and important required configuration changes.', 'google-analytics-for-wordpress' );
-                            echo monsterinsights_make_checkbox( 'network_hide_am_notices', $title, $description );
-                            ?>
+			    $title       = esc_html__( 'Hide Announcements', 'google-analytics-for-wordpress' );
+			    $description = esc_html__( 'Hides plugin announcements and update details. This includes critical notices we use to inform about deprecations and important required configuration changes.', 'google-analytics-for-wordpress' );
+			    echo monsterinsights_make_checkbox( 'network_hide_am_notices', $title, $description );
+			    ?>
                         </tbody>
                     </table>
                 </div>
@@ -191,15 +191,15 @@ 
 
     // Check if user pressed the 'Update' button and nonce is valid
     if ( ! isset( $_POST['monsterinsights-network-settings-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['monsterinsights-network-settings-nonce'], 'monsterinsights-network-settings-nonce' ) ) {
-        return;
+	return;
     }
 
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     $throw_notice       = false;
@@ -208,22 +208,22 @@ 
     $manual_ua_code_old = MonsterInsights()->auth->get_network_manual_ua();
     
     if ( $manual_ua_code && $manual_ua_code_old && $manual_ua_code_old === $manual_ua_code ) {
-        // Same code we had before
-            // Do nothing
+	// Same code we had before
+	    // Do nothing
     } else if ( $manual_ua_code && $manual_ua_code_old && $manual_ua_code_old !== $manual_ua_code ) {
-        // Different UA code
-        MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
+	// Different UA code
+	MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
     } else if ( $manual_ua_code && empty( $manual_ua_code_old ) ) {
-        // Move to manual
-        MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
+	// Move to manual
+	MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
     } else if ( empty( $manual_ua_code ) && $manual_ua_code_old ) {
-        // Deleted manual
-        MonsterInsights()->auth->delete_network_manual_ua();
+	// Deleted manual
+	MonsterInsights()->auth->delete_network_manual_ua();
     } else if ( isset( $_POST['network_manual_ua_code'] ) && empty( $manual_ua_code ) ) {
-        $throw_notice = true;
+	$throw_notice = true;
     } else {
-        // Not UA before or after
-            // Do nothing
+	// Not UA before or after
+	    // Do nothing
     }
 
     $network_hide_am_notices     = isset( $_POST['network_hide_am_notices'] ) ? 1 : 0;
@@ -235,9 +235,9 @@ 
 
     // Output an admin notice so the user knows what happened
     if ( $throw_notice ) {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+	add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
     } else {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+	add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
     }
 }
 add_action( 'admin_init', 'monsterinsights_network_settings_save_general', 11 );
\ No newline at end of file