awesomemotive / google-analytics-for-wordpress

includes/admin/admin.php

Indentation +67 added lines, -67 removed lines

@@ -32,26 +32,26 @@ 
     $hook = 'monsterinsights_settings';
 
     if ( $dashboards_disabled || ( 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:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
-        // if dashboards enabled, first dashboard
-        add_menu_page( __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard', 'monsterinsights_dashboard_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+	// if dashboards enabled, first dashboard
+	add_menu_page( __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard', 'monsterinsights_dashboard_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
-        $hook = 'monsterinsights_dashboard';
+	$hook = 'monsterinsights_dashboard';
 
-        add_submenu_page( $hook, __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Dashboard', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard' );
+	add_submenu_page( $hook, __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Dashboard', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard' );
 
-        // 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' );
     }
 
     if ( ! $dashboards_disabled ) {
-        // then reports
-        add_submenu_page( $hook, __( 'Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
+	// then reports
+	add_submenu_page( $hook, __( 'Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
     }
     
     // then tools
@@ -60,7 +60,7 @@ 
     // then addons
     $network_license = get_site_option( 'monsterinsights_license' );
     if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_license ) ) ) {
-        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';
@@ -101,7 +101,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 ";
@@ -121,17 +121,17 @@ 
 
     // If lite, show a link where they can get pro from
     if ( ! monsterinsights_is_pro_version() ) {
-        $get_pro = '<a title="Get MonsterInsights Pro" href="https://www.monsterinsights.com/upgrade-to-pro/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $get_pro );
+	$get_pro = '<a title="Get MonsterInsights Pro" href="https://www.monsterinsights.com/upgrade-to-pro/">' . 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 @@ 
     $base = MonsterInsights();
 
     if ( monsterinsights_is_pro_version() ) {
-        $dir = trailingslashit( plugin_dir_path( $base->file ) . 'pro/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( $base->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( $base->file ) . 'lite/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( $base->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( $base->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;
@@ -196,15 +196,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', $base->file ),
-        'logo'     => plugins_url( 'assets/css/images/logo.png', $base->file ),
-        '2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', $base->file ),
-        '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', $base->file ),
+	'mascot'   => plugins_url( 'assets/css/images/mascot.png', $base->file ),
+	'logo'     => plugins_url( 'assets/css/images/logo.png', $base->file ),
+	'2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', $base->file ),
+	'2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', $base->file ),
     ) );
 }
 add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
@@ -212,7 +212,7 @@ 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
     if ( ! get_transient( '_monsterinsights_activation_redirect' ) ) {
-        return;
+	return;
     }
 
     // Delete the redirect transient
@@ -220,15 +220,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
@@ -244,8 +244,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;
 }
@@ -255,7 +255,7 @@ 
     // Don't show on MonsterInsights pages
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-        return;
+	return;
     }
     
     $analytics = monsterinsights_get_option( 'tracking_mode', 'analytics' );
@@ -265,33 +265,33 @@ 
     $notices   = get_option( 'monsterinsights_notices' );
 
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ){
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
-            echo '<p>';
-            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
-            echo '</p>';
-        echo '</div>';
+	    echo '<p>';
+	    echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+	    echo '</p>';
+	echo '</div>';
     } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ){
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
-            echo '<p>';
-            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
-            echo '</p>';
-        echo '</div>';
+	    echo '<p>';
+	    echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+	    echo '</p>';
+	echo '</div>';
     } else if ( empty( $updates) && ! isset( $notices ['monsterinsights_automatic_updates' ] ) ){ 
-        if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
-            return;
-        }
-        if ( defined( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE' ) && MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE ) {
-            return;
-        }
-        echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_automatic_updates">';
-            echo '<p>';
-            echo sprintf( esc_html__( 'Important: Please %1$sconfigure the Automatic Updates Settings%2$s in MonsterInsights.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
-            echo '</p>';
-        echo '</div>';
+	if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
+	    return;
+	}
+	if ( defined( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE' ) && MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE ) {
+	    return;
+	}
+	echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_automatic_updates">';
+	    echo '<p>';
+	    echo sprintf( esc_html__( 'Important: Please %1$sconfigure the Automatic Updates Settings%2$s in MonsterInsights.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+	    echo '</p>';
+	echo '</div>';
     }
 }
 add_action( 'admin_notices', 'monsterinsights_deprecated_notices' );
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -33,13 +33,13 @@ 
 
     if ( $dashboards_disabled || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard', 'monsterinsights_dashboard_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard', 'monsterinsights_dashboard_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
         $hook = 'monsterinsights_dashboard';
 
@@ -83,7 +83,7 @@ 
     }
 
     $hook = 'monsterinsights_network';
-    add_menu_page( __( 'Network Settings', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+    add_menu_page( __( 'Network Settings', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
     add_submenu_page( $hook, __( 'Network Settings', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
@@ -161,14 +161,14 @@ 
         $dir = trailingslashit( plugin_dir_path( $base->file ) . 'pro/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( $base->file ) . 'lite/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }   
     }
@@ -176,7 +176,7 @@ 
     $dir = trailingslashit( plugin_dir_path( $base->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
                 
@@ -207,7 +207,7 @@ 
         '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', $base->file ),
     ) );
 }
-add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
+add_action( 'in_admin_header', 'monsterinsights_admin_header', 100 );
 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
@@ -224,7 +224,7 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if ( ! $upgrade ) { // First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
         return;
@@ -245,7 +245,7 @@ 
     global $current_screen;
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -268,19 +268,19 @@ 
         $notices = array();
     }
 
-    if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ){
+    if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga'] ) ) {
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
-    } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ){
+    } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php'] ) ) {
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
-    } else if ( empty( $updates) && ! isset( $notices ['monsterinsights_automatic_updates' ] ) ){ 
+    } else if ( empty( $updates ) && ! isset( $notices ['monsterinsights_automatic_updates'] ) ) { 
         if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
             return;
         }
@@ -289,7 +289,7 @@ 
         }
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_automatic_updates">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Important: Please %1$sconfigure the Automatic Updates Settings%2$s in MonsterInsights.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Important: Please %1$sconfigure the Automatic Updates Settings%2$s in MonsterInsights.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
     }

Braces +7 added lines, -5 removed lines

@@ -224,9 +224,11 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if( ! $upgrade ) {
+// First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
-    } else { // Update
+    } else {
+// Update
         return;
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
@@ -268,19 +270,19 @@ 
         $notices = array();
     }
 
-    if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ){
+    if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ) {
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
             echo '<p>';
             echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
             echo '</p>';
         echo '</div>';
-    } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ){
+    } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ) {
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
             echo '<p>';
             echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
             echo '</p>';
         echo '</div>';
-    } else if ( empty( $updates) && ! isset( $notices ['monsterinsights_automatic_updates' ] ) ){ 
+    } else if ( empty( $updates) && ! isset( $notices ['monsterinsights_automatic_updates' ] ) ) {
         if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
             return;
         }

includes/admin/tracking.php

Spacing +10 added lines, -10 removed lines

@@ -40,7 +40,7 @@ 
 		add_action( 'monsterinsights_settings_save_general_end', array( $this, 'check_for_settings_optin' ) );
 		add_action( 'admin_head', array( $this, 'check_for_optin' ) );
 		add_action( 'admin_head', array( $this, 'check_for_optout' ) );
-		add_action( 'admin_notices', array( $this, 'monsterinsights_admin_notice' ),7 );
+		add_action( 'admin_notices', array( $this, 'monsterinsights_admin_notice' ), 7 );
 		add_filter( 'cron_schedules', array( $this, 'add_schedules' ) );
 		add_action( 'monsterinsights_daily_cron', array( $this, 'send_checkin' ) );
 	}
@@ -100,7 +100,7 @@ 
 		$data['autoupdate']    = $update_mode;
 
 		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
@@ -110,7 +110,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] );
 			}
 		}
 
