awesomemotive / google-analytics-for-wordpress

lite/includes/admin/dashboard-widget.php

Spacing +6 added lines, -6 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public function __construct() {
 		// Allow dashboard widget to be hidden on multisite installs
-		$show_widget         = is_multisite() ? apply_filters( 'monsterinsights_show_dashboard_widget', true ) : true;
+		$show_widget = is_multisite() ? apply_filters( 'monsterinsights_show_dashboard_widget', true ) : true;
 		if ( ! $show_widget ) {
 			return false;
 		}
@@ -93,8 +93,8 @@ 
 
 		// Attept to place the widget at the top.
 		$normal_dashboard = $wp_meta_boxes['dashboard']['normal']['core'];
-		$widget_instance  = array( self::WIDGET_KEY => $normal_dashboard[ self::WIDGET_KEY ] );
-		unset( $normal_dashboard[ self::WIDGET_KEY ] );
+		$widget_instance  = array( self::WIDGET_KEY => $normal_dashboard[self::WIDGET_KEY] );
+		unset( $normal_dashboard[self::WIDGET_KEY] );
 		$sorted_dashboard                             = array_merge( $widget_instance, $normal_dashboard );
 		$wp_meta_boxes['dashboard']['normal']['core'] = $sorted_dashboard;
 	}
@@ -249,10 +249,10 @@ 
 		$b      = (array) $b;
 		$result = $b;
 		foreach ( $a as $k => &$v ) {
-			if ( is_array( $v ) && isset( $result[ $k ] ) ) {
-				$result[ $k ] = self::wp_parse_args_recursive( $v, $result[ $k ] );
+			if ( is_array( $v ) && isset( $result[$k] ) ) {
+				$result[$k] = self::wp_parse_args_recursive( $v, $result[$k] );
 			} else {
-				$result[ $k ] = $v;
+				$result[$k] = $v;
 			}
 		}
 

lite/includes/popular-posts/class-popular-posts-widget-sidebar.php

Spacing +14 added lines, -14 removed lines

@@ -115,8 +115,8 @@ 
 		);
 
 		foreach ( $this->conditional_options as $key => $default ) {
-			if ( ! empty( $instance[ $key ] ) ) {
-				$atts[ $key ] = $instance[ $key ];
+			if ( ! empty( $instance[$key] ) ) {
+				$atts[$key] = $instance[$key];
 			}
 		}
 
@@ -149,7 +149,7 @@ 
 		$theme  = $themes->get_theme();
 
 		foreach ( $this->conditional_options as $key => $obj ) {
-			$new_instance = $this->maybe_remove_option( ! empty( $theme['styles'][ $obj[0] ][ $obj[1] ] ), $key, $new_instance );
+			$new_instance = $this->maybe_remove_option( ! empty( $theme['styles'][$obj[0]][$obj[1]] ), $key, $new_instance );
 		}
 
 		return $new_instance;
@@ -172,12 +172,12 @@ 
 			'meta_comments',
 		);
 
-		if ( $is_used && ! isset( $instance[ $key ] ) && in_array( $key, $checkboxes ) ) {
-			$instance[ $key ] = 'off';
-		} elseif ( ! $is_used && isset( $instance[ $key ] ) ) {
-			unset( $instance[ $key ] );
-		} elseif ( $is_used && isset( $instance[ $key ] ) ) {
-			$instance[ $key ] = wp_strip_all_tags( $instance[ $key ] );
+		if ( $is_used && ! isset( $instance[$key] ) && in_array( $key, $checkboxes ) ) {
+			$instance[$key] = 'off';
+		} elseif ( ! $is_used && isset( $instance[$key] ) ) {
+			unset( $instance[$key] );
+		} elseif ( $is_used && isset( $instance[$key] ) ) {
+			$instance[$key] = wp_strip_all_tags( $instance[$key] );
 		}
 
 		return $instance;
@@ -324,7 +324,7 @@ 
 			<input type="text"
 				   id="<?php echo esc_attr( $this->get_field_id( $name ) ); ?>"
 				   name="<?php echo esc_attr( $this->get_field_name( $name ) ); ?>"
-				   value="<?php echo esc_attr( $instance[ $name ] ); ?>"
+				   value="<?php echo esc_attr( $instance[$name] ); ?>"
 				   class="widefat monsterinsights-color-field"/>
 		</p>
 		<?php
@@ -346,7 +346,7 @@ 
 			<input type="text"
 				   id="<?php echo esc_attr( $this->get_field_id( $name ) ); ?>"
 				   name="<?php echo esc_attr( $this->get_field_name( $name ) ); ?>"
-				   value="<?php echo esc_attr( $instance[ $name ] ); ?>" class="widefat"/>
+				   value="<?php echo esc_attr( $instance[$name] ); ?>" class="widefat"/>
 		</p>
 		<?php
 	}
