awesomemotive / google-analytics-for-wordpress

includes/measurement-protocol.php

Spacing +9 added lines, -9 removed lines

@@ -26,16 +26,16 @@ 
 
 	$defaults = array(
 		't'  => 'event', // Required: Hit type
-		'ec' => '',      // Optional: Event category
-		'ea' => '', 	 // Optional: Event Action
-		'el' => '', 	 // Optional: Event Label
-		'ev' => null, 	 // Optional: Event Value
+		'ec' => '', // Optional: Event category
+		'ea' => '', // Optional: Event Action
+		'el' => '', // Optional: Event Label
+		'ev' => null, // Optional: Event Value
 	);
 
-	$body  = array_merge( $defaults , $args );
+	$body = array_merge( $defaults, $args );
 
 	// We want to get the user's IP address when possible
-	$ip     = '';
+	$ip = '';
 	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) && ! filter_var( $_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP ) === false ) {
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
 	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) && ! filter_var( $_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) === false ) {
@@ -81,7 +81,7 @@ 
 		'uip' => $ip,
 
 		// Optional: User Agent
-		'ua'  => ! empty( $user_agent ) ?  $user_agent : $_SERVER['HTTP_USER_AGENT'],
+		'ua'  => ! empty( $user_agent ) ? $user_agent : $_SERVER['HTTP_USER_AGENT'],
 
 		// Optional: Time of the event
 		'z'   => time()
@@ -99,7 +99,7 @@ 
 	// Unset empty values to reduce request size
 	foreach ( $body as $key => $value ) {
 		if ( empty( $value ) ) {
-			unset( $body[ $key ] );
+			unset( $body[$key] );
 		}
 	}
 
@@ -142,7 +142,7 @@ 
 		// Optional: Event Value
 		'ev' => null,
 	);
-	$args  = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
 	//$args = apply_filters( 'monsterinsights_mp_track_event_call', $args );
 
 	return monsterinsights_mp_api_call( $args );

includes/admin/settings/settings-api.php

Braces +12 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
  */
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
+if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Get the settings for a section
@@ -153,7 +155,7 @@ 
 }
 add_action( 'current_screen', 'monsterinsights_save_settings' );
 