@@ -130,21 +130,21 @@ 
 	public function send_checkin( $override = false, $ignore_last_checkin = false ) {
 
 		$home_url = trailingslashit( home_url() );
-		if ( $home_url === 'https://www.monsterinsights.com/'     || 
-			 $home_url === 'https://beta.monsterinsights.com/'    ||
+		if ( $home_url === 'https://www.monsterinsights.com/' || 
+			 $home_url === 'https://beta.monsterinsights.com/' ||
 			 $home_url === 'https://staging.monsterinsights.com/' ||
 			 $home_url === 'https://testing.monsterinsights.com/'
 		) {
 			return false;
 		}
 
-		if( ! $this->tracking_allowed() && ! $override ) {
+		if ( ! $this->tracking_allowed() && ! $override ) {
 			return false;
 		}
 
 		// Send a maximum of once per week
 		$last_send = $this->get_last_send();
-		if( is_numeric( $last_send ) && $last_send > strtotime( '-1 week' ) && ! $ignore_last_checkin ) {
+		if ( is_numeric( $last_send ) && $last_send > strtotime( '-1 week' ) && ! $ignore_last_checkin ) {
 			return false;
 		}
 
@@ -160,7 +160,7 @@ 
 			'user-agent'  => 'MI/' . MONSTERINSIGHTS_VERSION . '; ' . get_bloginfo( 'url' )
 		) );
 
-		if( is_wp_error( $request ) ) {
+		if ( is_wp_error( $request ) ) {
 			return $request;
 		}
 
@@ -289,9 +289,9 @@ 
 		}
 		
 		if (
-			stristr( network_site_url( '/' ), 'dev'       ) !== false ||
+			stristr( network_site_url( '/' ), 'dev' ) !== false ||
 			stristr( network_site_url( '/' ), 'localhost' ) !== false ||
-			stristr( network_site_url( '/' ), ':8888'     ) !== false // This is common with MAMP on OS X
+			stristr( network_site_url( '/' ), ':8888' ) !== false // This is common with MAMP on OS X
 		) {
 			update_option( 'monsterinsights_tracking_notice', '1' );
 		} else {

includes/admin/notice.php

Indentation +87 added lines, -87 removed lines

@@ -36,11 +36,11 @@ 
      */
     public function __construct() {
 
-        // Populate $notices
-        $this->notices = get_option( 'monsterinsights_notices' );
-        if ( ! is_array( $this->notices ) ) {
-            $this->notices = array();
-        }
+	// Populate $notices
+	$this->notices = get_option( 'monsterinsights_notices' );
+	if ( ! is_array( $this->notices ) ) {
+	    $this->notices = array();
+	}
 
     }
 
@@ -55,10 +55,10 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
-            return false;
-        }
-        return true;
+	if ( ! isset( $this->notices[ $notice ] ) ) {
+	    return false;
+	}
+	return true;
 
     }
 
@@ -72,8 +72,8 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
-        update_option( 'monsterinsights_notices', $this->notices );
+	$this->notices[ $notice ] = true;
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -88,8 +88,8 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
-        update_option( 'monsterinsights_notices', $this->notices );
+	unset( $this->notices[ $notice ] );
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -108,7 +108,7 @@ 
      * @param bool      $is_dismissible     User can Dismiss Message (default: false)
      */ 
     public function display_inline_notice( $name, $title, $message, $type = 'success', $is_dismissible = false, $args = array() ) {
-        /* Available/Planned $args options
+	/* Available/Planned $args options
          * $args = array(
          *  'primary'    => array(
          *      'text'   => '',
@@ -127,110 +127,110 @@ 
          */
 
 
-        // Check if the notice is dismissible, and if so has been dismissed.
-        if ( $is_dismissible && $this->is_dismissed( $name ) ) {
-            // Nothing to show here, return!
-            return '';
-        }
+	// Check if the notice is dismissible, and if so has been dismissed.
+	if ( $is_dismissible && $this->is_dismissed( $name ) ) {
+	    // Nothing to show here, return!
+	    return '';
+	}
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+	$dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
 
-        // Display inline notice
-        ob_start();
-        ?>
+	// Display inline notice
+	ob_start();
+	?>
         <div class="monsterinsights-notice <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice' . $dismissible; ?>" data-notice="<?php echo esc_attr( $name ); ?>">
             <div class="monsterinsights-notice-icon <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-icon'?>">
             </div>
             <div class="monsterinsights-notice-text <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-text'?>">
                 <?php
-                // Title
-                if ( ! empty ( $title ) ) {
-                    ?>
+		// Title
+		if ( ! empty ( $title ) ) {
+		    ?>
                     <p class="monsterinsights-notice-title"><?php echo esc_html( $title ); ?></p>
                     <?php
-                }
+		}
 
-                // Message
-                if ( ! empty( $message ) ) {
-                    if ( empty( $args['skip_message_escape'] ) ) {
-                        ?>
+		// Message
+		if ( ! empty( $message ) ) {
+		    if ( empty( $args['skip_message_escape'] ) ) {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo esc_html( $message ); ?></p>
                         <?php
-                    } else {
-                        ?>
+		    } else {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo $message; ?></p>
                         <?php
-                    }
-                }
+		    }
+		}
                 
-                // Primary Button
-                if ( ! empty( $args['primary']['text'] ) ) {
+		// Primary Button
+		if ( ! empty( $args['primary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['primary']['text'] ) ) {
-                        $text = $args['primary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['primary']['url'] ) ) {
-                        $url = $args['primary']['url'];
-                    }
-
-                    $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-primary';
-                    if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['primary']['text'] ) ) {
+			$text = $args['primary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['primary']['url'] ) ) {
+			$url = $args['primary']['url'];
+		    }
+
+		    $target = '';
+		    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-primary';
+		    if ( ! empty( $args['primary']['class'] ) ) {
+			$class = ' class="'. $args['primary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Secondary Button
-                if ( ! empty( $args['secondary']['text'] ) ) {
+		// Secondary Button
+		if ( ! empty( $args['secondary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['secondary']['text'] ) ) {
-                        $text = $args['secondary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['secondary']['url'] ) ) {
-                        $url = $args['secondary']['url'];
-                    }           
-
-                    $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-secondary';
-                    if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['secondary']['text'] ) ) {
+			$text = $args['secondary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['secondary']['url'] ) ) {
+			$url = $args['secondary']['url'];
+		    }           
+
+		    $target = '';
+		    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-secondary';
+		    if ( ! empty( $args['secondary']['class'] ) ) {
+			$class = ' class="'. $args['secondary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Dismiss Button
-                if ( $is_dismissible ) {
-                    ?>
+		// Dismiss Button
+		if ( $is_dismissible ) {
+		    ?>
                     <button type="button" class="notice-dismiss<?php echo $dismissible; ?>">
                         <span class="screen-reader-text">
                             <?php esc_html_e( 'Dismiss this notice', 'google-analytics-for-wordpress' ); ?>
                         </span>
                     </button>
                     <?php
-                }
-                ?>
+		}
+		?>
             </div>
         </div>
         <?php
-        return ob_get_clean();
+	return ob_get_clean();
     }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
+        if ( ! isset( $this->notices[$notice] ) ) {
             return false;
         }
         return true;
@@ -72,7 +72,7 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
+        $this->notices[$notice] = true;
         update_option( 'monsterinsights_notices', $this->notices );
 
     }
@@ -88,7 +88,7 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
+        unset( $this->notices[$notice] );
         update_option( 'monsterinsights_notices', $this->notices );
 
     }
@@ -133,7 +133,7 @@ 
             return '';
         }
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+        $dismissible = ( $is_dismissible ) ? ' is-dismissible' : '';
 
         // Display inline notice
         ob_start();
@@ -177,16 +177,16 @@ 
                     }
 
                     $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank' ) {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-primary';
                     if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
+                        $class = ' class="' . $args['primary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html( $text ); ?></a>
                     <?php
                 }
 
@@ -204,16 +204,16 @@ 
                     }           
 
                     $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank' ) {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-secondary';
                     if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
+                        $class = ' class="' . $args['secondary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html( $text ); ?></a>
                     <?php
                 }
 

includes/admin/abstract-report.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 	 // Adds the report to the array of reports.
 	public function add_report( $reports ) {
-		$reports[ $this->report_hook ] = $this->report_name;
+		$reports[$this->report_hook] = $this->report_name;
 		return $reports;
 	}
 

includes/admin/licensing/skin.php

Indentation +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function __construct( $args = array() ) {
 
-        parent::__construct();
+	parent::__construct();
 
     }
 
@@ -38,9 +38,9 @@ 
      */
     public function set_upgrader( &$upgrader ) {
 
-        if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
-        }
+	if ( is_object( $upgrader ) ) {
+	    $this->upgrader =& $upgrader;
+	}
 
     }
 
@@ -53,7 +53,7 @@ 
      */
     public function set_result( $result ) {
 
-        $this->result = $result;
+	$this->result = $result;
 
     }
 
@@ -82,10 +82,10 @@ 
      */
     function error( $errors ) {
 
-        if ( ! empty( $errors ) ) {
-            echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
-            die;
-        }
+	if ( ! empty( $errors ) ) {
+	    echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
+	    die;
+	}
 
     }
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     public function set_upgrader( &$upgrader ) {
 
         if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
+            $this->upgrader = & $upgrader;
         }
 
     }

includes/admin/licensing/updater.php

Indentation +178 added lines, -178 removed lines

@@ -115,37 +115,37 @@ 
      */
     public function __construct( array $config ) {
 
-        // Load the base class object.
-        $this->base = MonsterInsights();
-
-        // Set class properties.
-        $accepted_args = array(
-            'plugin_name',
-            'plugin_slug',
-            'plugin_path',
-            'plugin_url',
-            'remote_url',
-            'version',
-            'key'
-        );
-        foreach ( $accepted_args as $arg ) {
-            $this->$arg = $config[$arg];
-        }
-
-        // If the user cannot update plugins, stop processing here.
-        if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
-            return;
-        }
-
-        // Load the updater hooks and filters.
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
-
-        add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
-        add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
-
-        // ManageWP premium update filters
-        //add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
-        //add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
+	// Load the base class object.
+	$this->base = MonsterInsights();
+
+	// Set class properties.
+	$accepted_args = array(
+	    'plugin_name',
+	    'plugin_slug',
+	    'plugin_path',
+	    'plugin_url',
+	    'remote_url',
+	    'version',
+	    'key'
+	);
+	foreach ( $accepted_args as $arg ) {
+	    $this->$arg = $config[$arg];
+	}
+
+	// If the user cannot update plugins, stop processing here.
+	if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
+	    return;
+	}
+
+	// Load the updater hooks and filters.
+	add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
+
+	add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
+	add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
+
+	// ManageWP premium update filters
+	//add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
+	//add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
     }
 
     /**
@@ -158,33 +158,33 @@ 
      */
     public function update_plugins_filter( $value ) {
 
-        // If no update object exists, return early.
-        if ( empty( $value ) ) {
-            return $value;
-        }
-
-        // Run update check by pinging the external API. If it fails, return the default update object.
-        if ( ! $this->update ) {
-            $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->update || ! empty( $this->update->error ) ) {
-                $this->update = false;
-                return $value;
-            }
-        }
-
-        // Infuse the update object with our data if the version from the remote API is newer.
-        if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
-            // The $plugin_update object contains new_version, package, slug and last_update keys.
-            //$this->update->full_slug             = $this->plugin_slug;
-            //$this->update->name                  = $this->plugin_name;
-            $this->update->monsterinsights_plugin  = true;
-            $this->update->old_version             = $this->version;
-            $this->update->plugin                  = $this->plugin_path;
-            $value->response[$this->plugin_path]   = $this->update;
-        }
-
-        // Return the update object.
-        return $value;
+	// If no update object exists, return early.
+	if ( empty( $value ) ) {
+	    return $value;
+	}
+
+	// Run update check by pinging the external API. If it fails, return the default update object.
+	if ( ! $this->update ) {
+	    $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
+	    if ( ! $this->update || ! empty( $this->update->error ) ) {
+		$this->update = false;
+		return $value;
+	    }
+	}
+
+	// Infuse the update object with our data if the version from the remote API is newer.
+	if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
+	    // The $plugin_update object contains new_version, package, slug and last_update keys.
+	    //$this->update->full_slug             = $this->plugin_slug;
+	    //$this->update->name                  = $this->plugin_name;
+	    $this->update->monsterinsights_plugin  = true;
+	    $this->update->old_version             = $this->version;
+	    $this->update->plugin                  = $this->plugin_path;
+	    $value->response[$this->plugin_path]   = $this->update;
+	}
+
+	// Return the update object.
+	return $value;
 
     }
 
