awesomemotive / google-analytics-for-wordpress

includes/admin/settings/tab-tracking.php

Indentation +46 added lines, -46 removed lines

@@ -29,65 +29,65 @@ 
         <!-- Tabs -->
         <h1 id="monsterinsights-settings-page-sub-nav" class="monsterinsights-sub-nav-container monsterinsights-nav-container" data-container="#monsterinsights-settings-sub-pages">
             <?php 
-            $i      = 0;
-            $class  = '';
-            $is_pro = monsterinsights_is_pro_version();
-            foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
-                if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
-                    continue;
-                }
-                $class = ( 0 === $i ? 'monsterinsights-active' : '' );
-                ?>
+	    $i      = 0;
+	    $class  = '';
+	    $is_pro = monsterinsights_is_pro_version();
+	    foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
+		if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
+		    continue;
+		}
+		$class = ( 0 === $i ? 'monsterinsights-active' : '' );
+		?>
                 <a class="monsterinsights-sub-nav-item monsterinsights-nav-item monstericon-<?php echo esc_attr( $id ); ?> <?php echo esc_attr( $class ); ?>" href="#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" title="<?php echo esc_attr( $item['title'] ); ?>">
                     <?php echo esc_html( $item['title'] ); ?>
                 </a>
                 <?php 
-                $i++; 
-            }
-            ?>
+		$i++; 
+	    }
+	    ?>
         </h1>
 
         <h1 class="monsterinsights-hideme"></h1><!-- so wp notices are below the nav bar -->
 
         <?php 
-        // Output any notices now
-        /** 
-         * Developer Alert:
-         *
-         * Per the README, this is considered an internal hook and should
-         * not be used by other developers. This hook's behavior may be modified
-         * or the hook may be removed at any time, without warning.
-         */
-        do_action( 'monsterinsights_settings_tracking_tab_notice' );
-        ?>
+	// Output any notices now
+	/** 
+	 * Developer Alert:
+	 *
+	 * Per the README, this is considered an internal hook and should
+	 * not be used by other developers. This hook's behavior may be modified
+	 * or the hook may be removed at any time, without warning.
+	 */
+	do_action( 'monsterinsights_settings_tracking_tab_notice' );
+	?>
 
         <!-- Tab Panels -->
         <div id="monsterinsights-settings-sub-pages" class="monsterinsights-sub-nav-tabs monsterinsights-nav-tabs" data-navigation="#monsterinsights-settings-page-sub-nav">
             <?php 
-            $i = 0; 
-            foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
-                if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
-                    continue;
-                }
-                $class = ( 0 === $i ? ' monsterinsights-active' : '' ); 
-                $i++;
-                ?>
+	    $i = 0; 
+	    foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
+		if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
+		    continue;
+		}
+		$class = ( 0 === $i ? ' monsterinsights-active' : '' ); 
+		$i++;
+		?>
                  <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
                     <?php if ( $item['level'] === 'lite' ||  $is_pro ) { ?>
                     <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
                     <?php } ?>
                      <div class="monsterinsights-subtab-settings-notices">
                         <?php 
-                        // Output any notices now
-                        /** 
-                         * Developer Alert:
-                         *
-                         * Per the README, this is considered an internal hook and should
-                         * not be used by other developers. This hook's behavior may be modified
-                         * or the hook may be removed at any time, without warning.
-                         */
-                        do_action( 'monsterinsights_tracking_' . $id . '_tab_notice' );
-                        ?>
+			// Output any notices now
+			/** 
+			 * Developer Alert:
+			 *
+			 * Per the README, this is considered an internal hook and should
+			 * not be used by other developers. This hook's behavior may be modified
+			 * or the hook may be removed at any time, without warning.
+			 */
+			do_action( 'monsterinsights_tracking_' . $id . '_tab_notice' );
+			?>
                     </div>
                     <!-- Settings Form -->
                     <?php $class = ( $item['level'] !== 'lite' && ! $is_pro ) ? 'monsterinsights-no-settings-shown' : ''; ?>
@@ -95,10 +95,10 @@ 
                         <table class="form-table">
                             <tbody>
                                 <?php
-                                //do_action( 'monsterinsights_settings_tab_top_' . $id  );
-                                echo monsterinsights_get_section_settings( $id, 'tracking' );
-                                //do_action( 'monsterinsights_settings_tab_bottom_' . $id  );
-                                ?>
+				//do_action( 'monsterinsights_settings_tab_top_' . $id  );
+				echo monsterinsights_get_section_settings( $id, 'tracking' );
+				//do_action( 'monsterinsights_settings_tab_bottom_' . $id  );
+				?>
                             </tbody>
                         </table>
                         <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
