awesomemotive / google-analytics-for-wordpress

includes/frontend/tracking/class-tracking-preview.php

Spacing +3 added lines, -3 removed lines

@@ -84,9 +84,9 @@
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
-        $output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->';
+        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION . ' - https://www.monsterinsights.com/ -->';
+        $output .= '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
+        $output .= '<!-- / Google Analytics by MonsterInsights -->';
         return $output;
     }
 }
\ No newline at end of file

Indentation +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -73,9 +73,9 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
-        $output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->';
-        return $output;
+	$output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
+	$output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
+	$output .=  '<!-- / Google Analytics by MonsterInsights -->';
+	return $output;
     }
 }
\ No newline at end of file

includes/frontend/frontend.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 function monsterinsights_rss_link_tagger( $guid ) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
+    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ) {
         if ( is_feed() ) {
             if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
                 $delimiter = '#';

Braces +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 function monsterinsights_rss_link_tagger( $guid ) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
+    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ) {
         if ( is_feed() ) {
             if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
                 $delimiter = '#';

Indentation +20 added lines, -20 removed lines

@@ -37,13 +37,13 @@ 
     do_action( 'monsterinsights_tracking_before_' . $mode );
     do_action( 'monsterinsights_tracking_before', $mode );
     if ( $mode === 'preview' ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
-        $tracking = new MonsterInsights_Tracking_Preview();
-        echo $tracking->frontend_output();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
+	$tracking = new MonsterInsights_Tracking_Preview();
+	echo $tracking->frontend_output();
     } else {
-         require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
-         $tracking = new MonsterInsights_Tracking_Analytics();
-         echo $tracking->frontend_output();
+	 require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
+	 $tracking = new MonsterInsights_Tracking_Analytics();
+	 echo $tracking->frontend_output();
     }
 
     do_action( 'monsterinsights_tracking_after_' . $mode );
@@ -69,10 +69,10 @@ 
     $track_user    = monsterinsights_track_user();
 
     if ( $track_user && ( $events_mode === 'js' || $events_mode === 'php' ) ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';
-        new MonsterInsights_Analytics_Events();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';
+	new MonsterInsights_Analytics_Events();
     } else {
-        // User is in the disabled group or events mode is off
+	// User is in the disabled group or events mode is off
     }
 }
 add_action( 'template_redirect', 'monsterinsights_events_tracking', 9 );
@@ -91,17 +91,17 @@ 
     global $post;
 
     if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
-        if ( is_feed() ) {
-            if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
-                $delimiter = '#';
-            } else {
-                $delimiter = '?';
-                if ( strpos( $guid, $delimiter ) > 0 ) {
-                    $delimiter = '&';
-                }
-            }
-            return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
-        }
+	if ( is_feed() ) {
+	    if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
+		$delimiter = '#';
+	    } else {
+		$delimiter = '?';
+		if ( strpos( $guid, $delimiter ) > 0 ) {
+		    $delimiter = '&';
+		}
+	    }
+	    return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
+	}
     }
     return $guid;
 }

includes/install.php

Braces +12 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -72,7 +72,8 @@ 
 			// This is the version used for MI upgrade routines.
 			update_option( 'monsterinsights_db_version', '6.2.0' );
 			
-		} else if ( ! $version && $yoast ) { // if new install and has used Yoast previously
+		} else if ( ! $version && $yoast ) {
+// if new install and has used Yoast previously
 
 			$this->upgrade_from_yoast();
 			// This is the version used for MI upgrade routines.
@@ -83,7 +84,8 @@ 
 				$cachec = true;
 			}
 			
-		} else { // if existing install
+		} else {
+// if existing install
 			if ( version_compare( $version, '6.0.2', '<' ) ) {
 				$this->v602_upgrades();
 			}
@@ -328,7 +330,7 @@ 
 			$network = false;
 			// Try network active Premium
 			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 				$key    = $is_key['key'];
 				$found = true;
 				$network = true;
@@ -337,7 +339,7 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -346,7 +348,7 @@ 
 			// Try network active Premium
 			if ( ! $found ) {
 				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 					$key    = $is_key['key'];
 					$found = true;
 					$network = true;
@@ -356,7 +358,7 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -365,7 +367,7 @@ 
 			// Try network active ecommmerce
 			if ( ! $found ) {
 				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 					$key    = $is_key['key'];
 					$found = true;
 					$network = true;
@@ -374,7 +376,7 @@ 
 			// Try single site ecommerce
 			if ( ! $found ) {
 				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -516,7 +518,7 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
 						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {

Spacing +38 added lines, -38 removed lines

@@ -306,9 +306,9 @@ 
 		// Fallback to make sure every default option has a value
 		$defaults = $this->get_yoast_default_values();
 		if ( is_array( $defaults ) ) {
-			foreach ( $defaults[ 'ga_general' ] as $key => $value ) {
-				if ( ! isset( $options[ $key ] ) ) {
-					$options[ $key ] = $value;
+			foreach ( $defaults['ga_general'] as $key => $value ) {
+				if ( ! isset( $options[$key] ) ) {
+					$options[$key] = $value;
 				}
 			}
 		}
@@ -316,7 +316,7 @@ 
 		// Set to the current version now that we've done all needed upgrades
 		$options['version'] = '5.5.3'; // Last Yoast codebase version
 		$saved_options = get_option( 'yst_ga' );
-		$saved_options[ 'ga_general' ] = $options;
+		$saved_options['ga_general'] = $options;
 		update_option( 'yst_ga', $saved_options );
 
 
@@ -326,8 +326,8 @@ 
 			$network = false;
 			// Try network active Premium
 			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-				$key    = $is_key['key'];
+			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+				$key = $is_key['key'];
 				$found = true;
 				$network = true;
 			}
@@ -335,8 +335,8 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -344,8 +344,8 @@ 
 			// Try network active Premium
 			if ( ! $found ) {
 				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}				
@@ -354,8 +354,8 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -363,8 +363,8 @@ 
 			// Try network active ecommmerce
 			if ( ! $found ) {
 				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}
@@ -372,8 +372,8 @@ 
 			// Try single site ecommerce
 			if ( ! $found ) {
 				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -488,10 +488,10 @@ 
 							}
 						}
 					}
-					$options['cron_last_run'] = strtotime("-25 hours");
+					$options['cron_last_run'] = strtotime( "-25 hours" );
 				} else {
 					// if UA in manual code field, remove analytics profile fields if set
-					if ( ! empty( $options['manual_ua_code_field' ] ) ) {
+					if ( ! empty( $options['manual_ua_code_field'] ) ) {
 						if ( isset( $options['analytics_profile_code'] ) ) {
 							unset( $options['analytics_profile_code'] );
 						}
@@ -502,7 +502,7 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					} else if ( ! empty( $options['analytics_profile_code' ] ) ) {
+					} else if ( ! empty( $options['analytics_profile_code'] ) ) {
 					// if UA in profile fields, remove others and use that
 						$options['manual_ua_code'] = $options['analytics_profile_code'];
 						if ( isset( $options['analytics_profile_code'] ) ) {
@@ -514,13 +514,13 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
-						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
+						if ( ! empty( $options['analytics_profile'] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {
 								foreach ( $account['items'] as $profile ) {
 									foreach ( $profile['items'] as $subprofile ) {
-										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile' ] ) {
+										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile'] ) {
 											$options['manual_ua_code'] = $subprofile['ua_code'];
 											break 3;
 										}
@@ -640,8 +640,8 @@ 
 	 */
 	public function v602_upgrades() {
 		$options = get_option( 'yst_ga', array() );
-		if ( ( empty( $this->new_settings[ 'manual_ua_code'] ) || $this->new_settings[ 'manual_ua_code']  === '1' )  &&  
-			 empty( $this->new_settings[ 'analytics_profile_code'] ) &&
+		if ( ( empty( $this->new_settings['manual_ua_code'] ) || $this->new_settings['manual_ua_code'] === '1' ) &&  
+			 empty( $this->new_settings['analytics_profile_code'] ) &&
 			 ! empty( $options ) &&
 			 is_array( $options ) &&
 			 ! empty( $options['ga_general']['manual_ua_code_field'] )
@@ -689,8 +689,8 @@ 
 	 */
 	public function v620_upgrades() {
 		// Turns off debug mode if its on.
-		if ( empty( $this->new_settings['debug_mode' ] ) ) {
-			$this->new_settings['debug_mode' ] = 0;
+		if ( empty( $this->new_settings['debug_mode'] ) ) {
+			$this->new_settings['debug_mode'] = 0;
 		}
 	}
 
@@ -727,25 +727,25 @@ 
 
 		// 3. Default all event tracking and tracking to GA + JS respectively
 			// 3a Set tracking_mode to use analytics.js
-			$this->new_settings['tracking_mode' ] = 'analytics';
+			$this->new_settings['tracking_mode'] = 'analytics';
 			
 
 			// 3b Set events mode to use JS if the events mode is not set explicitly to none
-			if ( empty( $this->new_settings['events_mode' ] ) || $this->new_settings['events_mode' ] !== 'none' ) {
-				$this->new_settings['events_mode' ] = 'js';
+			if ( empty( $this->new_settings['events_mode'] ) || $this->new_settings['events_mode'] !== 'none' ) {
+				$this->new_settings['events_mode'] = 'js';
 			}
 
 		// 4. Migrate manual UA codes
 			// 4a Manual UA has the lowest priority
-			if ( ! empty( $this->new_settings['manual_ua_code' ] ) ) {
+			if ( ! empty( $this->new_settings['manual_ua_code'] ) ) {
 				// Set as manual UA code
-				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['manual_ua_code' ] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['manual_ua_code' ] ) );
+				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['manual_ua_code'] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['manual_ua_code'] ) );
 			}
 
 			// 4b Then try the oAuth UA code
-			if ( ! empty( $this->new_settings['analytics_profile_code' ] ) ) {
+			if ( ! empty( $this->new_settings['analytics_profile_code'] ) ) {
 				// Set as manual UA code
-				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['analytics_profile_code' ] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['analytics_profile_code' ] ) );
+				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['analytics_profile_code'] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['analytics_profile_code'] ) );
 			}
 
 		// 5. Migrate License keys
@@ -773,8 +773,8 @@ 
 							'grids', 'icl_post_language', 'mlcf_email', 'mlcf_name', 'navigation-skins', 'page', 'punch-fonts', 'return_tab', 'skins',
 							'wpcf_email', 'wpcf_your_name' );
 		foreach ( $settings as $setting ) {
-			if ( ! empty( $this->new_settings[ $setting ] ) ) {
-				unset( $this->new_settings[ $setting ] );
+			if ( ! empty( $this->new_settings[$setting] ) ) {
+				unset( $this->new_settings[$setting] );
 			}
 		}
 
@@ -797,11 +797,11 @@ 
 		// 5. Remove deprecated settings
 		$settings = array( '_repeated', 'ajax', 'asmselect0', 'bawac_force_nonce', 'cf_email', 'cf_message', 'cf_name', 'cf_number',
 							'cf_phone', 'cf_subject', 'credentials', 'cron_failed', 'cron_last_run', 'firebug_lite', 'global-css', 'google_auth_code', 
-							'grids', 'icl_post_language', 'mlcf_email', 'mlcf_name','navigation-skins', 'page', 'punch-fonts', 'return_tab', 'skins',
+							'grids', 'icl_post_language', 'mlcf_email', 'mlcf_name', 'navigation-skins', 'page', 'punch-fonts', 'return_tab', 'skins',
 							'wpcf_email', 'wpcf_your_name' );
 		foreach ( $settings as $setting ) {
-			if ( ! empty( $this->new_settings[ $setting ] ) ) {
-				unset( $this->new_settings[ $setting ] );
+			if ( ! empty( $this->new_settings[$setting] ) ) {
+				unset( $this->new_settings[$setting] );
 			}
 		}
 

lite/includes/admin/tools.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 }
 
 function monsterinsights_tools_url_builder() {
-	ob_start();?>
+	ob_start(); ?>
 	<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 can unlock the MonsterInsights URL builder that helps you better track your advertising and email marketing campaigns.", 'google-analytics-for-wordpress' ); ?></p>

lite/includes/admin/tab-support.php

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
     ?>
     <div id="monsterinsights-settings-general">
         <?php 
-        // Output any notices now
-        do_action( 'monsterinsights_settings_support_tab_notice' );
-        ?>
+	// Output any notices now
+	do_action( 'monsterinsights_settings_support_tab_notice' );
+	?>
         <?php //Status page coming soon. ?>
         <!-- <hr /> -->
     </div>

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Callback for displaying the UI for support tab.

lite/includes/install.php

Braces +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 

assets/lib/pandora/class-am-deactivation-survey.php

Spacing +8 added lines, -8 removed lines

@@ -54,9 +54,9 @@ 
 				return;
 			}
 
-			add_action( 'admin_print_scripts', array( $this, 'js'    ), 20 );
-			add_action( 'admin_print_scripts', array( $this, 'css'   )     );
-			add_action( 'admin_footer',        array( $this, 'modal' )     );
+			add_action( 'admin_print_scripts', array( $this, 'js' ), 20 );
+			add_action( 'admin_print_scripts', array( $this, 'css' ) );
+			add_action( 'admin_footer', array( $this, 'modal' ) );
 		}
 	
 		/**
@@ -67,7 +67,7 @@ 
 		 */
 		public function is_dev_url() {
 			// If it is an AM dev site, return false, so we can see them on our dev sites.
-			if ( defined ('AWESOMEMOTIVE_DEV_MODE' ) && AWESOMEMOTIVE_DEV_MODE ) {
+			if ( defined( 'AWESOMEMOTIVE_DEV_MODE' ) && AWESOMEMOTIVE_DEV_MODE ) {
 				return false;
 			}
 		
@@ -101,7 +101,7 @@ 
 
 				}
 				if ( substr_count( $host, '.' ) > 1 ) {
-					$subdomains_to_check =  array( 'dev.', '*.staging.', 'beta.', 'test.' );
+					$subdomains_to_check = array( 'dev.', '*.staging.', 'beta.', 'test.' );
 					foreach ( $subdomains_to_check as $subdomain ) {
 						$subdomain = str_replace( '.', '(.)', $subdomain );
 						$subdomain = str_replace( array( '*', '(.)' ), '(.*)', $subdomain );
@@ -313,7 +313,7 @@ 
 				<div class="am-deactivate-survey-wrap">
 					<form class="am-deactivate-survey" method="post">
 						<span class="am-deactivate-survey-title"><span class="dashicons dashicons-testimonial"></span><?php echo ' ' . esc_html__( 'Quick Feedback', 'google-analytics-for-wordpress' ); ?></span>
-						<span class="am-deactivate-survey-desc"><?php echo sprintf( esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name ); ?></span>
+						<span class="am-deactivate-survey-desc"><?php echo sprintf( esc_html__( 'If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name ); ?></span>
 						<div class="am-deactivate-survey-options">
 							<?php foreach ( $options as $id => $option ) : ?>
 							<div class="am-deactivate-survey-option">
@@ -328,8 +328,8 @@ 
 							<?php endforeach; ?>
 						</div>
 						<div class="am-deactivate-survey-footer">
-							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf( esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></button>
-							<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf( esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></a>
+							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf( esc_html__( 'Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></button>
+							<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf( esc_html__( 'Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></a>
 						</div>
 					</form>
 				</div>

assets/lib/pandora/class-am-notification.php

Spacing +8 added lines, -8 removed lines

@@ -190,7 +190,7 @@ 
 				return;
 			}
 
-			$plugin_notifications = $this->get_plugin_notifications( - 1, array(
+			$plugin_notifications = $this->get_plugin_notifications( -1, array(
 				'post_status' => 'all',
 				'meta_key'    => 'viewed',
 				'meta_value'  => '0',
@@ -249,7 +249,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -264,7 +264,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -273,7 +273,7 @@ 
 				$continue = (string) wp_get_theme() === $theme;
 
 				if ( ! empty( $theme ) && ! $continue ) {
-					unset( $plugin_notifications[ $key ] );
+					unset( $plugin_notifications[$key] );
 				}
 
 				// Version validation.
@@ -285,7 +285,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -298,7 +298,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -312,7 +312,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 			}
@@ -444,7 +444,7 @@ 
 		public function revoke_notifications( $ids ) {
 			// Loop through each of the IDs and find the post that has it as meta.
 			foreach ( (array) $ids as $id ) {
-				$notifications = $this->get_plugin_notifications( - 1, array( 'post_status' => 'all', 'meta_key' => 'notification_id', 'meta_value' => $id ) );
+				$notifications = $this->get_plugin_notifications( -1, array( 'post_status' => 'all', 'meta_key' => 'notification_id', 'meta_value' => $id ) );
 				if ( $notifications ) {
 					foreach ( $notifications as $notification ) {
 						update_post_meta( $notification->ID, 'viewed', 1 );

includes/options.php

Indentation +16 added lines, -16 removed lines

@@ -195,14 +195,14 @@ 
 }
 
  /**
- * Helper method for deleting a setting's value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting a setting's value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
 	if ( empty( $key ) ){
@@ -245,14 +245,14 @@ 
 }
 
  /**
- * Helper method for deleting multiple settings value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting multiple settings value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
 	if ( empty( $keys ) || ! is_array( $keys ) ){

Spacing +15 added lines, -15 removed lines

@@ -47,7 +47,7 @@ 
  */
 function monsterinsights_get_option( $key = '', $default = false ) {
 	global $monsterinsights_settings;
-	$value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
+	$value = ! empty( $monsterinsights_settings[$key] ) ? $monsterinsights_settings[$key] : $default;
 	$value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
 	return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
 }
@@ -146,7 +146,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -177,7 +177,7 @@ 
 	$value = apply_filters( 'monsterinsights_update_option', $value, $key );
 
 	// Next let's try to update the value
-	$settings[ $key ] = $value;
+	$settings[$key] = $value;
 	$did_update = false;
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( $option_name, $settings );
@@ -186,9 +186,9 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
-		$monsterinsights_settings[ $key ] = $value;
+		$monsterinsights_settings[$key] = $value;
 	}
 
 	return $did_update;
@@ -205,7 +205,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -224,8 +224,8 @@ 
 	//}
 
 	// Next let's try to remove the key
-	if( isset( $settings[ $key ] ) ) {
-		unset( $settings[ $key ] );
+	if ( isset( $settings[$key] ) ) {
+		unset( $settings[$key] );
 	}
 
 	$did_update = false;
@@ -236,7 +236,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -255,7 +255,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -275,8 +275,8 @@ 
 
 	// Next let's try to remove the keys
 	foreach ( $keys as $key ) {
-		if( isset( $settings[ $key ] ) ) {
-			unset( $settings[ $key ] );
+		if ( isset( $settings[$key] ) ) {
+			unset( $settings[$key] );
 		}
 	}
 
@@ -288,7 +288,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -379,8 +379,8 @@ 
 	);
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			unset( $settings[ $e ] );
+		if ( ! empty( $settings[$e] ) ) {
+			unset( $settings[$e] );
 		}
 	}
 	return wp_json_encode( $settings );

Braces +6 added lines, -6 removed lines

@@ -146,7 +146,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -186,7 +186,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings[ $key ] = $value;
 	}
@@ -205,7 +205,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -236,7 +236,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -255,7 +255,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -288,7 +288,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}