@@ -199,12 +199,12 @@ 
      */
     public function http_request_args( $args, $url ) {
 
-        // If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
-            $args['sslverify'] = false;
-        }
+	// If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
+	if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
+	    $args['sslverify'] = false;
+	}
 
-        return $args;
+	return $args;
 
     }
 
@@ -221,14 +221,14 @@ 
      */
     public function plugins_api( $api, $action = '', $args = null ) {
 
-        $plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
+	$plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
 
-        // If our plugin matches the request, set our own plugin data, else return the default response.
-        if ( $plugin ) {
-            return $this->set_plugins_api( $api );
-        } else {
-            return $api;
-        }
+	// If our plugin matches the request, set our own plugin data, else return the default response.
+	if ( $plugin ) {
+	    return $this->set_plugins_api( $api );
+	} else {
+	    return $api;
+	}
 
     }
 
@@ -242,82 +242,82 @@ 
      */
     public function set_plugins_api( $default_api ) {
 
-        // Perform the remote request to retrieve our plugin information. If it fails, return the default object.
-        if ( ! $this->info ) {
-            $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->info || ! empty( $this->info->error ) ) {
-                $this->info = false;
-                return $default_api;
-            }
-        }
-
-        // Create a new stdClass object and populate it with our plugin information.
-        $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
-        $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
-
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
-
-        if ( ! empty( $changelog ) ) {
-             if ( ! empty( $description ) ) {
-                $api->sections['description'] = $description;
-                $api->sections['changelog']   = $changelog;
-             } else {
-                $api->sections['changelog']   = $changelog;
-             }
-        } else if ( ! empty( $description ) ) {
-            $api->sections['description'] = $description;
-        } else {
-            $api->sections = array();
-        }     
-
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
-
-        // Return the new API object with our custom data.
-        return $api;
+	// Perform the remote request to retrieve our plugin information. If it fails, return the default object.
+	if ( ! $this->info ) {
+	    $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
+	    if ( ! $this->info || ! empty( $this->info->error ) ) {
+		$this->info = false;
+		return $default_api;
+	    }
+	}
+
+	// Create a new stdClass object and populate it with our plugin information.
+	$api                        = new stdClass;
+	$api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
+	$api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
+	$api->version               = isset( $this->info->version )        ? $this->info->version        : '';
+	$api->author                = isset( $this->info->author )         ? $this->info->author         : '';
+	$api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
+	$api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
+	$api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
+	$api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
+	$api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
+
+	$changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
+	$description                = isset( $this->info->description )    ? $this->info->description     : '';
+
+	if ( ! empty( $changelog ) ) {
+	     if ( ! empty( $description ) ) {
+		$api->sections['description'] = $description;
+		$api->sections['changelog']   = $changelog;
+	     } else {
+		$api->sections['changelog']   = $changelog;
+	     }
+	} else if ( ! empty( $description ) ) {
+	    $api->sections['description'] = $description;
+	} else {
+	    $api->sections = array();
+	}     
+
+	$api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+
+	// Return the new API object with our custom data.
+	return $api;
 
     }
 
     // Integration with ManageWP
     public function premium_update_push( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
-
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
-            $plugin_data['type']        = 'plugin';
-            $plugin_data['slug']        = $update->slug;
-            $plugin_data['new_version'] = $update->version;
-            $premium_update[]           = $plugin_data;
-        }
-        return $premium_update;
+	if ( ! function_exists( 'get_plugin_data' ) ) {
+	    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
+
+	$update = $this->set_plugins_api( array() );
+	if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
+	    $plugin_data                = get_plugin_data( $update->slug );
+	    $plugin_data['type']        = 'plugin';
+	    $plugin_data['slug']        = $update->slug;
+	    $plugin_data['new_version'] = $update->version;
+	    $premium_update[]           = $plugin_data;
+	}
+	return $premium_update;
     }
 
     // Integration with ManageWP
     public function premium_update( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
-
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
-            $plugin_data['type']        = 'plugin';
-            $plugin_data['slug']        = $update->slug;
-            $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
-            array_push( $premium_update, $plugin_data );
-        }
-        return $premium_update;
+	if ( ! function_exists( 'get_plugin_data' ) ) {
+	    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
+
+	$update = $this->set_plugins_api( array() );
+	if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
+	    $plugin_data                = get_plugin_data( $update->slug );
+	    $plugin_data['type']        = 'plugin';
+	    $plugin_data['slug']        = $update->slug;
+	    $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
+	    array_push( $premium_update, $plugin_data );
+	}
+	return $premium_update;
     }
 
     /**
@@ -333,47 +333,47 @@ 
      */
     public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
 
-        // Build the body of the request.
-        $body = wp_parse_args(
-            $body,
-            array(
-                'tgm-updater-action'     => $action,
-                'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
-                'tgm-updater-referer'    => site_url(),
-                'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
-                'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
-            )
-        );
-        $body = http_build_query( $body, '', '&' );
-
-        // Build the headers of the request.
-        $headers = wp_parse_args(
-            $headers,
-            array(
-                'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
-            )
-        );
-
-        // Setup variable for wp_remote_post.
-        $post = array(
-            'headers' => $headers,
-            'body'    => $body
-        );
-
-        // Perform the query and retrieve the response.
-        $response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
-
-        // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
-            return false;
-        }
-
-        // Return the json decoded content.
-        return json_decode( $response_body );
+	// Build the body of the request.
+	$body = wp_parse_args(
+	    $body,
+	    array(
+		'tgm-updater-action'     => $action,
+		'tgm-updater-key'        => $this->key,
+		'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+		'tgm-updater-referer'    => site_url(),
+		'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
+		'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
+	    )
+	);
+	$body = http_build_query( $body, '', '&' );
+
+	// Build the headers of the request.
+	$headers = wp_parse_args(
+	    $headers,
+	    array(
+		'Content-Type'   => 'application/x-www-form-urlencoded',
+		'Content-Length' => strlen( $body )
+	    )
+	);
+
+	// Setup variable for wp_remote_post.
+	$post = array(
+	    'headers' => $headers,
+	    'body'    => $body
+	);
+
+	// Perform the query and retrieve the response.
+	$response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
+	$response_code = wp_remote_retrieve_response_code( $response );
+	$response_body = wp_remote_retrieve_body( $response );
+
+	// Bail out early if there are any errors.
+	if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+	    return false;
+	}
+
+	// Return the json decoded content.
+	return json_decode( $response_body );
 
     }
 }
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -253,18 +253,18 @@ 
 
         // Create a new stdClass object and populate it with our plugin information.
         $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
+        $api->name                  = isset( $this->info->name ) ? $this->info->name : '';
+        $api->slug                  = isset( $this->info->slug ) ? $this->info->slug : '';
+        $api->version               = isset( $this->info->version ) ? $this->info->version : '';
+        $api->author                = isset( $this->info->author ) ? $this->info->author : '';
         $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
