awesomemotive / google-analytics-for-wordpress

includes/admin/common.php

Spacing +22 added lines, -22 removed lines

@@ -353,7 +353,7 @@ 
 		'kad_admin_js', // Pinnacle theme
 		'dt-chart', // DesignThemes core features plugin
 		'tweeetshare_font_script', // TweetShare - Click To Tweet
-		'tweeetshare_jquery_script',  // TweetShare - Click To Tweet
+		'tweeetshare_jquery_script', // TweetShare - Click To Tweet
 		'tweeetshare_jqueryui_script', // TweetShare - Click To Tweet
 		'tweeetshare_custom_script', // TweetShare - Click To Tweet
 		'imagify-promise-polyfill', // Imagify
@@ -372,16 +372,16 @@ 
 		'rml-modal', // WP Real Media Library
 		'rml-order', // WP Real Media Library
 		'rml-meta', // WP Real Media Library
-		'rml-uploader',  // WP Real Media Library
-		'rml-options',  // WP Real Media Library
-		'rml-usersettings',  // WP Real Media Library
+		'rml-uploader', // WP Real Media Library
+		'rml-options', // WP Real Media Library
+		'rml-usersettings', // WP Real Media Library
 		'rml-main', // WP Real Media Library
 		'control-panel-sweet-alert', // Ken Theme
 		'sweet-alert-js', // Vitrine Theme
 		'theme-admin-script', // Vitrine Theme
 		'sweetalert', //  Church Suite Theme by Webnus
 		'be_alerts_charts', //  WooCommerce bolder product alerts
-		'magayo-lottery-results',  //  Magayo Lottery Results
+		'magayo-lottery-results', //  Magayo Lottery Results
 		'control-panel-sweet-alert', // Ken Theme
 		'cpm_chart', // WP Project Manager
 		'adminscripts', //  Artisan Nayma Theme
@@ -472,20 +472,20 @@ 
 
 	global $wp_styles;
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( strpos( $wp_styles->registered[ $handle ]->src, 'wp-content' ) === false ) {
+		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 
-		if ( strpos( $wp_styles->registered[ $handle ]->handle, 'monsterinsights' ) !== false ) {
+		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
 		foreach ( $third_party as $partial ) {
-			if ( strpos( $wp_styles->registered[ $handle ]->handle, $partial ) !== false ) {
+			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
 				break;
-			} else if ( strpos( $wp_styles->registered[ $handle ]->src, $partial ) !== false ) {
+			} else if ( strpos( $wp_styles->registered[$handle]->src, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
 				break;
@@ -495,20 +495,20 @@ 
 
 	global $wp_scripts;
 	foreach ( $wp_scripts->queue as $handle ) {
-		if ( strpos( $wp_scripts->registered[ $handle ]->src, 'wp-content' ) === false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 
-		if ( strpos( $wp_scripts->registered[ $handle ]->handle, 'monsterinsights' ) !== false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
 		foreach ( $third_party as $partial ) {
-			if ( strpos( $wp_scripts->registered[ $handle ]->handle, $partial ) !== false ) {
+			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
 				break;
-			} else if ( strpos( $wp_scripts->registered[ $handle ]->src, $partial ) !== false ) {
+			} else if ( strpos( $wp_scripts->registered[$handle]->src, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
 				break;
@@ -582,14 +582,14 @@ 
 		foreach ( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
 				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
@@ -599,14 +599,14 @@ 
 		foreach ( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
 				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
@@ -616,14 +616,14 @@ 
 		foreach ( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
 				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
@@ -684,10 +684,10 @@ 
 	// Put together redirect URL
 	$url = add_query_arg(
 		array(
-			'utm_source'   => $source,   // Pro/Lite Plugin
-			'utm_medium'   => sanitize_key( $medium ),   // Area of MonsterInsights (example Reports)
+			'utm_source'   => $source, // Pro/Lite Plugin
+			'utm_medium'   => sanitize_key( $medium ), // Area of MonsterInsights (example Reports)
 			'utm_campaign' => sanitize_key( $campaign ), // Which link (example eCommerce Report)
-			'utm_content'  => $content,  // Version number of MI
+			'utm_content'  => $content, // Version number of MI
 		),
 		trailingslashit( $url )
 	);

Indentation +6 added lines, -6 removed lines

@@ -19,28 +19,28 @@
     global $admin_page_hooks;
 
     if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
-        return false;
+	return false;
     }
 
     $settings_page = false;
     if ( ! empty( $admin_page_hooks['monsterinsights_settings'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( $current_screen->id === 'toplevel_page_monsterinsights_settings' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( $current_screen->id === 'insights_page_monsterinsights_settings' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
 	if ( strpos( $current_screen->id, 'monsterinsights_settings' ) !== false ) {
-        $settings_page = true;
+	$settings_page = true;
 	}
 
     if ( ! empty( $current_screen->base ) && strpos( $current_screen->base, 'monsterinsights_network' ) !== false ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     return $settings_page;

includes/admin/licensing/license-actions.php

Indentation +12 added lines, -12 removed lines

@@ -195,18 +195,18 @@
 			return;
 		}
 
-        // Otherwise, our request has been done successfully. Update the option and set the success message.
-        $option                = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
-        $option['key']         = trim( $_POST['monsterinsights-license-key'] );
-        $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
-        $option['is_expired']  = false;
-        $option['is_disabled'] = false;
-        $option['is_invalid']  = false;
-        $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
-        is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
-        delete_transient( '_monsterinsights_addons' );
-        monsterinsights_get_addons_data( $option['key'] );
-        // Make sure users can now update their plugins if they previously an expired key.
+	// Otherwise, our request has been done successfully. Update the option and set the success message.
+	$option                = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
+	$option['key']         = trim( $_POST['monsterinsights-license-key'] );
+	$option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
+	$option['is_expired']  = false;
+	$option['is_disabled'] = false;
+	$option['is_invalid']  = false;
+	$this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
+	is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
+	delete_transient( '_monsterinsights_addons' );
+	monsterinsights_get_addons_data( $option['key'] );
+	// Make sure users can now update their plugins if they previously an expired key.
 	    wp_clean_plugins_cache( true );
     }
 

includes/install.php

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
 				wp_cache_flush();
 				$cachec = true;
 			}
-		} else { // if existing install
+		} else {
+// if existing install
 			if ( version_compare( $version, '6.0.11', '<' ) ) {
 				if ( ! $cachec ) {
 					wp_cache_flush();

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 		// if new install or Yoast Era instal
 		if ( ! $version ) {
 			// See if from Yoast
-			$yoast   = get_option( 'yst_ga', false );
+			$yoast = get_option( 'yst_ga', false );
 
 			// In case from Yoast, start from scratch
 			delete_option( 'yoast-ga-access_token' );
@@ -297,25 +297,25 @@ 
 	public function v700_upgrades() {
 		// 1. 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';
 			}
 
 		// 2. Migrate manual UA codes
 			// 2a 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'] ) );
 			}
 
 			// 2b 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'] ) );
 			}
 
 		// 3. Migrate License keys
@@ -357,8 +357,8 @@ 
 					'track_internal_as_label',
 				);
 				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] );
 					}
 				}
 			}
@@ -402,8 +402,8 @@ 
 			);
 
 			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] );
 				}
 			}
 
@@ -442,8 +442,8 @@ 
 			);
 
 			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] );
 				}
 			}
 
@@ -534,7 +534,7 @@ 
 					}
 					preg_match( $regex, $cross_domain['domain'], $matches );
 					if ( count( $matches ) > 0 ) {
-						unset( $this->new_settings['cross_domains'][ $key ] );
+						unset( $this->new_settings['cross_domains'][$key] );
 					}
 				}
 			}

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