@@ -368,7 +368,7 @@ 
 			<select id="<?php echo esc_attr( $this->get_field_id( $name ) ); ?>"
 					name="<?php echo esc_attr( $this->get_field_name( $name ) ); ?>" class="widefat">
 				<?php foreach ( $range as $font_size ) { ?>
-					<option value="<?php echo absint( $font_size ); ?>" <?php selected( $instance[ $name ], $font_size ); ?>><?php printf( esc_html_x( '%dpx', 'google-analytics-for-wordpress' ), $font_size ); ?></option>
+					<option value="<?php echo absint( $font_size ); ?>" <?php selected( $instance[$name], $font_size ); ?>><?php printf( esc_html_x( '%dpx', 'google-analytics-for-wordpress' ), $font_size ); ?></option>
 				<?php } ?>
 			</select>
 		</p>
@@ -382,8 +382,8 @@ 
 	 */
 	public function prepare_defaults_from_theme( $theme ) {
 		foreach ( $this->conditional_options as $key => $obj ) {
-			if ( ! empty( $theme['styles'][ $obj[0] ][ $obj[1] ] ) ) {
-				$this->defaults[ $key ] = $theme['styles'][ $obj[0] ][ $obj[1] ];
+			if ( ! empty( $theme['styles'][$obj[0]][$obj[1]] ) ) {
+				$this->defaults[$key] = $theme['styles'][$obj[0]][$obj[1]];
 			}
 		}
 	}

includes/admin/notification-event-runner.php

Spacing +5 added lines, -5 removed lines

@@ -91,7 +91,7 @@ 
 			$time = time();
 		}
 
-		$this->last_run[ $notification_id ] = $time;
+		$this->last_run[$notification_id] = $time;
 		$this->changed                      = true;
 	}
 
@@ -124,12 +124,12 @@ 
 			 *
 			 * @var MonsterInsights_Notification_Event $notification
 			 */
-			if ( empty( $last_runs[ $notification->notification_id ] ) ) {
+			if ( empty( $last_runs[$notification->notification_id] ) ) {
 				// If the notification never ran, save current time to show it after the interval.
 				$this->update_last_run( $notification->notification_id );
 			} else {
 				// Has run before so let's check if enough days passed since the last run.
-				$time_since = $last_runs[ $notification->notification_id ] + $notification->notification_interval * DAY_IN_SECONDS;
+				$time_since = $last_runs[$notification->notification_id] + $notification->notification_interval * DAY_IN_SECONDS;
 				$time_now   = time();
 				if ( $time_since < $time_now ) {
 					// Interval passed since it ran so let's add this one.
@@ -164,8 +164,8 @@ 
 	public function register_notification( $notification ) {
 
 		$notification_id = isset( $notification->notification_id ) ? $notification->notification_id : false;
-		if ( ! empty( $notification_id ) && ! isset( self::$notifications[ $notification_id ] ) ) {
-			self::$notifications[ $notification_id ] = $notification;
+		if ( ! empty( $notification_id ) && ! isset( self::$notifications[$notification_id] ) ) {
+			self::$notifications[$notification_id] = $notification;
 		}
 
 	}

includes/admin/notifications/notification-audience.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 					$translations  = wp_get_available_translations();
 
 					if ( is_array( $translations ) && ! empty( $translations ) ) {
-						$site_iso = isset( $translations[ $site_language ]['iso'] ) ? $translations[ $site_language ]['iso'] : array(); // keep empty array, because site language has no iso setup for en_US language
+						$site_iso = isset( $translations[$site_language]['iso'] ) ? $translations[$site_language]['iso'] : array(); // keep empty array, because site language has no iso setup for en_US language
 
 						if ( is_array( $site_iso ) && ! in_array( $country['iso'], $site_iso ) ) {
 							$data['country']    = $country['name'];

includes/admin/notifications.php

Spacing +9 added lines, -9 removed lines

@@ -232,7 +232,7 @@ 
 				( ! empty( $notification['end'] ) && time() > strtotime( $notification['end'] ) ) ||
 				( ! empty( $notification['type'] ) && ! in_array( $license_type, $notification['type'] ) )
 			) {
-				unset( $notifications[ $key ] );
+				unset( $notifications[$key] );
 			}
 		}
 
@@ -289,8 +289,8 @@ 
 
 		foreach ( $notifications as $key => $notification ) {
 			if ( ! empty( $notification['content'] ) ) {
-				$notifications[ $key ]['content'] = wpautop( $notification['content'] );
-				$notifications[ $key ]['content'] = apply_filters( 'monsterinsights_notification_content_display', $notifications[ $key ]['content'] );
+				$notifications[$key]['content'] = wpautop( $notification['content'] );
+				$notifications[$key]['content'] = apply_filters( 'monsterinsights_notification_content_display', $notifications[$key]['content'] );
 			}
 		}
 
@@ -316,7 +316,7 @@ 
 
 			// Translators: Readable time to display
 			$modified_start_time            = sprintf( __( '%1$s ago', 'google-analytics-for-wordpress' ), human_time_diff( strtotime( $notification['start'] ), current_time( 'timestamp' ) ) );
-			$notifications[ $key ]['start'] = $modified_start_time;
+			$notifications[$key]['start'] = $modified_start_time;
 		}
 
 		return $notifications;
@@ -446,13 +446,13 @@ 
 			if ( is_array( $option['feed'] ) && ! empty( $option['feed'] ) ) {
 				foreach ( $option['feed'] as $key => $notification ) {
 					array_unshift( $option['dismissed'], $notification );
-					unset( $option['feed'][ $key ] );
+					unset( $option['feed'][$key] );
 				}
 			}
 			if ( is_array( $option['events'] ) && ! empty( $option['events'] ) ) {
 				foreach ( $option['events'] as $key => $notification ) {
 					array_unshift( $option['dismissed'], $notification );
-					unset( $option['events'][ $key ] );
+					unset( $option['events'][$key] );
 				}
 			}
 		}
@@ -460,13 +460,13 @@ 
 		$type = is_numeric( $id ) ? 'feed' : 'events';
 
 		// Remove notification and add in dismissed array.
-		if ( is_array( $option[ $type ] ) && ! empty( $option[ $type ] ) ) {
-			foreach ( $option[ $type ] as $key => $notification ) {
+		if ( is_array( $option[$type] ) && ! empty( $option[$type] ) ) {
+			foreach ( $option[$type] as $key => $notification ) {
 				if ( $notification['id'] == $id ) { // phpcs:ignore WordPress.PHP.StrictComparisons
 					// Add notification to dismissed array.
 					array_unshift( $option['dismissed'], $notification );
 					// Remove notification from feed or events.
-					unset( $option[ $type ][ $key ] );
+					unset( $option[$type][$key] );
 					break;
 				}
 			}

Braces +4 added lines, -2 removed lines

@@ -141,7 +141,8 @@ 
 	 * @since {VERSION}
 	 *
 	 */
-	public function verify( $notifications ) { // phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh
+	public function verify( $notifications ) {
+// phpcs:ignore Generic.Metrics.CyclomaticComplexity.TooHigh
 
 		$data = array();
 
@@ -462,7 +463,8 @@ 
 		// Remove notification and add in dismissed array.
 		if ( is_array( $option[ $type ] ) && ! empty( $option[ $type ] ) ) {
 			foreach ( $option[ $type ] as $key => $notification ) {
-				if ( $notification['id'] == $id ) { // phpcs:ignore WordPress.PHP.StrictComparisons
+				if ( $notification['id'] == $id ) {
+// phpcs:ignore WordPress.PHP.StrictComparisons
 					// Add notification to dismissed array.
 					array_unshift( $option['dismissed'], $notification );
 					// Remove notification from feed or events.

includes/install.php

Spacing +19 added lines, -19 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' );
@@ -363,25 +363,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
@@ -423,8 +423,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] );
 				}
 			}
 		}
@@ -468,8 +468,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] );
 			}
 		}
 
@@ -508,8 +508,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] );
 			}
 		}
 
@@ -600,7 +600,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] );
 					}
 				}
 			}
@@ -680,7 +680,7 @@ 
 				'js',
 				'tgz'
 			);
-			$extensions_to_add    = array(
+			$extensions_to_add = array(
 				'docx',
 				'pptx',
 				'xlsx',
@@ -782,8 +782,8 @@ 
 		);
 
 		foreach ( $popular_posts_defaults as $key => $value ) {
-			if ( empty( $this->new_settings[ $key ] ) ) {
-				$this->new_settings[ $key ] = $value;
+			if ( empty( $this->new_settings[$key] ) ) {
+				$this->new_settings[$key] = $value;
 			}
 		}
 
@@ -798,7 +798,7 @@ 
 				$content = isset( $dismiss_notification['content'] ) ? $dismiss_notification['content'] : '';
 
 				if ( empty( $title ) || empty( $content ) ) {
-					unset( $dismissed_notifications[ $key ] );
+					unset( $dismissed_notifications[$key] );
 				}
 			}