@@ -111,8 +111,8 @@ 
                     </form>
                 </div>
                 <?php
-            }
-            ?>
+	    }
+	    ?>
         </div>
     </div>
     <?php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
                 $i++;
                 ?>
                  <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
-                    <?php if ( $item['level'] === 'lite' ||  $is_pro ) { ?>
+                    <?php if ( $item['level'] === 'lite' || $is_pro ) { ?>
                     <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
                     <?php } ?>
                      <div class="monsterinsights-subtab-settings-notices">
@@ -91,7 +91,7 @@ 
                     </div>
                     <!-- Settings Form -->
                     <?php $class = ( $item['level'] !== 'lite' && ! $is_pro ) ? 'monsterinsights-no-settings-shown' : ''; ?>
-                    <form id="monsterinsights-tracking-<?php echo esc_attr( $id );?>-tab" class="<?php echo $class; ?>" method="post">
+                    <form id="monsterinsights-tracking-<?php echo esc_attr( $id ); ?>-tab" class="<?php echo $class; ?>" method="post">
                         <table class="form-table">
                             <tbody>
                                 <?php
@@ -102,7 +102,7 @@ 
                             </tbody>
                         </table>
                         <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
-                        <?php if ( $item['level'] === 'lite' && !$is_pro ) { ?>
+                        <?php if ( $item['level'] === 'lite' && ! $is_pro ) { ?>
                             <div class="monsterinsights-upsell-under-box">
                                 <h2><?php esc_html_e( "Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress' ); ?></h2>
                                 <p class="monsterinsights-upsell-lite-text"><?php esc_html_e( "By upgrading to MonsterInsights Pro, you get access to numerous addons and tools that help you better understand what people are doing on your website, so you can keep doing more of what's working. Some of the features include: Ecommerce tracking, Author tracking, Post Type tracking, Ads tracking, Google AMP tracking, Performance optimization, and so much more!", 'google-analytics-for-wordpress' ); ?></p>

includes/admin/settings/tab-general.php

Indentation +57 added lines, -57 removed lines

@@ -29,26 +29,26 @@ 
     <div id="monsterinsights-settings-general">
         <div class="monsterinsights-tab-settings-notices">
         <?php 
-        // Output any notices now
-        /** 
-         * Developer Alert:
-         *
-         * Per the README, this is considered an internal hook and should
-         * not be used by other developers. This hook's behavior may be modified
-         * or the hook may be removed at any time, without warning.
-         */
-        do_action( 'monsterinsights_settings_general_tab_notice' );
-        ?>
+	// Output any notices now
+	/** 
+	 * Developer Alert:
+	 *
+	 * Per the README, this is considered an internal hook and should
+	 * not be used by other developers. This hook's behavior may be modified
+	 * or the hook may be removed at any time, without warning.
+	 */
+	do_action( 'monsterinsights_settings_general_tab_notice' );
+	?>
         </div>
         <table class="form-table">
             <tbody>
                 <?php if ( monsterinsights_is_pro_version() ) {
-                    $license_key  = MonsterInsights()->license->get_site_license_key();
-                    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_network_license_key();
-                    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
+		    $license_key  = MonsterInsights()->license->get_site_license_key();
+		    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_network_license_key();
+		    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
 
-                    $license_type = MonsterInsights()->license->get_site_license_type();
-                    ?>
+		    $license_type = MonsterInsights()->license->get_site_license_type();
+		    ?>
                     <tr id="monsterinsights-settings-key-box">
                         <th scope="row">
                             <label for="monsterinsights-settings-key"><?php esc_html_e( 'License Key', 'google-analytics-for-wordpress' ); ?></label>
@@ -154,10 +154,10 @@ 
                     <?php } ?>
 
                     <?php 
-                    $manual_ua = MonsterInsights()->auth->get_manual_ua();
-                    $auth_ua   = MonsterInsights()->auth->get_ua();
+		    $manual_ua = MonsterInsights()->auth->get_manual_ua();
+		    $auth_ua   = MonsterInsights()->auth->get_ua();
 
-                    if ( empty( $manual_ua ) && empty( $auth_ua ) && monsterinsights_get_network_ua() ) { ?>
+		    if ( empty( $manual_ua ) && empty( $auth_ua ) && monsterinsights_get_network_ua() ) { ?>
                         <!-- If we don't have a manual or auth UA but we have a valid default set (from network), explain that -->
                         <tr id="monsterinsights-default-google-authenticate-box">
                             <th scope="row">
@@ -171,10 +171,10 @@ 
 
                     <!-- Disable Dashboard -->
                     <?php
-                    $title       = esc_html__( 'Disable Reports', 'google-analytics-for-wordpress' );
-                    $description = esc_html__( 'Hide the reports page.', 'google-analytics-for-wordpress' );
-                    echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
-                    ?>
+		    $title       = esc_html__( 'Disable Reports', 'google-analytics-for-wordpress' );
+		    $description = esc_html__( 'Hide the reports page.', 'google-analytics-for-wordpress' );
+		    echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
+		    ?>
 
                     <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ){  ?>
                     <?php $automatic_updates = $automatic_updates ? $automatic_updates : 'none'; ?>
@@ -192,23 +192,23 @@ 
 
                     <!-- Tracking -->
                     <?php
-                    $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
-                    $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
-                        echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
-                    }
-                    ?>
+		    $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
+		    $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
+		    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
+			echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
+		    }
+		    ?>
 
                     <?php 
-                    /** 
-                     * Developer Alert:
-                     *
-                     * Per the README, this is considered an internal hook and should
-                     * not be used by other developers. This hook's behavior may be modified
-                     * or the hook may be removed at any time, without warning.
-                     */
-                    do_action( 'monsterinsights_settings_general_box' ); 
-                    ?>
+		    /** 
+		     * Developer Alert:
+		     *
+		     * Per the README, this is considered an internal hook and should
+		     * not be used by other developers. This hook's behavior may be modified
+		     * or the hook may be removed at any time, without warning.
+		     */
+		    do_action( 'monsterinsights_settings_general_box' ); 
+		    ?>
                 </tbody>
             </table>
             <input type="hidden" name="monsterinsights_settings_tab" value="general"/>
@@ -235,28 +235,28 @@ 
     $manual_ua_code_old = MonsterInsights()->auth->get_manual_ua();
     
     if ( $manual_ua_code && $manual_ua_code_old && $manual_ua_code_old === $manual_ua_code ) {
-        // Same code we had before
-            // Do nothing
+	// Same code we had before
+	    // Do nothing
     } else if ( $manual_ua_code && $manual_ua_code_old && $manual_ua_code_old !== $manual_ua_code ) {
-        // Different UA code
-        MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
+	// Different UA code
+	MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
     } else if ( $manual_ua_code && empty( $manual_ua_code_old ) ) {
-        // Move to manual
-        MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
+	// Move to manual
+	MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
     } else if ( empty( $manual_ua_code ) && $manual_ua_code_old ) {
-        // Deleted manual
-        MonsterInsights()->auth->delete_manual_ua();
+	// Deleted manual
+	MonsterInsights()->auth->delete_manual_ua();
     } else if ( isset( $_POST['manual_ua_code'] ) && empty( $manual_ua_code ) ) {
-        $throw_notice = true;
+	$throw_notice = true;
     } else {
-        // Not UA before or after
-            // Do nothing
+	// Not UA before or after
+	    // Do nothing
     }
 
     $dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
     $dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
     if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
-        do_action( 'monsterinsights_reports_delete_aggregate_data' );
+	do_action( 'monsterinsights_reports_delete_aggregate_data' );
     }
     monsterinsights_update_option( 'dashboards_disabled', $dashboards_disabled );
 
@@ -264,16 +264,16 @@ 
 
     $automatic_updates = isset( $_POST['automatic_updates'] ) && in_array( $_POST['automatic_updates'], array( 'all', 'minor', 'none' ) ) ? $_POST['automatic_updates'] : false;
     if ( $automatic_updates ) {
-        monsterinsights_update_option( 'automatic_updates', $automatic_updates );
+	monsterinsights_update_option( 'automatic_updates', $automatic_updates );
     }
 
     $anonymous_data = isset( $_POST['anonymous_data'] ) ? 1 : 0;
     if ( $anonymous_data ) {
-        if ( monsterinsights_is_pro_version() ) {
-             monsterinsights_update_option( 'anonymous_data', 1 );
-        } else {
-            monsterinsights_update_option( 'anonymous_data', $anonymous_data );
-        }
+	if ( monsterinsights_is_pro_version() ) {
+	     monsterinsights_update_option( 'anonymous_data', 1 );
+	} else {
+	    monsterinsights_update_option( 'anonymous_data', $anonymous_data );
+	}
     }
 
     /** 
@@ -287,9 +287,9 @@ 
 
     // Output an admin notice so the user knows what happened
     if ( $throw_notice ) {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+	add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+	add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_updated_settings' );
     }
 }
 add_action( 'monsterinsights_settings_save_general', 'monsterinsights_settings_save_general', 11 );
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -109,7 +109,7 @@ 
                         <form id="monsterinsights-google-authenticate" method="post">
                             <?php if ( MonsterInsights()->auth->get_viewname() && MonsterInsights()->auth->get_ua() ) { ?>
                                 <?php if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->is_site_licensed() ) { ?>
-                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.' , 'google-analytics-for-wordpress' ); ?></p>
+                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.', 'google-analytics-for-wordpress' ); ?></p>
                                 <?php } else { ?>
                                     <p><?php echo esc_html__( 'Profile Active: ', 'google-analytics-for-wordpress' ) . MonsterInsights()->auth->get_viewname(); ?></p>
                                     <p><?php wp_nonce_field( 'monsterinsights-google-authenticated-nonce', 'monsterinsights-google-authenticated-nonce' ); ?>
@@ -119,7 +119,7 @@ 
                                 <?php } ?>
                             <?php } else { ?>
                                 <?php if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->is_site_licensed() ) { ?>
-                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.' , 'google-analytics-for-wordpress' ); ?></p>
+                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.', 'google-analytics-for-wordpress' ); ?></p>
                                 <?php } else { ?>
                                     <?php wp_nonce_field( 'monsterinsights-google-authenticate-nonce', 'monsterinsights-google-authenticate-nonce' ); ?>
                                     <?php submit_button( esc_html__( 'Authenticate with your Google account', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-google-authenticate-submit', false ); ?>
@@ -142,7 +142,7 @@ 
                 <tbody>
                     <?php if ( ! MonsterInsights()->auth->get_viewname() ) { ?>
                     <!-- Manual UA -->
-                    <tr id="monsterinsights-google-ua-box" <?php echo ( ! MonsterInsights()->auth->get_manual_ua() ? 'class="monsterinsights-hideme"' : ''); ?> >
+                    <tr id="monsterinsights-google-ua-box" <?php echo ( ! MonsterInsights()->auth->get_manual_ua() ? 'class="monsterinsights-hideme"' : '' ); ?> >
                         <th scope="row">
                             <label for="monsterinsights-google-ua"><?php esc_html_e( 'Manually enter your UA code', 'google-analytics-for-wordpress' ); ?></label>
                         </th>
@@ -176,16 +176,16 @@ 
                     echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
                     ?>
 
-                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ){  ?>
+                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ) {  ?>
                     <?php $automatic_updates = $automatic_updates ? $automatic_updates : 'none'; ?>
                     <tr id="monsterinsights-automatic-updates-mode">
                         <th scope="row">
                             <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Automatic Updates', 'google-analytics-for-wordpress' ); ?></label>
                         </th>
                         <td>
-                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e('Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e( 'Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress' ); ?> </label>
                         </td>
                     </tr>
                     <?php } ?>
@@ -194,7 +194,7 @@ 
                     <?php
                     $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
                     $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
+                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ) {
                         echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
                     }
                     ?>

Braces +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
                     <?php
                     $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
                     $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
+                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ) {
                         echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
                     }
                     ?>

includes/auth.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 
 final class MonsterInsights_Auth {
 
-	private $profile  = array();
+	private $profile = array();
 	private $network = array();
 
 	/**
@@ -67,17 +67,17 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
-		$this->profile      = $data;
+		$this->profile = $data;
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
-		$this->network      = $data;
+		$this->network = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -91,7 +91,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -124,7 +124,7 @@ 
 		
 		do_action( 'monsterinsights_reports_delete_aggregate_data' );
 
-		$this->profile      = $data;
+		$this->profile = $data;
 		$this->set_analytics_profile( $data );
 	}
 
@@ -181,55 +181,55 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() { // also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() { // also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

Braces +19 added lines, -17 removed lines

@@ -67,17 +67,17 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
 		$this->profile      = $data;
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
 		$this->network      = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -91,7 +91,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -181,55 +181,57 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() {
+// also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() {
+// also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

lite/includes/load.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/settings.php';
 
-if ( is_admin() ) {		
+if ( is_admin() ) {
 	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tools.php';
 
 	//require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tab-support.php';

lite/includes/admin/settings.php

Spacing +14 added lines, -14 removed lines

@@ -11,7 +11,7 @@ 
 			$settings['social']['social_notice'] = array( 
 				'id' => 'social_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress' )
 			);
@@ -20,7 +20,7 @@ 
 			$settings['ads']['ads_notice'] = array( 
 				'id' => 'ads_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress' )
 			);
@@ -29,7 +29,7 @@ 
 			$settings['forms']['forms_notice'] = array( 
 				'id' => 'forms_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress' )
 			);
@@ -38,7 +38,7 @@ 
 			$settings['media']['media_notice'] = array( 
 				'id' => 'media_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress' )
 			);
@@ -47,7 +47,7 @@ 
 			$settings['membership']['membership_notice'] = array( 
 				'id' => 'membership_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress' )
 			);
@@ -56,7 +56,7 @@ 
 			$settings['dimensions']['dimensions_notice'] = array( 
 				'id' => 'dimensions_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress' )
 			);
@@ -65,7 +65,7 @@ 
 			$settings['performance']['performance_notice'] = array( 
 				'id' => 'performance_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress' )
 			);
@@ -74,7 +74,7 @@ 
 			$settings['reporting']['reporting_notice'] = array( 
 				'id' => 'reporting_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress' )
 			);
@@ -83,7 +83,7 @@ 
 			$settings['amp']['amp_notice'] = array( 
 				'id' => 'amp_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress' )
 			);
@@ -92,7 +92,7 @@ 
 			$settings['goptimize']['goptimize_notice'] = array( 
 				'id' => 'goptimize_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use Google Optimize to retarget your website vistors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to use Google Optimize to retarget your website vistors and perform A/B split tests with ease?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress' )
 			);
@@ -101,7 +101,7 @@ 
 			$settings['fbia']['fbia_notice'] = array( 
 				'id' => 'fbia_notice',
 				'no_label' => true,
-				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress' )
 			);
@@ -110,7 +110,7 @@ 
 			$settings['bounce']['bounce_notice'] = array( 
 				'id' => 'bounce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress' )
 			);
@@ -119,7 +119,7 @@ 
 			$settings['notifications']['notifications_notice'] = array( 
 				'id' => 'notifications_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress' )
 			);
@@ -128,7 +128,7 @@ 
 			$settings['ecommerce']['ecommerce_notice'] = array( 
 				'id' => 'ecommerce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress' )
 			);

Braces +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 

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

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }

googleanalytics.php

Spacing +14 added lines, -14 removed lines

@@ -227,7 +227,7 @@ 
 				self::$instance->notices          = new MonsterInsights_Notice_Admin();
 				self::$instance->license_actions  = new MonsterInsights_License_Actions();
 				self::$instance->reporting 	      = new MonsterInsights_Reporting();
-				self::$instance->api_auth    	  = new MonsterInsights_API_Auth();
+				self::$instance->api_auth = new MonsterInsights_API_Auth();
 				if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 					self::$instance->require_updater();
 				} else {
@@ -351,19 +351,19 @@ 
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file ) );
 		}
 
 		if ( ! defined( 'GAWP_PATH' ) ) {
-			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR  );
+			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR );
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) );
 		}
 
 		if ( ! defined( 'GAWP_URL' ) ) {
-			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL  );
+			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL );
 		}
 	}	
 
@@ -383,7 +383,7 @@ 
 		}
 
 		// Traditional WordPress plugin locale filter.
-		$mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
+		$mi_locale  = apply_filters( 'plugin_locale', $mi_locale, 'google-analytics-for-wordpress' );
 		$mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale ); 
 	
 		// Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
@@ -440,7 +440,7 @@ 
 	public function monsterinsights_wp_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -461,7 +461,7 @@ 
 	public function monsterinsights_pro_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -487,7 +487,7 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
-		$monsterinsights_settings  = monsterinsights_get_options();
+		$monsterinsights_settings = monsterinsights_get_options();
 	}
 
 
@@ -501,7 +501,7 @@ 
 	 * 
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php';
 			self::$instance->license = new MonsterInsights_License();
@@ -672,7 +672,7 @@ 
 		$instance->api_auth->delete_auth();
 
 		// Delete network data
-		$instance->reporting->delete_aggregate_data('network');
+		$instance->reporting->delete_aggregate_data( 'network' );
 
 		// Delete network license
 		$instance->license->delete_network_license();
@@ -686,7 +686,7 @@ 
 			$instance->api_auth->delete_auth();
 
 			// Delete data
-			$instance->reporting->delete_aggregate_data('site');
+			$instance->reporting->delete_aggregate_data( 'site' );
 
 			// Delete license
 			$instance->license->delete_site_license();
@@ -698,7 +698,7 @@ 
 		$instance->api_auth->delete_auth();
 
 		// Delete data
-		$instance->reporting->delete_aggregate_data('site');
+		$instance->reporting->delete_aggregate_data( 'site' );
 
 		// Delete license
 		$instance->license->delete_site_license();
@@ -793,7 +793,7 @@ 
  * 
  * @return void
  */
-function monsterinsights_lite_call_install_and_upgrade(){
+function monsterinsights_lite_call_install_and_upgrade() {
 	add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
 }
 

Braces +2 added lines, -2 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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