Spacing +13 added lines, -13 removed lines

@@ -98,8 +98,8 @@ 
 
 		if ( $create && ! empty( $create ) && is_array( $create ) ) {
 			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+			$create = str_replace( '"', "'", $create );
+			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "', " . $create;
 		} else {
 			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
 		}
@@ -173,7 +173,7 @@ 
 	 * @return string Javascript to output.
 	 */
 	public function frontend_output( ) {
-		$options        = $this->frontend_tracking_options();
+		$options = $this->frontend_tracking_options();
 		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
 		$compat     	= monsterinsights_get_option( 'gatracker_compatibility_mode', false );
 		$compat    	 	= $compat ? 'window.ga = __gaTracker;' : '';
@@ -181,10 +181,10 @@ 
 		$ua         	= monsterinsights_get_ua();
 		$output     	= '';
 		$reason     	= '';
-		$attributes     = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false'  ) );
+		$attributes     = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false' ) );
 		$attr_string    = '';
 		if ( ! empty( $attributes ) ) {
-			foreach( $attributes as $attr_name => $attr_value ) {
+			foreach ( $attributes as $attr_name => $attr_value ) {
 	 			if ( ! empty( $attr_name ) ) {
 	 				$attr_string .= ' ' . sanitize_key( $attr_name ) . '="' . esc_attr( $attr_value ) . '"';
 	 			} else {
@@ -198,21 +198,21 @@ 
 <?php if ( ! $track_user ) {
 	if ( empty( $ua ) ) {
 		$reason = __( 'Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-		$reason = __( 'Note: MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'. PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+		$reason = __( 'Note: MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.' . PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else {
 		$reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	}
 	echo $output;
 } ?>
 <?php if ( $ua ) { ?>
-<script<?php echo $attr_string;?>>
+<script<?php echo $attr_string; ?>>
 	var mi_version         = '<?php echo MONSTERINSIGHTS_VERSION; ?>';
 	var mi_track_user      = <?php echo ( $track_user ? 'true' : 'false' ); ?>;
-	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason)  . "'": "''" ); ?>;
+	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason ) . "'" : "''" ); ?>;
 	<?php do_action( 'monsterinsights_tracking_analytics_frontend_output_after_mi_track_user' ); ?>
 
 <?php if ( $this->should_do_optout() ) { ?>
@@ -256,7 +256,7 @@ 
 	?>
 	} else {
 <?php if ( $this->should_do_optout() ) { ?>
-		console.log( "<?php echo esc_js( $reason );?>" );
+		console.log( "<?php echo esc_js( $reason ); ?>" );
 		(function() {
 			/* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */
 			var noopfn = function() {
@@ -279,7 +279,7 @@ 
 				}
 				var f = arguments[len-1];
 				if ( typeof f !== 'object' || f === null || typeof f.hitCallback !== 'function' ) {
-					console.log( '<?php echo esc_js( __("Not running function", "google-analytics-for-wordpress" ) );?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) );?> " + mi_no_track_reason );
+					console.log( '<?php echo esc_js( __( "Not running function", "google-analytics-for-wordpress" ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) ); ?> " + mi_no_track_reason );
 					return;
 				}
 				try {

includes/frontend/events/class-analytics-events.php

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 		if ( ! is_array( $inbound_paths ) ) {
 			$inbound_paths = array();
 		} else {
-			foreach( $inbound_paths as $index => $pair ) {
+			foreach ( $inbound_paths as $index => $pair ) {
 				// if empty pair, unset and continue
 				if ( empty( $pair['path'] ) ) {
 					unset( $inbound_paths[$index] );
@@ -87,8 +87,8 @@ 
 			$download_extensions = array( $download_extensions );
 		}
 		$i = 0;
-		foreach( $download_extensions as $extension ){
-			$download_extensions[ $i ] = esc_js( trim( $extension ) );
+		foreach ( $download_extensions as $extension ) {
+			$download_extensions[$i] = esc_js( trim( $extension ) );
 			$i++;
 		}
 

Braces +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 			$download_extensions = array( $download_extensions );
 		}
 		$i = 0;
-		foreach( $download_extensions as $extension ){
+		foreach( $download_extensions as $extension ) {
 			$download_extensions[ $i ] = esc_js( trim( $extension ) );
 			$i++;
 		}

includes/frontend/seedprod.php

Indentation +6 added lines, -6 removed lines

@@ -33,13 +33,13 @@
     $track_user    = monsterinsights_track_user();
 
     if ( $track_user ) {
-        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();
 
-        // Let's run form tracking if we find it
-        if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) {
-            monsterinsights_forms_output_after_script( array() );
-        }
+	// Let's run form tracking if we find it
+	if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) {
+	    monsterinsights_forms_output_after_script( array() );
+	}
     }
 }
 add_action( 'seedprod_monsterinsights_output_tracking', 'monsterinsights_seedprod_tracking', 6, 1 );
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     do_action( 'monsterinsights_tracking_after_analytics' );
     do_action( 'monsterinsights_tracking_after', 'analytics' );
 
-    $track_user    = monsterinsights_track_user();
+    $track_user = monsterinsights_track_user();
 
     if ( $track_user ) {
         require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';

includes/admin/pages/addons.php

Indentation +27 added lines, -27 removed lines

@@ -40,37 +40,37 @@ 
     
     // Get addons data from transient or perform API query if no transient.
     if ( false === ( $addons = get_transient( '_monsterinsights_addons' ) ) ) {
-        $addons = monsterinsights_get_addons_data( $key );
+	$addons = monsterinsights_get_addons_data( $key );
     }
 
     // If no Addons exist, return false
     if ( ! $addons ) {
-        return false;
+	return false;
     }
 
     // Iterate through Addons, to build two arrays: 
     // - Addons the user is licensed to use,
     // - Addons the user isn't licensed to use.
     $results = array(
-        'licensed'  => array(),
-        'unlicensed'=> array(),
+	'licensed'  => array(),
+	'unlicensed'=> array(),
     );
     foreach ( (array) $addons as $i => $addon ) {
 
-        // Determine whether the user is licensed to use this Addon or not.
-        if ( 
-            empty( $type ) ||
-            ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
-            ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
-            ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
-        ) {
-            // Unlicensed
-            $results['unlicensed'][] = $addon;
-            continue;
-        }
-
-        // Licensed
-        $results['licensed'][] = $addon;
+	// Determine whether the user is licensed to use this Addon or not.
+	if ( 
+	    empty( $type ) ||
+	    ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
+	    ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
+	    ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
+	) {
+	    // Unlicensed
+	    $results['unlicensed'][] = $addon;
+	    continue;
+	}
+
+	// Licensed
+	$results['licensed'][] = $addon;
 
     }
 
@@ -93,21 +93,21 @@ 
     // Get Addons
     // If the key is valid, we'll get personalised upgrade URLs for each Addon (if necessary) and plugin update information.
     if ( $key ) {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
     } else {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
     }
     
     // If there was an API error, set transient for only 10 minutes.
     if ( ! $addons ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // If there was an error retrieving the addons, set the error.
     if ( isset( $addons->error ) ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // Otherwise, our request worked. Save the data and return it.
@@ -128,9 +128,9 @@ 
     $keys = array_keys( get_plugins() );
 
     foreach ( $keys as $key ) {
-        if ( preg_match( '|^' . $slug . '|', $key ) ) {
-            return $key;
-        }
+	if ( preg_match( '|^' . $slug . '|', $key ) ) {
+	    return $key;
+	}
     }
 
     return $slug;

includes/admin/routes.php

Spacing +11 added lines, -11 removed lines

@@ -40,7 +40,7 @@ 
 			return;
 		}
 
-		$site_license    = array(
+		$site_license = array(
 			'key'         => MonsterInsights()->license->get_site_license_key(),
 			'type'        => MonsterInsights()->license->get_site_license_type(),
 			'is_disabled' => MonsterInsights()->license->site_license_disabled(),
@@ -100,8 +100,8 @@ 
 		// Array fields are needed even if empty.
 		$array_fields = array( 'view_reports', 'save_settings', 'ignore_users' );
 		foreach ( $array_fields as $array_field ) {
-			if ( ! isset( $options[ $array_field ] ) ) {
-				$options[ $array_field ] = array();
+			if ( ! isset( $options[$array_field] ) ) {
+				$options[$array_field] = array();
 			}
 		}
 		if ( isset( $options['custom_code'] ) ) {
@@ -175,7 +175,7 @@ 
 						}
 					}
 					if ( $empty ) {
-						unset( $value[ $key ] );
+						unset( $value[$key] );
 					}
 				}
 			}
@@ -225,7 +225,7 @@ 
 				} else {
 					$addon = $this->get_addon( $installed_plugins, $addons_type, $addon, $slug );
 				}
-				$parsed_addons[ $addon->slug ] = $addon;
+				$parsed_addons[$addon->slug] = $addon;
 			}
 		}
 
@@ -310,7 +310,7 @@ 
 		$installed       = false;
 		$plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug );
 
-		if ( isset( $installed_plugins[ $plugin_basename ] ) ) {
+		if ( isset( $installed_plugins[$plugin_basename] ) ) {
 			$installed = true;
 			$ms_active = is_plugin_active_for_network( $plugin_basename );
 			$ss_active = is_plugin_active( $plugin_basename );
@@ -455,8 +455,8 @@ 
 		);
 
 		foreach ( $exclude as $e ) {
-			if ( ! empty( $new_settings[ $e ] ) ) {
-				unset( $new_settings[ $e ] );
+			if ( ! empty( $new_settings[$e] ) ) {
+				unset( $new_settings[$e] );
 			}
 		}
 
@@ -467,8 +467,8 @@ 
 		}
 
 		foreach ( $exclude as $e ) {
-			if ( ! empty( $settings[ $e ] ) ) {
-				$new_settings = $settings[ $e ];
+			if ( ! empty( $settings[$e] ) ) {
+				$new_settings = $settings[$e];
 			}
 		}
 
@@ -616,7 +616,7 @@ 
 			),
 			admin_url( 'admin.php' )
 		);
-		$url    = esc_url( $url );
+		$url = esc_url( $url );
 
 		ob_start();
 		if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {

includes/admin/reports/overview.php

Spacing +4 added lines, -4 removed lines

@@ -47,17 +47,17 @@
 		if ( ! empty( $data['data']['countries'] ) ) {
 			$country_names = monsterinsights_get_country_list( true );
 			foreach ( $data['data']['countries'] as $key => $country ) {
-				$data['data']['countries'][ $key ]['name'] = isset( $country_names[ $country['iso'] ] ) ? $country_names[ $country['iso'] ] : $country['iso'];
+				$data['data']['countries'][$key]['name'] = isset( $country_names[$country['iso']] ) ? $country_names[$country['iso']] : $country['iso'];
 			}
 		}
 
 		// Escape urls for the top pages report.
 		if ( ! empty( $data['data']['toppages'] ) ) {
 			foreach ( $data['data']['toppages'] as $key => $page ) {
-				$title = $data['data']['toppages'][ $key ]['title'];
-				$url   = '(not set)' === $title ? '' : esc_url( $data['data']['toppages'][ $key ]['hostname'] );
+				$title = $data['data']['toppages'][$key]['title'];
+				$url   = '(not set)' === $title ? '' : esc_url( $data['data']['toppages'][$key]['hostname'] );
 
-				$data['data']['toppages'][ $key ]['hostname'] = $url;
+				$data['data']['toppages'][$key]['hostname'] = $url;
 			}
 		}