-function monsterinsights_is_settings_tab( $tab = '' ){
+function monsterinsights_is_settings_tab( $tab = '' ) {
 	$tabs = monsterinsights_get_settings_tabs();
 	if ( empty( $tab ) || empty( $tabs ) || ! is_string( $tab ) || ! is_array( $tabs ) ) {
 		return false;
@@ -317,7 +319,7 @@ 
 function monsterinsights_sanitize_multicheck_field( $value, $id, $setting, $previous_value ) {
 	$save_value = array();
 	if ( ! empty( $value ) && is_array( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
+		foreach( $setting['options'] as $key => $option ) {
 			if ( in_array( $key, $value ) ) {
 				$save_value[] = $key;
 			}
@@ -342,7 +344,7 @@ 
 	if ( ! empty( $value ) && is_array( $value ) ) {
 		if ( $setting['multiple'] ) {
 			foreach ( $value as $vid => $vname ) {
-				foreach( $setting['options'] as $key => $option ){
+				foreach( $setting['options'] as $key => $option ) {
 					if ( $key === $vname ) {
 						$save_value[] = $key;
 						break;
@@ -350,11 +352,11 @@ 
 				}
 			}
 		} else {
-			foreach( $setting['options'] as $key => $option ){
+			foreach( $setting['options'] as $key => $option ) {
 				if ( is_array( $value ) && in_array( $key, $value ) ) {
 					$save_value = $key;
 					break;
-				} else if ( is_string( $value ) && $key === $value ){
+				} else if ( is_string( $value ) && $key === $value ) {
 					$save_value = $key;
 					break;
 				}
@@ -375,7 +377,7 @@ 
 function monsterinsights_sanitize_radio_field( $value, $id, $setting, $previous_value ) {
 	$save_value = '';
 	if ( ! empty( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
+		foreach( $setting['options'] as $key => $option ) {
 			if ( $key === $value ) {
 				$save_value = $key;
 			}
@@ -995,7 +997,8 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_add_setting_tooltip( $html, $args ) { // @todo: enqueue tooltips
+function monsterinsights_add_setting_tooltip( $html, $args ) {
+// @todo: enqueue tooltips
 
 	if ( ! empty( $args['tooltip_title'] ) && ! empty( $args['tooltip_desc'] ) ) {
 		$tooltip = '<span alt="f223" class="monsterinsights-help-tip dashicons dashicons-editor-help" title="<strong>' . $args['tooltip_title'] . '</strong>: ' . $args['tooltip_desc'] . '"></span>';
@@ -1052,6 +1055,6 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_get_non_setting_types(){
+function monsterinsights_get_non_setting_types() {
 	return apply_filters( 'monsterinsights_non_setting_types', array(  'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
 }
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -563,7 +563,7 @@
 	$html = '';
 	if ( ! empty( $args['options'] ) ) {
 		foreach( $args['options'] as $key => $option ):
-			if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = NULL; }
+			if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = null; }
 			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 			$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">' . wp_kses_post( $option ) . '</label><br/>';
 		endforeach;

Spacing +55 added lines, -55 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) exit;
 
 /**
  * Get the settings for a section
@@ -82,23 +82,23 @@ 
 	// get subtab
 	$settings = monsterinsights_get_registered_settings();
 	$tab      = $_POST['monsterinsights_settings_sub_tab'];
-	if ( empty( $settings ) || !is_array( $settings ) || empty( $settings[ $tab ] ) || ! is_array( $settings[ $tab ] ) ) {
+	if ( empty( $settings ) || ! is_array( $settings ) || empty( $settings[$tab] ) || ! is_array( $settings[$tab] ) ) {
 		return;
 	}
 
 	// Okay we're good to sanitize, validate, and save this section's settings
 
 	// We only care about this sections's settings
-	$settings = $settings[ $tab ]; 
+	$settings = $settings[$tab]; 
 
 	// Run a general sanitization for the tab for special fields
 	$input    = ! empty( $_POST['monsterinsights_settings'] ) ? $_POST['monsterinsights_settings'] : array();
 	$input    = apply_filters( 'monsterinsights_settings_' . $tab . '_sanitize', $input );
 
-	foreach( $settings as $id => $setting ) {
+	foreach ( $settings as $id => $setting ) {
 
 		// If the value wasn't passed in, set to false, which will delete the option
-		$value          = isset( $input[ $id ] ) ? $input[ $id ] : false;
+		$value          = isset( $input[$id] ) ? $input[$id] : false;
 		$previous_value = monsterinsights_get_option( $id, false );
 
 		// Sanitize/Validate
@@ -138,9 +138,9 @@ 
 		) );
 
 		// Sanitize settings
-		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $id  , $value, $id, $args, $previous_value );
+		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $id, $value, $id, $args, $previous_value );
 		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $type, $value, $id, $args, $previous_value );
-		$value = apply_filters( 'monsterinsights_settings_sanitize'         , $value, $id, $args, $previous_value );
+		$value = apply_filters( 'monsterinsights_settings_sanitize', $value, $id, $args, $previous_value );
 
 		// Save
 		if ( ! has_action( 'monsterinsights_settings_save_' . $args['type'] ) ) {
@@ -153,13 +153,13 @@ 
 }
 add_action( 'current_screen', 'monsterinsights_save_settings' );
 
-function monsterinsights_is_settings_tab( $tab = '' ){
+function monsterinsights_is_settings_tab( $tab = '' ) {
 	$tabs = monsterinsights_get_settings_tabs();
 	if ( empty( $tab ) || empty( $tabs ) || ! is_string( $tab ) || ! is_array( $tabs ) ) {
 		return false;
 	}
 
-	return !empty( $tabs[$tab]);
+	return ! empty( $tabs[$tab] );
 }
 
 /**
@@ -176,7 +176,7 @@ 
 		if ( ! empty( $settings[$section] ) ) {
 			foreach ( $settings[$section] as $setting ) {
 				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
+					$setting_types[$setting['id']] = $setting['type'];
 				}
 			}
 		}
@@ -184,7 +184,7 @@ 
 		foreach ( $settings as $tab ) {
 			foreach ( $tab as $setting ) {
 				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
+					$setting_types[$setting['id']] = $setting['type'];
 				}
 			}
 		}
@@ -256,14 +256,14 @@ 
 	function _sanitize_text_fields( $str, $keep_newlines = false ) {
 		$filtered = wp_check_invalid_utf8( $str );
 	 
-		if ( strpos($filtered, '<') !== false ) {
+		if ( strpos( $filtered, '<' ) !== false ) {
 			$filtered = wp_pre_kses_less_than( $filtered );
 			// This will strip extra whitespace for us.
 			$filtered = wp_strip_all_tags( $filtered, false );
 	 
 			// Use html entities in a special case to make sure no later
 			// newline stripping stage could lead to a functional tag
-			$filtered = str_replace("<\n", "&lt;\n", $filtered);
+			$filtered = str_replace( "<\n", "&lt;\n", $filtered );
 		}
 	 
 		if ( ! $keep_newlines ) {
@@ -272,14 +272,14 @@ 
 		$filtered = trim( $filtered );
 	 
 		$found = false;
-		while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
-			$filtered = str_replace($match[0], '', $filtered);
+		while ( preg_match( '/%[a-f0-9]{2}/i', $filtered, $match ) ) {
+			$filtered = str_replace( $match[0], '', $filtered );
 			$found = true;
 		}
 	 
 		if ( $found ) {
 			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+			$filtered = trim( preg_replace( '/ +/', ' ', $filtered ) );
 		}
 	 
 		return $filtered;
@@ -317,7 +317,7 @@ 
 function monsterinsights_sanitize_multicheck_field( $value, $id, $setting, $previous_value ) {
 	$save_value = array();
 	if ( ! empty( $value ) && is_array( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
+		foreach ( $setting['options'] as $key => $option ) {
 			if ( in_array( $key, $value ) ) {
 				$save_value[] = $key;
 			}
@@ -342,7 +342,7 @@ 
 	if ( ! empty( $value ) && is_array( $value ) ) {
 		if ( $setting['multiple'] ) {
 			foreach ( $value as $vid => $vname ) {
-				foreach( $setting['options'] as $key => $option ){
+				foreach ( $setting['options'] as $key => $option ) {
 					if ( $key === $vname ) {
 						$save_value[] = $key;
 						break;
@@ -350,11 +350,11 @@ 
 				}
 			}
 		} else {
-			foreach( $setting['options'] as $key => $option ){
+			foreach ( $setting['options'] as $key => $option ) {
 				if ( is_array( $value ) && in_array( $key, $value ) ) {
 					$save_value = $key;
 					break;
-				} else if ( is_string( $value ) && $key === $value ){
+				} else if ( is_string( $value ) && $key === $value ) {
 					$save_value = $key;
 					break;
 				}
@@ -375,7 +375,7 @@ 
 function monsterinsights_sanitize_radio_field( $value, $id, $setting, $previous_value ) {
 	$save_value = '';
 	if ( ! empty( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
+		foreach ( $setting['options'] as $key => $option ) {
 			if ( $key === $value ) {
 				$save_value = $key;
 			}
@@ -492,14 +492,14 @@ 
  */
 function monsterinsights_get_pages( $force = false ) {
 	$pages_options = array( '' => '' ); // Blank option
-	if( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
+	if ( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
 		return $pages_options;
 	}
 
 	$pages = get_pages();
 	if ( $pages ) {
 		foreach ( $pages as $page ) {
-			$pages_options[ $page->ID ] = $page->post_title;
+			$pages_options[$page->ID] = $page->post_title;
 		}
 	}
 
@@ -540,7 +540,7 @@ 
 	}
 
 	$html     = '<input type="checkbox" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"' . $name . ' value="1" ' . $checked . ' class="' . $class . '" ' . $disabled . ' />';
-	$html    .= '<p class="description">'  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html    .= '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -562,9 +562,9 @@ 
 
 	$html = '';
 	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = NULL; }
-			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
+		foreach ( $args['options'] as $key => $option ):
+			if ( isset( $monsterinsights_option[$key] ) ) { $enabled = $option; } else { $enabled = NULL; }
+			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
 			$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">' . wp_kses_post( $option ) . '</label><br/>';
 		endforeach;
 		$html .= '<p class="description">' . $args['desc'] . '</p>';
@@ -596,12 +596,12 @@ 
 
 		if ( $monsterinsights_options && $monsterinsights_options == $key ) {
 			$checked = true;
-		} else if( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
+		} else if ( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
 			$checked = true;
 		}
 
 		$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">';
-		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked( true, $checked, false ) . '/>&nbsp;';
 		$html .= esc_html( $option ) . '</label>';
 	endforeach;
 
@@ -625,7 +625,7 @@ 
 
 	if ( $monsterinsights_option ) {
 		$value = $monsterinsights_option;
-	} elseif( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+	} elseif ( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
 		$value = '';
 	} else {
 		$value = isset( $args['std'] ) ? $args['std'] : '';
@@ -645,7 +645,7 @@ 
 	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
 	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
 	$html     = '<input type="text" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . $disabled . ' placeholder="' . esc_attr( $args['placeholder'] ) . '"/>';
-	$html    .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html    .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -679,13 +679,13 @@ 
 
 	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$max  = isset( $args['max'] )  ? $args['max']   : 999999;
-	$min  = isset( $args['min'] )  ? $args['min']   : 0;
+	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
+	$min  = isset( $args['min'] ) ? $args['min'] : 0;
 	$step = isset( $args['step'] ) ? $args['step'] : 1;
 
 	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
 	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -712,7 +712,7 @@ 
 	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
 	$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -742,7 +742,7 @@ 
 		$class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
 		$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . stripslashes( $value ) . '</textarea>';
-		$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+		$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 	} else {
 		$html .= sprintf( esc_html__( 'You must have the %s capability to view/edit this setting', 'google-analytics-for-wordpress' ), '"unfiltered_html"' );
 	}
@@ -788,7 +788,7 @@ 
  *
  * @return void
  */
-function monsterinsights_select_callback($args) {
+function monsterinsights_select_callback( $args ) {
 	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
 	if ( $monsterinsights_option ) {
@@ -810,14 +810,14 @@ 
 	}
 
 	$allowclear   = isset( $args['allowclear'] ) ? (bool) $args['allowclear'] : false;
-	$multiple     = isset( $args['multiple'] )   ? (bool) $args['multiple'] : false;
+	$multiple     = isset( $args['multiple'] ) ? (bool) $args['multiple'] : false;
 	$multiple     = $multiple ? 'multiple="multiple"' : '';
 	$multiple_arg = $multiple ? '[]' : '';
 
-	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg .'" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
+	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg . '" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
 
 	foreach ( $args['options'] as $option => $name ) {
-		$selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) :  $value === $option;
+		$selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) : $value === $option;
 		$selected = selected( true, $selected, false );
 		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
 	}
@@ -842,7 +842,7 @@ 
 	if ( $monsterinsights_option ) {
 		$value = $monsterinsights_option;
 	} else {
-		if( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+		if ( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
 			$value = '';
 		} else {
 			$value = isset( $args['std'] ) ? $args['std'] : '';
@@ -902,9 +902,9 @@ 
  * @return void
  */
 function monsterinsights_upgrade_notice_callback( $args ) {
-	$html =   '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name' ] ) . '</h2>'
+	$html = '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name'] ) . '</h2>'
 			. '<p class="monsterinsights-upsell-lite-text">' . $args['desc'] . '</p>'
-			. '<p class="monsterinsights-upsell-button-par"><a href="'. monsterinsights_get_upgrade_link( 'settings-page', 'settings-page-upgrade-cta' ) .'" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
+			. '<p class="monsterinsights-upsell-button-par"><a href="' . monsterinsights_get_upgrade_link( 'settings-page', 'settings-page-upgrade-cta' ) . '" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
 			. '</div>';
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args ); 
 }
@@ -932,7 +932,7 @@ 
  * @param array $args Arguments passed by the setting
  * @return void
  */
-function monsterinsights_missing_callback($args) {
+function monsterinsights_missing_callback( $args ) {
 	return sprintf(
 		__( 'The callback function used for the %s setting is missing.', 'google-analytics-for-wordpress' ),
 		'<strong>' . $args['id'] . '</strong>'
@@ -963,12 +963,12 @@ 
 			}
 		}
 		if ( $submit_button ) {
-			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ). '"/>';
-			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' .  esc_attr( $section ) . '"/>';
+			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ) . '"/>';
+			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' . esc_attr( $section ) . '"/>';
 			$html .= wp_nonce_field( 'monsterinsights-settings-nonce', 'monsterinsights-settings-nonce', true, false );
 			$html .= get_submit_button( esc_html__( 'Save Changes', 'google-analytics-for-wordpress' ), 'primary', 'monsterinsights-settings-submit', false );
 		}
-		$html      = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
+		$html = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
 	}
 	return $html;
 }
@@ -978,10 +978,10 @@ 
  */
 function monsterinsights_render_field( $args ) {
 	$output = '';
-	$output .='<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) .'">';
+	$output .= '<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) . '">';
 		if ( ! empty( $args['name'] ) && empty( $args['no_label'] ) ) {
 			$output .= '<th scope="row">';
-				$output .='<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
+				$output .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
 			$output .= '</th>';
 		} 
 
@@ -1029,9 +1029,9 @@ 
 	$notices = get_transient( 'monsterinsights_settings_notices' );
 	if ( empty( $notices ) ) {
 		$notices          = array();
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
+		$notices[$name] = array( "type" => $type, "message" => $message );
 	} else {
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
+		$notices[$name] = array( "type" => $type, "message" => $message );
 	}
 	set_transient( 'monsterinsights_settings_notices', $notices );
 }
@@ -1043,8 +1043,8 @@ 
 	$notices = get_transient( 'monsterinsights_settings_notices' );
 	$found   = false;
 	if ( ! empty( $notices ) ) {
-		if ( isset( $notices[ $name] ) ) {
-			unset( $notices[ $name] );
+		if ( isset( $notices[$name] ) ) {
+			unset( $notices[$name] );
 			set_transient( 'monsterinsights_settings_notices', $notices );
 			$found = true;
 		} else {
@@ -1057,6 +1057,6 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_get_non_setting_types(){
-	return apply_filters( 'monsterinsights_non_setting_types', array(  'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
+function monsterinsights_get_non_setting_types() {
+	return apply_filters( 'monsterinsights_non_setting_types', array( 'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
 }
\ No newline at end of file

includes/admin/settings/tab-status.php

Indentation +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
     ?>
     <div id="monsterinsights-settings-general">
         <?php 
-        ?>
+	?>
         <?php //Status page coming soon. ?>
         <!-- <hr /> -->
     </div>
@@ -40,14 +40,14 @@ 
  */
 function monsterinsights_system_info() {
     if ( ! empty( $_REQUEST['monsterinsights-action'] ) && $_REQUEST['monsterinsights-action'] === 'download_sysinfo' ) {
-        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-            return;
-        }
-        nocache_headers();
-        header( 'Content-Type: text/plain' );
-        header( 'Content-Disposition: attachment; filename="monsterinsights-system-info.txt"' );
-        echo wp_strip_all_tags( $_POST['monsterinsights-sysinfo'] );
-        die();
+	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	    return;
+	}
+	nocache_headers();
+	header( 'Content-Type: text/plain' );
+	header( 'Content-Disposition: attachment; filename="monsterinsights-system-info.txt"' );
+	echo wp_strip_all_tags( $_POST['monsterinsights-sysinfo'] );
+	die();
     }
 }
 //add_action( 'admin_init',  'monsterinsights_system_info'  );
\ No newline at end of file

includes/admin/notice.php

Indentation +87 added lines, -87 removed lines

@@ -36,11 +36,11 @@ 
      */
     public function __construct() {
 
-        // Populate $notices
-        $this->notices = get_option( 'monsterinsights_notices' );
-        if ( ! is_array( $this->notices ) ) {
-            $this->notices = array();
-        }
+	// Populate $notices
+	$this->notices = get_option( 'monsterinsights_notices' );
+	if ( ! is_array( $this->notices ) ) {
+	    $this->notices = array();
+	}
 
     }
 
@@ -55,10 +55,10 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
-            return false;
-        }
-        return true;
+	if ( ! isset( $this->notices[ $notice ] ) ) {
+	    return false;
+	}
+	return true;
 
     }
 
@@ -72,8 +72,8 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
-        update_option( 'monsterinsights_notices', $this->notices );
+	$this->notices[ $notice ] = true;
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -88,8 +88,8 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
-        update_option( 'monsterinsights_notices', $this->notices );
+	unset( $this->notices[ $notice ] );
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -108,7 +108,7 @@ 
      * @param bool      $is_dismissible     User can Dismiss Message (default: false)
      */ 
     public function display_inline_notice( $name, $title, $message, $type = 'success', $is_dismissible = false, $args = array() ) {
-        /* Available/Planned $args options
+	/* Available/Planned $args options
          * $args = array(
          *  'primary'    => array(
          *      'text'   => '',
@@ -127,110 +127,110 @@ 
          */
 
 
-        // Check if the notice is dismissible, and if so has been dismissed.
-        if ( $is_dismissible && $this->is_dismissed( $name ) ) {
-            // Nothing to show here, return!
-            return '';
-        }
+	// Check if the notice is dismissible, and if so has been dismissed.
+	if ( $is_dismissible && $this->is_dismissed( $name ) ) {
+	    // Nothing to show here, return!
+	    return '';
+	}
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+	$dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
 
-        // Display inline notice
-        ob_start();
-        ?>
+	// Display inline notice
+	ob_start();
+	?>
         <div class="monsterinsights-notice <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice' . $dismissible; ?>" data-notice="<?php echo esc_attr( $name ); ?>">
             <div class="monsterinsights-notice-icon <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-icon'?>">
             </div>
             <div class="monsterinsights-notice-text <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-text'?>">
                 <?php
-                // Title
-                if ( ! empty ( $title ) ) {
-                    ?>
+		// Title
+		if ( ! empty ( $title ) ) {
+		    ?>
                     <p class="monsterinsights-notice-title"><?php echo esc_html( $title ); ?></p>
                     <?php
-                }
+		}
 
-                // Message
-                if ( ! empty( $message ) ) {
-                    if ( empty( $args['skip_message_escape'] ) ) {
-                        ?>
+		// Message
+		if ( ! empty( $message ) ) {
+		    if ( empty( $args['skip_message_escape'] ) ) {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo esc_html( $message ); ?></p>
                         <?php
-                    } else {
-                        ?>
+		    } else {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo $message; ?></p>
                         <?php
-                    }
-                }
+		    }
+		}
                 
-                // Primary Button
-                if ( ! empty( $args['primary']['text'] ) ) {
+		// Primary Button
+		if ( ! empty( $args['primary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['primary']['text'] ) ) {
-                        $text = $args['primary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['primary']['url'] ) ) {
-                        $url = $args['primary']['url'];
-                    }
-
-                    $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-primary';
-                    if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['primary']['text'] ) ) {
+			$text = $args['primary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['primary']['url'] ) ) {
+			$url = $args['primary']['url'];
+		    }
+
+		    $target = '';
+		    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-primary';
+		    if ( ! empty( $args['primary']['class'] ) ) {
+			$class = ' class="'. $args['primary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Secondary Button
-                if ( ! empty( $args['secondary']['text'] ) ) {
+		// Secondary Button
+		if ( ! empty( $args['secondary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['secondary']['text'] ) ) {
-                        $text = $args['secondary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['secondary']['url'] ) ) {
-                        $url = $args['secondary']['url'];
-                    }           
-
-                    $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-secondary';
-                    if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['secondary']['text'] ) ) {
+			$text = $args['secondary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['secondary']['url'] ) ) {
+			$url = $args['secondary']['url'];
+		    }           
+
+		    $target = '';
+		    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-secondary';
+		    if ( ! empty( $args['secondary']['class'] ) ) {
+			$class = ' class="'. $args['secondary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Dismiss Button
-                if ( $is_dismissible ) {
-                    ?>
+		// Dismiss Button
+		if ( $is_dismissible ) {
+		    ?>
                     <button type="button" class="notice-dismiss<?php echo $dismissible; ?>">
                         <span class="screen-reader-text">
                             <?php esc_html_e( 'Dismiss this notice', 'google-analytics-for-wordpress' ); ?>
                         </span>
                     </button>
                     <?php
-                }
-                ?>
+		}
+		?>
             </div>
         </div>
         <?php
-        return ob_get_clean();
+	return ob_get_clean();
     }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
+        if ( ! isset( $this->notices[$notice] ) ) {
             return false;
         }
         return true;
@@ -72,7 +72,7 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
+        $this->notices[$notice] = true;
         update_option( 'monsterinsights_notices', $this->notices );
 
     }
@@ -88,7 +88,7 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
+        unset( $this->notices[$notice] );
         update_option( 'monsterinsights_notices', $this->notices );
 
     }
@@ -133,7 +133,7 @@ 
             return '';
         }
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+        $dismissible = ( $is_dismissible ) ? ' is-dismissible' : '';
 
         // Display inline notice
         ob_start();
@@ -177,16 +177,16 @@ 
                     }
 
                     $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank' ) {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-primary';
                     if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
+                        $class = ' class="' . $args['primary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html( $text ); ?></a>
                     <?php
                 }
 
@@ -204,16 +204,16 @@ 
                     }           
 
                     $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank' ) {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-secondary';
                     if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
+                        $class = ' class="' . $args['secondary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html( $text ); ?></a>
                     <?php
                 }
 

includes/admin/licensing/skin.php

Indentation +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function __construct( $args = array() ) {
 
-        parent::__construct();
+	parent::__construct();
 
     }
 
@@ -38,9 +38,9 @@ 
      */
     public function set_upgrader( &$upgrader ) {
 
-        if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
-        }
+	if ( is_object( $upgrader ) ) {
+	    $this->upgrader =& $upgrader;
+	}
 
     }
 
@@ -53,7 +53,7 @@ 
      */
     public function set_result( $result ) {
 
-        $this->result = $result;
+	$this->result = $result;
 
     }
 
@@ -82,10 +82,10 @@ 
      */
     function error( $errors ) {
 
-        if ( ! empty( $errors ) ) {
-            echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
-            die;
-        }
+	if ( ! empty( $errors ) ) {
+	    echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
+	    die;
+	}
 
     }
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     public function set_upgrader( &$upgrader ) {
 
         if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
+            $this->upgrader = & $upgrader;
         }
 
     }

includes/admin/licensing/autoupdate.php

Indentation +15 added lines, -15 removed lines

@@ -13,20 +13,20 @@ 
 
     // If this is multisite and is not on the main site, return early.
     if ( is_multisite() && ! is_main_site() ) {
-        return $update;
+	return $update;
     }
     
     // If we don't have everything we need, return early.
     $item = (array) $item;
     if ( ! isset( $item['new_version'] ) || ! isset( $item['slug'] ) ) {
-        return $update;
+	return $update;
     }
 
     // If the plugin isn't ours, return early.
     $is_free = 'google-analytics-for-wordpress' === $item['slug'];
     $is_paid = isset( $item['monsterinsights_plugin'] ); // see updater class
     if ( ! $is_free && ! $is_paid ) {
-        return $update;
+	return $update;
     }
 
     $version           = $is_free ? MONSTERINSIGHTS_LITE_VERSION : $item['old_version'];
@@ -36,20 +36,20 @@ 
     
     // If the opt in update allows major updates but there is no major version update, return early.
     if ( $current_major < $new_major ) {
-        if ( $automatic_updates === 'all' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
     
     // If the opt in update allows minor updates but there is no minor version update, return early.
     if ( $current_major == $new_major ) {
-        if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
 
     // All our checks have passed - this plugin can be updated!
@@ -87,8 +87,8 @@ 
 function monsterinsights_get_major_version( $version ) {
     $exploded_version = explode( '.', $version );
     if ( isset( $exploded_version[2] ) ) {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
     } else {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
     }
 }
\ No newline at end of file

includes/admin/ajax.php

Braces +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
         } else {
             $deactivate = deactivate_plugins( $_POST['plugin'] );

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
         if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
+            $activate = activate_plugin( $_POST['plugin'], null, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );
         }

Indentation +71 added lines, -71 removed lines

@@ -51,60 +51,60 @@ 
     check_ajax_referer( 'monsterinsights-install', 'nonce' );
 
     if ( ! current_user_can( 'install_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Install the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        $download_url = $_POST['plugin'];
-        global $hook_suffix;
-
-        // Set the current screen to avoid undefined notices.
-        set_current_screen();
-
-        // Prepare variables.
-        $method = '';
-        $url    = add_query_arg(
-            array(
-                'page' => 'monsterinsights-settings'
-            ),
-            admin_url( 'admin.php' )
-        );
-        $url = esc_url( $url );
-
-        // Start output bufferring to catch the filesystem form if credentials are needed.
-        ob_start();
-        if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // If we are not authenticated, make it happen now.
-        if ( ! WP_Filesystem( $creds ) ) {
-            ob_start();
-            request_filesystem_credentials( $url, $method, true, false, null );
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // We do not need any extra credentials if we have gotten this far, so let's install the plugin.
-        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-        $base = MonsterInsights();
-        require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
+	$download_url = $_POST['plugin'];
+	global $hook_suffix;
+
+	// Set the current screen to avoid undefined notices.
+	set_current_screen();
+
+	// Prepare variables.
+	$method = '';
+	$url    = add_query_arg(
+	    array(
+		'page' => 'monsterinsights-settings'
+	    ),
+	    admin_url( 'admin.php' )
+	);
+	$url = esc_url( $url );
+
+	// Start output bufferring to catch the filesystem form if credentials are needed.
+	ob_start();
+	if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// If we are not authenticated, make it happen now.
+	if ( ! WP_Filesystem( $creds ) ) {
+	    ob_start();
+	    request_filesystem_credentials( $url, $method, true, false, null );
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// We do not need any extra credentials if we have gotten this far, so let's install the plugin.
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	$base = MonsterInsights();
+	require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
         
-        // Create the plugin upgrader with our custom skin.
-        $installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
-        $installer->install( $download_url );
-
-        // Flush the cache and return the newly installed plugin basename.
-        wp_cache_flush();
-        if ( $installer->plugin_info() ) {
-            $plugin_basename = $installer->plugin_info();
-            echo json_encode( array( 'plugin' => $plugin_basename ) );
-            wp_die();
-        }
+	// Create the plugin upgrader with our custom skin.
+	$installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
+	$installer->install( $download_url );
+
+	// Flush the cache and return the newly installed plugin basename.
+	wp_cache_flush();
+	if ( $installer->plugin_info() ) {
+	    $plugin_basename = $installer->plugin_info();
+	    echo json_encode( array( 'plugin' => $plugin_basename ) );
+	    wp_die();
+	}
     }
 
     // Send back a response.
@@ -126,21 +126,21 @@ 
     check_ajax_referer( 'monsterinsights-activate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
-        } else {
-            $activate = activate_plugin( $_POST['plugin'] );
-        }
-
-        if ( is_wp_error( $activate ) ) {
-            echo json_encode( array( 'error' => $activate->get_error_message() ) );
-            wp_die();
-        }
+	if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+	    $activate = activate_plugin( $_POST['plugin'], NULL, true );
+	} else {
+	    $activate = activate_plugin( $_POST['plugin'] );
+	}
+
+	if ( is_wp_error( $activate ) ) {
+	    echo json_encode( array( 'error' => $activate->get_error_message() ) );
+	    wp_die();
+	}
     }
 
     echo json_encode( true );
@@ -161,16 +161,16 @@ 
     check_ajax_referer( 'monsterinsights-deactivate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
-            $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
-        } else {
-            $deactivate = deactivate_plugins( $_POST['plugin'] );
-        }
+	if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+	    $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
+	} else {
+	    $deactivate = deactivate_plugins( $_POST['plugin'] );
+	}
     }
 
     echo json_encode( true );
@@ -193,12 +193,12 @@ 
 
     // Deactivate the notice
     if ( isset( $_POST['notice'] ) ) {
-        // Init the notice class and mark notice as deactivated
-        MonsterInsights()->notices->dismiss( $_POST['notice'] );
+	// Init the notice class and mark notice as deactivated
+	MonsterInsights()->notices->dismiss( $_POST['notice'] );
 
-        // Return true
-        echo json_encode( true );
-        wp_die();
+	// Return true
+	echo json_encode( true );
+	wp_die();
     }
 
     // If here, an error occurred

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $activate = activate_plugin( $_POST['plugin'], NULL, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );

includes/admin/pages/tools.php

Spacing +20 added lines, -20 removed lines

@@ -51,13 +51,13 @@ 
 	<?php
 }
 
-function monsterinsights_tools_url_builder_tab(){
+function monsterinsights_tools_url_builder_tab() {
 	do_action( 'monsterinsights_tools_url_builder_tab' );
 }
 
 function monsterinsights_tools_settings_tab() {
-	ob_start();?>
-	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' );?></h2>
+	ob_start(); ?>
+	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' ); ?></h2>
 	<p><?php echo esc_html__( 'You can use the below tools to import settings from other MonsterInsights websites or export settings to import into another MonsterInsights install.', 'google-analytics-for-wordpress' ); ?> </p>
 	<br />
 	<table class="form-table">
@@ -65,13 +65,13 @@ 
 			<tr>
 				<th scope="row">
 					<label for="monsterinsights-import-settings">
-						<?php echo esc_html__( 'Import Settings', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Import Settings', 'google-analytics-for-wordpress' ); ?>
 					</label>
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
-						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
+					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ) {
+						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!', 'google-analytics-for-wordpress' ), 'success', false, array() );
 					}
 					?>
 					<form method="post" enctype="multipart/form-data">
@@ -79,7 +79,7 @@ 
 							<input type="file" name="import_file"/>
 							<input type="hidden" name="monsterinsights_action" value="monsterinsights_import_settings" />
 						</p>
-						<p class="description"><?php echo esc_html__( 'Paste the import field content from another MonsterInsights site in above.', 'google-analytics-for-wordpress' );?></p>
+						<p class="description"><?php echo esc_html__( 'Paste the import field content from another MonsterInsights site in above.', 'google-analytics-for-wordpress' ); ?></p>
 						<p>
 							<?php wp_nonce_field( 'monsterinsights_import_settings', 'monsterinsights_import_settings' ); ?>
 						</p>
@@ -92,7 +92,7 @@ 
 			<tr>
 				<th scope="row">
 					<label for="monsterinsights-export-settings">
-						<?php echo esc_html__( 'Export Settings:', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Export Settings:', 'google-analytics-for-wordpress' ); ?>
 					</label>
 				</th>
 				<td>
@@ -125,7 +125,7 @@ 
  * @return void
  */
 function monsterinsights_process_export_settings() {
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+	if ( ! isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
 		return;
 	}
 
@@ -133,7 +133,7 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ) {
 		return;
 	}
 
@@ -156,7 +156,7 @@ 
 
 function monsterinsights_import_settings() {
 
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+	if ( ! isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
 		return;
 	}
 
@@ -164,11 +164,11 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ) {
 		return;
 	}
 
-	if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
+	if ( ! wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
 		return;
 	}
 
@@ -185,7 +185,7 @@ 
 		wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
 	}
 
-	$file     = file_get_contents( $import_file );
+	$file = file_get_contents( $import_file );
 	if ( empty( $file ) ) {
 		wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
 	}
@@ -203,20 +203,20 @@ 
 	);
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $new_settings[ $e ] ) ) {
-			unset( $new_settings[ $e ] );
+		if ( ! empty( $new_settings[$e] ) ) {
+			unset( $new_settings[$e] );
 		}
 	}
 
 	if ( ! is_super_admin() ) {
-		if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
-			unset( $new_settings[ 'custom_code' ] );
+		if ( ! empty( $new_settings['custom_code'] ) ) {
+			unset( $new_settings['custom_code'] );
 		}
 	}
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			$new_settings = $settings[ $e ];
+		if ( ! empty( $settings[$e] ) ) {
+			$new_settings = $settings[$e];
 		}
 	}
 

Braces +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 	<?php
 }
 
-function monsterinsights_tools_url_builder_tab(){
+function monsterinsights_tools_url_builder_tab() {
 	do_action( 'monsterinsights_tools_url_builder_tab' );
 }
 
@@ -70,7 +70,7 @@ 
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
+					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ) {
 						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
 					}
 					?>
@@ -133,7 +133,7 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ) {
 		return;
 	}
 
@@ -164,7 +164,7 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ) {
 		return;
 	}
 

includes/helpers.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -867,7 +867,7 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[ $tag ] ) ) return false;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -882,7 +882,7 @@ 
 			$callbacks = &$wp_filter[ $tag ];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return false;
 		// Loop through each filter for the specified priority, looking for our class & method
 		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
@@ -904,10 +904,10 @@ 
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
 					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
 				}
-				return TRUE;
+				return true;
 			}
 		}
-		return FALSE;
+		return false;
 	}
 } // End function exists
 

Spacing +29 added lines, -29 removed lines

@@ -32,7 +32,7 @@ 
 function monsterinsights_track_user() {
 	$user        = wp_get_current_user();
 	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
+	$roles = monsterinsights_get_option( 'ignore_users', array() );
 
 	if ( ! empty( $roles ) && is_array( $roles ) ) {
 		foreach ( $roles as $role ) {
@@ -98,7 +98,7 @@ 
 	 */
 
 	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
+	$cookie_parts = explode( '.', $ga_cookie );
 	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
 		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
 		if ( is_string( $uuid ) ) {
@@ -157,7 +157,7 @@ 
 	}
 	
 	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
+	$cookie_parts = explode( '.', $ga_cookie );
 	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
 		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
 		if ( is_string( $uuid ) ) {
@@ -172,7 +172,7 @@ 
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+	return rand( 100000000, 999999999 ) . '.' . time();
 }
  
 
@@ -192,7 +192,7 @@ 
 		$stop = time();
 	}
 
-	$diff = (int) abs( $stop -  $start );
+	$diff = (int) abs( $stop - $start );
 	$hours = round( $diff / HOUR_IN_SECONDS );
 	return $hours;
 }
@@ -250,7 +250,7 @@ 
 	$editable_roles = apply_filters( 'editable_roles', $all_roles );
 
 	foreach ( $editable_roles as $id => $name ) {
-		$roles[ $id ] = translate_user_role( $name['name'] );
+		$roles[$id] = translate_user_role( $name['name'] );
 	}
 
 	return $roles;
@@ -295,7 +295,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 );
@@ -311,16 +311,16 @@ 
 
 // Set cookie to expire in 2 years
 function monsterinsights_get_cookie_expiration_date( $time ) {
-	return date('D, j F Y H:i:s', time() + $time );
+	return date( 'D, j F Y H:i:s', time() + $time );
 }
 
 function monsterinsights_string_ends_with( $string, $ending ) {
-	$strlen = strlen($string);
-	$endinglen = strlen($ending);
+	$strlen = strlen( $string );
+	$endinglen = strlen( $ending );
 	if ( $endinglen > $strlen ) {
 		return false;
 	}
-	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
+	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen ) === 0;
 }
 
 function monsterinsights_string_starts_with( $string, $start ) {
@@ -844,11 +844,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'api.monsterinsights.com/v2/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -896,7 +896,7 @@ 
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists( 'remove_class_filter' ) ) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -917,7 +917,7 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[$tag] ) ) return FALSE;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -926,33 +926,33 @@ 
 		 *
 		 * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
 		 */
-		if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-			$callbacks = &$wp_filter[ $tag ]->callbacks;
+		if ( is_object( $wp_filter[$tag] ) && isset( $wp_filter[$tag]->callbacks ) ) {
+			$callbacks = &$wp_filter[$tag]->callbacks;
 		} else {
-			$callbacks = &$wp_filter[ $tag ];
+			$callbacks = &$wp_filter[$tag];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[$priority] ) || empty( $callbacks[$priority] ) ) return FALSE;
 		// Loop through each filter for the specified priority, looking for our class & method
-		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
+		foreach ( (array) $callbacks[$priority] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter['function'] ) || ! is_array( $filter['function'] ) ) continue;
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter['function'][0] ) ) continue;
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter['function'][1] !== $method_name ) continue;
 			// Method matched, now let's check the Class
-			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
+			if ( get_class( $filter['function'][0] ) === $class_name ) {
 				// Now let's remove it from the array
-				unset( $callbacks[ $priority ][ $filter_id ] );
+				unset( $callbacks[$priority][$filter_id] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[$priority] ) ) unset( $callbacks[$priority] );
 				// and if the only filter for that tag, set the tag to an empty array
 				if ( empty( $callbacks ) ) $callbacks = array();
 				// If using WordPress older than 4.7
-				if ( ! is_object( $wp_filter[ $tag ] ) ) {
+				if ( ! is_object( $wp_filter[$tag] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
-					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
+					unset( $GLOBALS['merged_filters'][$tag] );
 				}
 				return TRUE;
 			}
@@ -961,7 +961,7 @@ 
 	}
 } // End function exists
 
-if ( ! function_exists ( 'remove_class_action' ) ) {
+if ( ! function_exists( 'remove_class_action' ) ) {
 	/**
 	 * Remove Class Action Without Access to Class Object
 	 *

Braces +23 added lines, -9 removed lines

@@ -844,11 +844,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'api.monsterinsights.com/v2/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -917,7 +917,9 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[ $tag ] ) ) {
+			return FALSE;
+		}
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -932,23 +934,35 @@ 
 			$callbacks = &$wp_filter[ $tag ];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) {
+			return FALSE;
+		}
 		// Loop through each filter for the specified priority, looking for our class & method
 		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) {
+				continue;
+			}
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) {
+				continue;
+			}
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter[ 'function' ][ 1 ] !== $method_name ) {
+				continue;
+			}
 			// Method matched, now let's check the Class
 			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
 				// Now let's remove it from the array
 				unset( $callbacks[ $priority ][ $filter_id ] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[ $priority ] ) ) {
+					unset( $callbacks[ $priority ] );
+				}
 				// and if the only filter for that tag, set the tag to an empty array
-				if ( empty( $callbacks ) ) $callbacks = array();
+				if ( empty( $callbacks ) ) {
+					$callbacks = array();
+				}
 				// If using WordPress older than 4.7
 				if ( ! is_object( $wp_filter[ $tag ] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted