awesomemotive / google-analytics-for-wordpress

includes/admin/admin.php

Spacing +23 added lines, -23 removed lines

@@ -34,14 +34,14 @@ 
 
     if ( $dashboards_disabled || ! $is_authed || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
         add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
         $hook = 'monsterinsights_reports';
 
@@ -83,7 +83,7 @@ 
     }
 
     $hook = 'monsterinsights_network';
-    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
     add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
@@ -123,7 +123,7 @@ 
 
     // If lite, show a link where they can get pro from
     if ( ! monsterinsights_is_pro_version() ) {
-        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="https://www.monsterinsights.com/lite/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $get_pro );
     }   
     
@@ -161,14 +161,14 @@ 
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }   
     }
@@ -176,7 +176,7 @@ 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
                 
@@ -204,7 +204,7 @@ 
         '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
     ) );
 }
-add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
+add_action( 'in_admin_header', 'monsterinsights_admin_header', 100 );
 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
@@ -221,7 +221,7 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if ( ! $upgrade ) { // First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
         return;
@@ -242,7 +242,7 @@ 
     global $current_screen;
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -272,8 +272,8 @@ 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
         $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ), '<a href="' . $page . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
@@ -281,15 +281,15 @@ 
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
                 $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
@@ -307,7 +307,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -339,7 +339,7 @@ 
 
     $notices = array();
     if ( ! is_network_admin() || ( ! monsterinsights_is_pro_version() && ( class_exists( 'WooCommerce' ) || class_exists( 'Easy_Digital_Downloads' ) ) ) ) {
-        $notices   = get_option( 'monsterinsights_notices' );
+        $notices = get_option( 'monsterinsights_notices' );
         if ( ! is_array( $notices ) ) {
             $notices = array();
         }
@@ -348,10 +348,10 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual'] ) ) { 
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
         return;
@@ -362,10 +362,10 @@ 
         $updates   = monsterinsights_get_option( 'automatic_updates', false );
         $url       = admin_url( 'admin.php?page=monsterinsights_settings' );
 
-        if ( empty( $updates) && ! isset( $notices['monsterinsights_automatic_updates' ] ) ) { 
+        if ( empty( $updates ) && ! isset( $notices['monsterinsights_automatic_updates'] ) ) { 
             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>';
             return;
@@ -374,7 +374,7 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) { 
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -405,7 +405,7 @@ 
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) { 
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';