+        $api->requires              = isset( $this->info->requires ) ? $this->info->requires : '';
+        $api->tested                = isset( $this->info->tested ) ? $this->info->tested : '';
+        $api->last_updated          = isset( $this->info->last_updated ) ? $this->info->last_updated : '';
+        $api->homepage              = isset( $this->info->homepage ) ? $this->info->homepage : '';
 
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
+        $changelog                  = isset( $this->info->changelog ) ? $this->info->changelog : '';
+        $description                = isset( $this->info->description ) ? $this->info->description : '';
 
         if ( ! empty( $changelog ) ) {
              if ( ! empty( $description ) ) {
@@ -279,7 +279,7 @@ 
             $api->sections = array();
         }     
 
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+        $api->download_link = isset( $this->info->download_link ) ? $this->info->download_link : '';
 
         // Return the new API object with our custom data.
         return $api;

includes/admin/licensing/license.php

Indentation +322 added lines, -322 removed lines

@@ -57,29 +57,29 @@ 
      * @since 6.0.0
      */
     public function __construct() {
-        // Load the base class object.
-        $this->base = MonsterInsights();
-        add_action( 'admin_init', array( $this, 'admin_init' ) );
+	// Load the base class object.
+	$this->base = MonsterInsights();
+	add_action( 'admin_init', array( $this, 'admin_init' ) );
     }
     
     public function admin_init() {
-        // Possibly verify the key.
-        $this->maybe_verify_key();
-
-        // Add potential admin notices for actions around the admin.
-        add_action( 'admin_notices', array( $this, 'monsterinsights_notices' ) );
-        add_action( 'network_admin_notices', array( $this, 'monsterinsights_notices' ) );
-
-        // Grab the license key. If it is not set (even after verification), return early.
-        $this->key = monsterinsights_get_license_key();
-        if ( ! $this->key ) {
-            return;
-        }
-
-        // Possibly handle validating, deactivating and refreshing license keys.
-        $this->maybe_validate_key();
-        $this->maybe_deactivate_key();
-        $this->maybe_refresh_key();
+	// Possibly verify the key.
+	$this->maybe_verify_key();
+
+	// Add potential admin notices for actions around the admin.
+	add_action( 'admin_notices', array( $this, 'monsterinsights_notices' ) );
+	add_action( 'network_admin_notices', array( $this, 'monsterinsights_notices' ) );
+
+	// Grab the license key. If it is not set (even after verification), return early.
+	$this->key = monsterinsights_get_license_key();
+	if ( ! $this->key ) {
+	    return;
+	}
+
+	// Possibly handle validating, deactivating and refreshing license keys.
+	$this->maybe_validate_key();
+	$this->maybe_deactivate_key();
+	$this->maybe_refresh_key();
     }
 
     /**
@@ -91,15 +91,15 @@ 
      */
     public function maybe_verify_key() {
         
-        if ( ! $this->is_verifying_key() ) {
-            return;
-        }
+	if ( ! $this->is_verifying_key() ) {
+	    return;
+	}
 
-        if ( ! $this->verify_key_action() ) {
-            return;
-        }
+	if ( ! $this->verify_key_action() ) {
+	    return;
+	}
 
-        $this->verify_key();
+	$this->verify_key();
 
     }
 
@@ -110,41 +110,41 @@ 
      */
     public function verify_key() {
 
-        // Perform a request to verify the key.
-        $verify = $this->perform_remote_request( 'verify-key', array( 'tgm-updater-key' => trim( $_POST['monsterinsights-license-key'] ) ) );
-
-        // If it returns false, send back a generic error message and return.
-        if ( ! $verify ) {
-            $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
-            return;
-        }
-
-        // If an error is returned, set the error and return.
-        if ( ! empty( $verify->error ) ) {
-            $this->errors[] = $verify->error;
-            return;
-        }
-
-        // Otherwise, our request has been done successfully. Update the option and set the success message.
-        if ( is_multisite() && is_network_admin() ) {
-            $option                = get_site_option( 'monsterinsights_license' );
-            $option['key']         = trim( $_POST['monsterinsights-license-key'] );
-            $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
-            $option['is_expired']  = false;
-            $option['is_disabled'] = false;
-            $option['is_invalid']  = false;
-            $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
-            update_site_option( 'monsterinsights_license', $option );
-        } else {
-            $option                = get_option( 'monsterinsights_license' );
-            $option['key']         = trim( $_POST['monsterinsights-license-key'] );
-            $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
-            $option['is_expired']  = false;
-            $option['is_disabled'] = false;
-            $option['is_invalid']  = false;
-            $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
-            update_option( 'monsterinsights_license', $option );        
-        }
+	// Perform a request to verify the key.
+	$verify = $this->perform_remote_request( 'verify-key', array( 'tgm-updater-key' => trim( $_POST['monsterinsights-license-key'] ) ) );
+
+	// If it returns false, send back a generic error message and return.
+	if ( ! $verify ) {
+	    $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+	    return;
+	}
+
+	// If an error is returned, set the error and return.
+	if ( ! empty( $verify->error ) ) {
+	    $this->errors[] = $verify->error;
+	    return;
+	}
+
+	// Otherwise, our request has been done successfully. Update the option and set the success message.
+	if ( is_multisite() && is_network_admin() ) {
+	    $option                = get_site_option( 'monsterinsights_license' );
+	    $option['key']         = trim( $_POST['monsterinsights-license-key'] );
+	    $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
+	    $option['is_expired']  = false;
+	    $option['is_disabled'] = false;
+	    $option['is_invalid']  = false;
+	    $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
+	    update_site_option( 'monsterinsights_license', $option );
+	} else {
+	    $option                = get_option( 'monsterinsights_license' );
+	    $option['key']         = trim( $_POST['monsterinsights-license-key'] );
+	    $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
+	    $option['is_expired']  = false;
+	    $option['is_disabled'] = false;
+	    $option['is_invalid']  = false;
+	    $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
+	    update_option( 'monsterinsights_license', $option );        
+	}
 
     }
 
@@ -157,7 +157,7 @@ 
      */
     public function is_verifying_key() {
 
-        return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-verify-submit'] );
+	return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-verify-submit'] );
 
     }
 
@@ -170,7 +170,7 @@ 
      */
     public function verify_key_action() {
 
-        return isset( $_POST['monsterinsights-verify-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
+	return isset( $_POST['monsterinsights-verify-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
 
     }
 
@@ -183,21 +183,21 @@ 
      */
     public function maybe_validate_key() {
 
-        // Only run every 12 hours.
-        $timestamp = get_option( 'monsterinsights_license_updates' );
-        if ( ! $timestamp ) {
-             $timestamp = strtotime( '+8 hours' );
-             update_option( 'monsterinsights_license_updates', $timestamp );
-             $this->validate_key();
-        } else {
-            $current_timestamp = time();
-            if ( $current_timestamp < $timestamp ) {
-                return;
-            } else {
-                update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
-                $this->validate_key();
-            }
-        }
+	// Only run every 12 hours.
+	$timestamp = get_option( 'monsterinsights_license_updates' );
+	if ( ! $timestamp ) {
+	     $timestamp = strtotime( '+8 hours' );
+	     update_option( 'monsterinsights_license_updates', $timestamp );
+	     $this->validate_key();
+	} else {
+	    $current_timestamp = time();
+	    if ( $current_timestamp < $timestamp ) {
+		return;
+	    } else {
+		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
+		$this->validate_key();
+	    }
+	}
     }
 
     /**
@@ -209,103 +209,103 @@ 
      */
     public function validate_key( $forced = false ) {
 
-        $validate = $this->perform_remote_request( 'validate-key', array( 'tgm-updater-key' => $this->key ) );
+	$validate = $this->perform_remote_request( 'validate-key', array( 'tgm-updater-key' => $this->key ) );
 
-        // If there was a basic API error in validation, only set the transient for 10 minutes before retrying.
-        if ( ! $validate ) {
-            // If forced, set contextual success message.
-            if ( $forced ) {
-                $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
-            }
+	// If there was a basic API error in validation, only set the transient for 10 minutes before retrying.
+	if ( ! $validate ) {
+	    // If forced, set contextual success message.
+	    if ( $forced ) {
+		$this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+	    }
             
-            return;
-        }
-
-        // If a key or author error is returned, the license no longer exists or the user has been deleted, so reset license.
-        if ( isset( $validate->key ) || isset( $validate->author ) ) {
-            $option = array();
-            if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
-            } else {
-                $option = get_option( 'monsterinsights_license' );
-            }
-            $option['is_expired']  = false;
-            $option['is_disabled'] = false;
-            $option['is_invalid']  = true;
-            if ( is_multisite() && is_network_admin() ) {
-                update_site_option( 'monsterinsights_license', $option );
-            } else {
-                update_option( 'monsterinsights_license', $option );
-            }
-            return;
-        }
-
-        // If the license has expired, set the transient and expired flag and return.
-        if ( isset( $validate->expired ) ) {
-            $option = array();
-            if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
-            } else {
-                $option = get_option( 'monsterinsights_license' );
-            }
-            $option['is_expired']  = true;
-            $option['is_disabled'] = false;
-            $option['is_invalid']  = false;
-            if ( is_multisite() && is_network_admin() ) {
-                update_site_option( 'monsterinsights_license', $option );
-            } else {
-                update_option( 'monsterinsights_license', $option );
-            }
-            return;
-        }
-
-        // If the license is disabled, set the transient and disabled flag and return.
-        if ( isset( $validate->disabled ) ) {
-            $option = array();
-            if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
-            } else {
-                $option = get_option( 'monsterinsights_license' );
-            }
-            $option['is_expired']  = false;
-            $option['is_disabled'] = true;
-            $option['is_invalid']  = false;
-            if ( is_multisite() && is_network_admin() ) {
-                update_site_option( 'monsterinsights_license', $option );
-            } else {
-                update_option( 'monsterinsights_license', $option );
-            }
-            return;
-        }
-
-        // If forced, set contextual success message.
-        if ( ( ! empty( $validate->key ) || ! empty( $this->key ) ) && $forced ) {
-            $key = '';
-            if ( ! empty( $validate->key ) ) {
-                $key = $validate->key;
-            } else {
-                $key = $this->key;
-            }
-            delete_transient( '_monsterinsights_addons' );
-            monsterinsights_get_addons_data( $key );
-            $this->success[] = esc_html__( 'Congratulations! Your key has been refreshed successfully.', 'google-analytics-for-wordpress' );
-        }
-
-        $option = array();
-        if ( is_multisite() && is_network_admin() ) {
-            $option  = get_site_option( 'monsterinsights_license' );
-        } else {
-            $option = get_option( 'monsterinsights_license' );
-        }
-        $option['type']        = isset( $validate->type ) ? $validate->type : $option['type'];
-        $option['is_expired']  = false;
-        $option['is_disabled'] = false;
-        $option['is_invalid']  = false;
-        if ( is_multisite() && is_network_admin() ) {
-            update_site_option( 'monsterinsights_license', $option );
-        } else {
-            update_option( 'monsterinsights_license', $option );
-        }
+	    return;
+	}
+
+	// If a key or author error is returned, the license no longer exists or the user has been deleted, so reset license.
+	if ( isset( $validate->key ) || isset( $validate->author ) ) {
+	    $option = array();
+	    if ( is_multisite() && is_network_admin() ) {
+		$option  = get_site_option( 'monsterinsights_license' );
+	    } else {
+		$option = get_option( 'monsterinsights_license' );
+	    }
+	    $option['is_expired']  = false;
+	    $option['is_disabled'] = false;
+	    $option['is_invalid']  = true;
+	    if ( is_multisite() && is_network_admin() ) {
+		update_site_option( 'monsterinsights_license', $option );
+	    } else {
+		update_option( 'monsterinsights_license', $option );
+	    }
+	    return;
+	}
+
+	// If the license has expired, set the transient and expired flag and return.
+	if ( isset( $validate->expired ) ) {
+	    $option = array();
+	    if ( is_multisite() && is_network_admin() ) {
+		$option  = get_site_option( 'monsterinsights_license' );
+	    } else {
+		$option = get_option( 'monsterinsights_license' );
+	    }
+	    $option['is_expired']  = true;
+	    $option['is_disabled'] = false;
+	    $option['is_invalid']  = false;
+	    if ( is_multisite() && is_network_admin() ) {
+		update_site_option( 'monsterinsights_license', $option );
+	    } else {
+		update_option( 'monsterinsights_license', $option );
+	    }
+	    return;
+	}
+
+	// If the license is disabled, set the transient and disabled flag and return.
+	if ( isset( $validate->disabled ) ) {
+	    $option = array();
+	    if ( is_multisite() && is_network_admin() ) {
+		$option  = get_site_option( 'monsterinsights_license' );
+	    } else {
+		$option = get_option( 'monsterinsights_license' );
+	    }
+	    $option['is_expired']  = false;
+	    $option['is_disabled'] = true;
+	    $option['is_invalid']  = false;
+	    if ( is_multisite() && is_network_admin() ) {
+		update_site_option( 'monsterinsights_license', $option );
+	    } else {
+		update_option( 'monsterinsights_license', $option );
+	    }
+	    return;
+	}
+
+	// If forced, set contextual success message.
+	if ( ( ! empty( $validate->key ) || ! empty( $this->key ) ) && $forced ) {
+	    $key = '';
+	    if ( ! empty( $validate->key ) ) {
+		$key = $validate->key;
+	    } else {
+		$key = $this->key;
+	    }
+	    delete_transient( '_monsterinsights_addons' );
+	    monsterinsights_get_addons_data( $key );
+	    $this->success[] = esc_html__( 'Congratulations! Your key has been refreshed successfully.', 'google-analytics-for-wordpress' );
+	}
+
+	$option = array();
+	if ( is_multisite() && is_network_admin() ) {
+	    $option  = get_site_option( 'monsterinsights_license' );
+	} else {
+	    $option = get_option( 'monsterinsights_license' );
+	}
+	$option['type']        = isset( $validate->type ) ? $validate->type : $option['type'];
+	$option['is_expired']  = false;
+	$option['is_disabled'] = false;
+	$option['is_invalid']  = false;
+	if ( is_multisite() && is_network_admin() ) {
+	    update_site_option( 'monsterinsights_license', $option );
+	} else {
+	    update_option( 'monsterinsights_license', $option );
+	}
 
     }
 
@@ -318,15 +318,15 @@ 
      */
     public function maybe_deactivate_key() {
 
-        if ( ! $this->is_deactivating_key() ) {
-            return;
-        }
+	if ( ! $this->is_deactivating_key() ) {
+	    return;
+	}
 
-        if ( ! $this->deactivate_key_action() ) {
-            return;
-        }
+	if ( ! $this->deactivate_key_action() ) {
+	    return;
+	}
 
-        $this->deactivate_key();
+	$this->deactivate_key();
 
     }
 
@@ -337,29 +337,29 @@ 
      */
     public function deactivate_key() {
 
-        // Perform a request to deactivate the key.
-        $deactivate = $this->perform_remote_request( 'deactivate-key', array( 'tgm-updater-key' => $_POST['monsterinsights-license-key'] ) );
-
-        // If it returns false, send back a generic error message and return.
-        if ( ! $deactivate ) {
-            $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
-            return;
-        }
-
-        // If an error is returned, set the error and return.
-        if ( ! empty( $deactivate->error ) && ! monsterinsights_is_debug_mode() ) {
-            $this->errors[] = $deactivate->error;
-            return;
-        }
-
-        // Otherwise, our request has been done successfully. Reset the option and set the success message.
-        $this->success[] = isset( $deactivate->success ) ? $deactivate->success : esc_html__( 'Congratulations! You have deactivated the key from this site successfully.', 'google-analytics-for-wordpress' );
-        update_option( 'monsterinsights_license', array() );
-        if ( is_multisite() && is_network_admin() ) {
-            update_site_option( 'monsterinsights_license', array() );
-        } else {
-            update_option( 'monsterinsights_license', array() );
-        }
+	// Perform a request to deactivate the key.
+	$deactivate = $this->perform_remote_request( 'deactivate-key', array( 'tgm-updater-key' => $_POST['monsterinsights-license-key'] ) );
+
+	// If it returns false, send back a generic error message and return.
+	if ( ! $deactivate ) {
+	    $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+	    return;
+	}
+
+	// If an error is returned, set the error and return.
+	if ( ! empty( $deactivate->error ) && ! monsterinsights_is_debug_mode() ) {
+	    $this->errors[] = $deactivate->error;
+	    return;
+	}
+
+	// Otherwise, our request has been done successfully. Reset the option and set the success message.
+	$this->success[] = isset( $deactivate->success ) ? $deactivate->success : esc_html__( 'Congratulations! You have deactivated the key from this site successfully.', 'google-analytics-for-wordpress' );
+	update_option( 'monsterinsights_license', array() );
+	if ( is_multisite() && is_network_admin() ) {
+	    update_site_option( 'monsterinsights_license', array() );
+	} else {
+	    update_option( 'monsterinsights_license', array() );
+	}
 
     }
 
@@ -372,7 +372,7 @@ 
      */
     public function is_deactivating_key() {
 
-        return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-deactivate-submit'] );
+	return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-deactivate-submit'] );
 
     }
 
@@ -385,7 +385,7 @@ 
      */
     public function deactivate_key_action() {
 
-        return isset( $_POST['monsterinsights-deactivate-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
+	return isset( $_POST['monsterinsights-deactivate-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
 
     }
 
@@ -398,16 +398,16 @@ 
      */
     public function maybe_refresh_key() {
 
-        if ( ! $this->is_refreshing_key() ) {
-            return;
-        }
+	if ( ! $this->is_refreshing_key() ) {
+	    return;
+	}
 
-        if ( ! $this->refresh_key_action() ) {
-            return;
-        }
+	if ( ! $this->refresh_key_action() ) {
+	    return;
+	}
 
-        // Refreshing is simply a word alias for validating a key. Force true to set contextual messages.
-        $this->validate_key( true );
+	// Refreshing is simply a word alias for validating a key. Force true to set contextual messages.
+	$this->validate_key( true );
 
     }
 
@@ -420,7 +420,7 @@ 
      */
     public function is_refreshing_key() {
 
-        return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-refresh-submit'] );
+	return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-refresh-submit'] );
 
     }
 
@@ -433,7 +433,7 @@ 
      */
     public function refresh_key_action() {
 
-        return isset( $_POST['monsterinsights-refresh-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
+	return isset( $_POST['monsterinsights-refresh-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
 
     }
 
@@ -444,127 +444,127 @@ 
      */
     public function monsterinsights_notices() {
 
-        // Grab the option and output any nag dealing with license keys.
-        $key    = monsterinsights_get_license_key();
+	// Grab the option and output any nag dealing with license keys.
+	$key    = monsterinsights_get_license_key();
 
-        $option = array();
-        if ( is_multisite() && is_network_admin() ) {
-            $option = get_site_option( 'monsterinsights_license' );
-        } else {
-            $option = get_option( 'monsterinsights_license' );
-        }
+	$option = array();
+	if ( is_multisite() && is_network_admin() ) {
+	    $option = get_site_option( 'monsterinsights_license' );
+	} else {
+	    $option = get_option( 'monsterinsights_license' );
+	}
 
-        if ( ! monsterinsights_is_pro_version() ) {
-            return;
-        }
+	if ( ! monsterinsights_is_pro_version() ) {
+	    return;
+	}
 
-        if ( is_multisite() && is_network_admin() ) {
-            // If a key has expired, output nag about renewing the key.
-            if ( isset( $option['is_expired'] ) && $option['is_expired'] ) :
-            ?>
+	if ( is_multisite() && is_network_admin() ) {
+	    // If a key has expired, output nag about renewing the key.
+	    if ( isset( $option['is_expired'] ) && $option['is_expired'] ) :
+	    ?>
             <div class="error">
                 <p><?php printf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key and continue receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If a key has been disabled, output nag about using another key.
-            if ( isset( $option['is_disabled'] ) && $option['is_disabled'] ) :
-            ?>
+	    // If a key has been disabled, output nag about using another key.
+	    if ( isset( $option['is_disabled'] ) && $option['is_disabled'] ) :
+	    ?>
             <div class="error">
                 <p><?php esc_html_e( 'Your license key for MonsterInsights has been disabled. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If a key is invalid, output nag about using another key.
-            if ( isset( $option['is_invalid'] ) && $option['is_invalid'] ) :
-            ?>
+	    // If a key is invalid, output nag about using another key.
+	    if ( isset( $option['is_invalid'] ) && $option['is_invalid'] ) :
+	    ?>
             <div class="error">
                 <p><?php esc_html_e( '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 to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If there are any license errors, output them now.
-            if ( ! empty( $this->errors ) ) :
-            ?>
+	    // If there are any license errors, output them now.
+	    if ( ! empty( $this->errors ) ) :
+	    ?>
             <div class="error">
                 <p><?php echo implode( '<br>', $this->errors ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If there are any success messages, output them now.
-            if ( ! empty( $this->success ) ) :
-            ?>
+	    // If there are any success messages, output them now.
+	    if ( ! empty( $this->success ) ) :
+	    ?>
             <div class="updated">
                 <p><?php echo implode( '<br>', $this->success ); ?></p>
             </div>
             <?php
-            endif;
-        } else {
-            // If there is no license key, output nag about ensuring key is set for automatic updates.
-            if ( ! $key ) :
-                if ( ! monsterinsights_is_pro_version() ) { 
-                    return;
-                }
-                $screen = get_current_screen(); 
-                if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-                    return;
-                }
-            ?>
+	    endif;
+	} else {
+	    // If there is no license key, output nag about ensuring key is set for automatic updates.
+	    if ( ! $key ) :
+		if ( ! monsterinsights_is_pro_version() ) { 
+		    return;
+		}
+		$screen = get_current_screen(); 
+		if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
+		    return;
+		}
+	    ?>
             <div class="error">
                 <p><?php printf( esc_html__( 'No valid license key has been entered, so automatic updates for MonsterInsights have been turned off. %1$sPlease click here to enter your license key and begin receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( add_query_arg( array( 'page' => 'monsterinsights_settings' ), admin_url( 'admin.php' ) ) ) . '" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If a key has expired, output nag about renewing the key.
-            if ( isset( $option['is_expired'] ) && $option['is_expired'] ) :
-            ?>
+	    // If a key has expired, output nag about renewing the key.
+	    if ( isset( $option['is_expired'] ) && $option['is_expired'] ) :
+	    ?>
             <div class="error">
                 <p><?php printf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key and continue receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If a key has been disabled, output nag about using another key.
-            if ( isset( $option['is_disabled'] ) && $option['is_disabled'] ) :
-            ?>
+	    // If a key has been disabled, output nag about using another key.
+	    if ( isset( $option['is_disabled'] ) && $option['is_disabled'] ) :
+	    ?>
             <div class="error">
                 <p><?php esc_html_e( 'Your license key for MonsterInsights has been disabled. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If a key is invalid, output nag about using another key.
-            if ( isset( $option['is_invalid'] ) && $option['is_invalid'] ) :
-            ?>
+	    // If a key is invalid, output nag about using another key.
+	    if ( isset( $option['is_invalid'] ) && $option['is_invalid'] ) :
+	    ?>
             <div class="error">
                 <p><?php esc_html_e( '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 to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If there are any license errors, output them now.
-            if ( ! empty( $this->errors ) ) :
-            ?>
+	    // If there are any license errors, output them now.
+	    if ( ! empty( $this->errors ) ) :
+	    ?>
             <div class="error">
                 <p><?php echo implode( '<br>', $this->errors ); ?></p>
             </div>
             <?php
-            endif;
+	    endif;
 
-            // If there are any success messages, output them now.
-            if ( ! empty( $this->success ) ) :
-            ?>
+	    // If there are any success messages, output them now.
+	    if ( ! empty( $this->success ) ) :
+	    ?>
             <div class="updated">
                 <p><?php echo implode( '<br>', $this->success ); ?></p>
             </div>
             <?php
-            endif;
-        }
+	    endif;
+	}
     }
 
     /**
@@ -580,47 +580,47 @@ 
      */
     public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
 
-        // Build the body of the request.
-        $body = wp_parse_args(
-            $body,
-            array(
-                'tgm-updater-action'     => $action,
-                'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
-                'tgm-updater-referer'    => site_url(),
-                'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
-                'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
-            )
-        );
-        $body = http_build_query( $body, '', '&' );
-
-        // Build the headers of the request.
-        $headers = wp_parse_args(
-            $headers,
-            array(
-                'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
-            )
-        );
-
-        // Setup variable for wp_remote_post.
-        $post = array(
-            'headers' => $headers,
-            'body'    => $body
-        );
-
-        // Perform the query and retrieve the response.
-        $response      = wp_remote_post( 'https://www.monsterinsights.com', $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
-
-        // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
-            return false;
-        }
-
-        // Return the json decoded content.
-        return json_decode( $response_body );
+	// Build the body of the request.
+	$body = wp_parse_args(
+	    $body,
+	    array(
+		'tgm-updater-action'     => $action,
+		'tgm-updater-key'        => $this->key,
+		'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+		'tgm-updater-referer'    => site_url(),
+		'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
+		'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
+	    )
+	);
+	$body = http_build_query( $body, '', '&' );
+
+	// Build the headers of the request.
+	$headers = wp_parse_args(
+	    $headers,
+	    array(
+		'Content-Type'   => 'application/x-www-form-urlencoded',
+		'Content-Length' => strlen( $body )
+	    )
+	);
+
+	// Setup variable for wp_remote_post.
+	$post = array(
+	    'headers' => $headers,
+	    'body'    => $body
+	);
+
+	// Perform the query and retrieve the response.
+	$response      = wp_remote_post( 'https://www.monsterinsights.com', $post );
+	$response_code = wp_remote_retrieve_response_code( $response );
+	$response_body = wp_remote_retrieve_body( $response );
+
+	// Bail out early if there are any errors.
+	if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+	    return false;
+	}
+
+	// Return the json decoded content.
+	return json_decode( $response_body );
 
     }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -225,7 +225,7 @@ 
         if ( isset( $validate->key ) || isset( $validate->author ) ) {
             $option = array();
             if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
+                $option = get_site_option( 'monsterinsights_license' );
             } else {
                 $option = get_option( 'monsterinsights_license' );
             }
@@ -244,7 +244,7 @@ 
         if ( isset( $validate->expired ) ) {
             $option = array();
             if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
+                $option = get_site_option( 'monsterinsights_license' );
             } else {
                 $option = get_option( 'monsterinsights_license' );
             }
@@ -263,7 +263,7 @@ 
         if ( isset( $validate->disabled ) ) {
             $option = array();
             if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
+                $option = get_site_option( 'monsterinsights_license' );
             } else {
                 $option = get_option( 'monsterinsights_license' );
             }
@@ -293,7 +293,7 @@ 
 
         $option = array();
         if ( is_multisite() && is_network_admin() ) {
-            $option  = get_site_option( 'monsterinsights_license' );
+            $option = get_site_option( 'monsterinsights_license' );
         } else {
             $option = get_option( 'monsterinsights_license' );
         }
@@ -515,7 +515,7 @@ 
                 }
             ?>
             <div class="error">
-                <p><?php printf( esc_html__( 'No valid license key has been entered, so automatic updates for MonsterInsights have been turned off. %1$sPlease click here to enter your license key and begin receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( add_query_arg( array( 'page' => 'monsterinsights_settings' ), admin_url( 'admin.php' ) ) ) . '" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
+                <p><?php printf( esc_html__( 'No valid license key has been entered, so automatic updates for MonsterInsights have been turned off. %1$sPlease click here to enter your license key and begin receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( add_query_arg( array( 'page' => 'monsterinsights_settings' ), admin_url( 'admin.php' ) ) ) . '" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
             </div>
             <?php
             endif;

Braces +1 added lines, -1 removed lines

@@ -506,7 +506,7 @@
         } else {
             // If there is no license key, output nag about ensuring key is set for automatic updates.
             if ( ! $key ) :
-                if ( ! monsterinsights_is_pro_version() ) { 
+                if ( ! monsterinsights_is_pro_version() ) {
                     return;
                 }
                 $screen = get_current_screen(); 

includes/admin/licensing/autoupdate.php

Indentation +15 added lines, -15 removed lines

@@ -13,20 +13,20 @@ 
 
     // If this is multisite and is not on the main site, return early.
     if ( is_multisite() && ! is_main_site() ) {
-        return $update;
+	return $update;
     }
     
     // If we don't have everything we need, return early.
     $item = (array) $item;
     if ( ! isset( $item['new_version'] ) || ! isset( $item['slug'] ) ) {
-        return $update;
+	return $update;
     }
 
     // If the plugin isn't ours, return early.
     $is_free = 'google-analytics-for-wordpress' === $item['slug'];
     $is_paid = isset( $item['monsterinsights_plugin'] ); // see updater class
     if ( ! $is_free && ! $is_paid ) {
-        return $update;
+	return $update;
     }
 
     $version           = $is_free ? MONSTERINSIGHTS_LITE_VERSION : $item['old_version'];
@@ -36,20 +36,20 @@ 
     
     // If the opt in update allows major updates but there is no major version update, return early.
     if ( $current_major < $new_major ) {
-        if ( $automatic_updates === 'all' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
     
     // If the opt in update allows minor updates but there is no minor version update, return early.
     if ( $current_major == $new_major ) {
-        if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
 
     // All our checks have passed - this plugin can be updated!
@@ -87,8 +87,8 @@ 
 function monsterinsights_get_major_version( $version ) {
     $exploded_version = explode( '.', $version );
     if ( isset( $exploded_version[2] ) ) {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
     } else {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
     }
 }
\ No newline at end of file

includes/admin/ajax.php

Indentation +88 added lines, -88 removed lines

@@ -51,60 +51,60 @@ 
     check_ajax_referer( 'monsterinsights-install', 'nonce' );
 
     if ( ! current_user_can( 'install_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Install the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        $download_url = $_POST['plugin'];
-        global $hook_suffix;
-
-        // Set the current screen to avoid undefined notices.
-        set_current_screen();
-
-        // Prepare variables.
-        $method = '';
-        $url    = add_query_arg(
-            array(
-                'page' => 'monsterinsights-settings'
-            ),
-            admin_url( 'admin.php' )
-        );
-        $url = esc_url( $url );
-
-        // Start output bufferring to catch the filesystem form if credentials are needed.
-        ob_start();
-        if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // If we are not authenticated, make it happen now.
-        if ( ! WP_Filesystem( $creds ) ) {
-            ob_start();
-            request_filesystem_credentials( $url, $method, true, false, null );
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // We do not need any extra credentials if we have gotten this far, so let's install the plugin.
-        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-        $base = MonsterInsights();
-        require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
+	$download_url = $_POST['plugin'];
+	global $hook_suffix;
+
+	// Set the current screen to avoid undefined notices.
+	set_current_screen();
+
+	// Prepare variables.
+	$method = '';
+	$url    = add_query_arg(
+	    array(
+		'page' => 'monsterinsights-settings'
+	    ),
+	    admin_url( 'admin.php' )
+	);
+	$url = esc_url( $url );
+
+	// Start output bufferring to catch the filesystem form if credentials are needed.
+	ob_start();
+	if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// If we are not authenticated, make it happen now.
+	if ( ! WP_Filesystem( $creds ) ) {
+	    ob_start();
+	    request_filesystem_credentials( $url, $method, true, false, null );
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// We do not need any extra credentials if we have gotten this far, so let's install the plugin.
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	$base = MonsterInsights();
+	require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
         
-        // Create the plugin upgrader with our custom skin.
-        $installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
-        $installer->install( $download_url );
-
-        // Flush the cache and return the newly installed plugin basename.
-        wp_cache_flush();
-        if ( $installer->plugin_info() ) {
-            $plugin_basename = $installer->plugin_info();
-            echo json_encode( array( 'plugin' => $plugin_basename ) );
-            wp_die();
-        }
+	// Create the plugin upgrader with our custom skin.
+	$installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
+	$installer->install( $download_url );
+
+	// Flush the cache and return the newly installed plugin basename.
+	wp_cache_flush();
+	if ( $installer->plugin_info() ) {
+	    $plugin_basename = $installer->plugin_info();
+	    echo json_encode( array( 'plugin' => $plugin_basename ) );
+	    wp_die();
+	}
     }
 
     // Send back a response.
@@ -126,21 +126,21 @@ 
     check_ajax_referer( 'monsterinsights-activate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
-        } else {
-            $activate = activate_plugin( $_POST['plugin'] );
-        }
-
-        if ( is_wp_error( $activate ) ) {
-            echo json_encode( array( 'error' => $activate->get_error_message() ) );
-            wp_die();
-        }
+	if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+	    $activate = activate_plugin( $_POST['plugin'], NULL, true );
+	} else {
+	    $activate = activate_plugin( $_POST['plugin'] );
+	}
+
+	if ( is_wp_error( $activate ) ) {
+	    echo json_encode( array( 'error' => $activate->get_error_message() ) );
+	    wp_die();
+	}
     }
 
     echo json_encode( true );
@@ -161,16 +161,16 @@ 
     check_ajax_referer( 'monsterinsights-deactivate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
-            $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
-        } else {
-            $deactivate = deactivate_plugins( $_POST['plugin'] );
-        }
+	if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+	    $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
+	} else {
+	    $deactivate = deactivate_plugins( $_POST['plugin'] );
+	}
     }
 
     echo json_encode( true );
@@ -193,12 +193,12 @@ 
 
     // Deactivate the notice
     if ( isset( $_POST['notice'] ) ) {
-        // Init the notice class and mark notice as deactivated
-        MonsterInsights()->notices->dismiss( $_POST['notice'] );
+	// Init the notice class and mark notice as deactivated
+	MonsterInsights()->notices->dismiss( $_POST['notice'] );
 
-        // Return true
-        echo json_encode( true );
-        wp_die();
+	// Return true
+	echo json_encode( true );
+	wp_die();
     }
 
     // If here, an error occured
@@ -215,39 +215,39 @@ 
 
     $shorten = ! empty( $_POST['url'] ) ? esc_url_raw( $_POST['url'] ) : '';
     if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-        echo $shorten;
-        wp_die();
+	echo $shorten;
+	wp_die();
     }
 
     $url     = 'https://www.googleapis.com/urlshortener/v1/url';
 
     // If no url passed die
     if ( ! $shorten ) {
-        echo $shorten;
-        wp_die();
+	echo $shorten;
+	wp_die();
     }
 
     // if the url is already shortened, don't re-run
     if ( strpos( $shorten, 'goo.g') !== false ) {
-        echo $shorten;
-        wp_die();
+	echo $shorten;
+	wp_die();
     }
     
     $result = wp_remote_post(
-        add_query_arg(
-            'key', 
-            'AIzaSyCfHOlx8NbBVSpmHPqxophzULWSAzWDyio', 
-            'https://www.googleapis.com/urlshortener/v1/url'
-        ), 
-        array(
-            'body' => json_encode( array('longUrl' => esc_url_raw( $shorten ) ) ),
-            'headers' => array( 'Content-Type' => 'application/json')
-        )
+	add_query_arg(
+	    'key', 
+	    'AIzaSyCfHOlx8NbBVSpmHPqxophzULWSAzWDyio', 
+	    'https://www.googleapis.com/urlshortener/v1/url'
+	), 
+	array(
+	    'body' => json_encode( array('longUrl' => esc_url_raw( $shorten ) ) ),
+	    'headers' => array( 'Content-Type' => 'application/json')
+	)
     );
 
     if ( is_wp_error( $result ) ) {
-        echo $shorten;
-        wp_die();
+	echo $shorten;
+	wp_die();
     }
     $result = json_decode( $result['body'] );
     $shortlink = $result->id;

Spacing +5 added lines, -5 removed lines

@@ -131,7 +131,7 @@ 
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $activate = activate_plugin( $_POST['plugin'], NULL, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );
@@ -219,7 +219,7 @@ 
         wp_die();
     }
 
-    $url     = 'https://www.googleapis.com/urlshortener/v1/url';
+    $url = 'https://www.googleapis.com/urlshortener/v1/url';
 
     // If no url passed die
     if ( ! $shorten ) {
@@ -228,7 +228,7 @@ 
     }
 
     // if the url is already shortened, don't re-run
-    if ( strpos( $shorten, 'goo.g') !== false ) {
+    if ( strpos( $shorten, 'goo.g' ) !== false ) {
         echo $shorten;
         wp_die();
     }
@@ -240,8 +240,8 @@ 
             'https://www.googleapis.com/urlshortener/v1/url'
         ), 
         array(
-            'body' => json_encode( array('longUrl' => esc_url_raw( $shorten ) ) ),
-            'headers' => array( 'Content-Type' => 'application/json')
+            'body' => json_encode( array( 'longUrl' => esc_url_raw( $shorten ) ) ),
+            'headers' => array( 'Content-Type' => 'application/json' )
         )
     );
 

Braces +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
         } else {
             $deactivate = deactivate_plugins( $_POST['plugin'] );

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
         if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
+            $activate = activate_plugin( $_POST['plugin'], null, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );
         }