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 +54 added lines, -54 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,7 +902,7 @@ 
  * @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="https://www.monsterinsights.com/lite/" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
 			. '</div>';
@@ -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/updater.php

Spacing +11 added lines, -11 removed lines

@@ -253,18 +253,18 @@ 
 
         // Create a new stdClass object and populate it with our plugin information.
         $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
+        $api->name                  = isset( $this->info->name ) ? $this->info->name : '';
+        $api->slug                  = isset( $this->info->slug ) ? $this->info->slug : '';
+        $api->version               = isset( $this->info->version ) ? $this->info->version : '';
+        $api->author                = isset( $this->info->author ) ? $this->info->author : '';
         $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
+        $api->requires              = isset( $this->info->requires ) ? $this->info->requires : '';
+        $api->tested                = isset( $this->info->tested ) ? $this->info->tested : '';
+        $api->last_updated          = isset( $this->info->last_updated ) ? $this->info->last_updated : '';
+        $api->homepage              = isset( $this->info->homepage ) ? $this->info->homepage : '';
 
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
+        $changelog                  = isset( $this->info->changelog ) ? $this->info->changelog : '';
+        $description                = isset( $this->info->description ) ? $this->info->description : '';
 
         if ( ! empty( $changelog ) ) {
              if ( ! empty( $description ) ) {
@@ -279,7 +279,7 @@ 
             $api->sections = array();
         }     
 
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+        $api->download_link = isset( $this->info->download_link ) ? $this->info->download_link : '';
 
         // Return the new API object with our custom data.
         return $api;

Indentation +180 added lines, -180 removed lines

@@ -105,39 +105,39 @@ 
      * @param array $config Array of updater config args.
      */
     public function __construct( array $config ) {
-        // Set class properties.
-        $accepted_args = array(
-            'plugin_name',
-            'plugin_slug',
-            'plugin_path',
-            'plugin_url',
-            'remote_url',
-            'version',
-            'key'
-        );
-        foreach ( $accepted_args as $arg ) {
-            $this->$arg = $config[$arg];
-        }
-
-        // If the user cannot update plugins, stop processing here.
-        if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
-            return;
-        }
-
-        // If it's our site, then return so we don't redirect loop.
-        if ( strpos( site_url(), 'monsterinsights.com' ) !== false ) {
-            return;
-        }
-
-        // Load the updater hooks and filters.
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
-
-        add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
-        add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
-
-        // ManageWP premium update filters
-        //add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
-        //add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
+	// Set class properties.
+	$accepted_args = array(
+	    'plugin_name',
+	    'plugin_slug',
+	    'plugin_path',
+	    'plugin_url',
+	    'remote_url',
+	    'version',
+	    'key'
+	);
+	foreach ( $accepted_args as $arg ) {
+	    $this->$arg = $config[$arg];
+	}
+
+	// If the user cannot update plugins, stop processing here.
+	if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
+	    return;
+	}
+
+	// If it's our site, then return so we don't redirect loop.
+	if ( strpos( site_url(), 'monsterinsights.com' ) !== false ) {
+	    return;
+	}
+
+	// Load the updater hooks and filters.
+	add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
+
+	add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
+	add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
+
+	// ManageWP premium update filters
+	//add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
+	//add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
     }
 
     /**
@@ -150,33 +150,33 @@ 
      */
     public function update_plugins_filter( $value ) {
 
-        // If no update object exists, return early.
-        if ( empty( $value ) ) {
-            return $value;
-        }
-
-        // Run update check by pinging the external API. If it fails, return the default update object.
-        if ( ! $this->update ) {
-            $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->update || ! empty( $this->update->error ) ) {
-                $this->update = false;
-                return $value;
-            }
-        }
-
-        // Infuse the update object with our data if the version from the remote API is newer.
-        if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
-            // The $plugin_update object contains new_version, package, slug and last_update keys.
-            //$this->update->full_slug             = $this->plugin_slug;
-            //$this->update->name                  = $this->plugin_name;
-            $this->update->monsterinsights_plugin  = true;
-            $this->update->old_version             = $this->version;
-            $this->update->plugin                  = $this->plugin_path;
-            $value->response[$this->plugin_path]   = $this->update;
-        }
-
-        // Return the update object.
-        return $value;
+	// If no update object exists, return early.
+	if ( empty( $value ) ) {
+	    return $value;
+	}
+
+	// Run update check by pinging the external API. If it fails, return the default update object.
+	if ( ! $this->update ) {
+	    $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
+	    if ( ! $this->update || ! empty( $this->update->error ) ) {
+		$this->update = false;
+		return $value;
+	    }
+	}
+
+	// Infuse the update object with our data if the version from the remote API is newer.
+	if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
+	    // The $plugin_update object contains new_version, package, slug and last_update keys.
+	    //$this->update->full_slug             = $this->plugin_slug;
+	    //$this->update->name                  = $this->plugin_name;
+	    $this->update->monsterinsights_plugin  = true;
+	    $this->update->old_version             = $this->version;
+	    $this->update->plugin                  = $this->plugin_path;
+	    $value->response[$this->plugin_path]   = $this->update;
+	}
+
+	// Return the update object.
+	return $value;
 
     }
 
@@ -191,12 +191,12 @@ 
      */
     public function http_request_args( $args, $url ) {
 
-        // If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
-            $args['sslverify'] = false;
-        }
+	// If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
+	if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
+	    $args['sslverify'] = false;
+	}
 
-        return $args;
+	return $args;
 
     }
 
@@ -213,14 +213,14 @@ 
      */
     public function plugins_api( $api, $action = '', $args = null ) {
 
-        $plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
+	$plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
 
-        // If our plugin matches the request, set our own plugin data, else return the default response.
-        if ( $plugin ) {
-            return $this->set_plugins_api( $api );
-        } else {
-            return $api;
-        }
+	// If our plugin matches the request, set our own plugin data, else return the default response.
+	if ( $plugin ) {
+	    return $this->set_plugins_api( $api );
+	} else {
+	    return $api;
+	}
 
     }
 
@@ -234,82 +234,82 @@ 
      */
     public function set_plugins_api( $default_api ) {
 
-        // Perform the remote request to retrieve our plugin information. If it fails, return the default object.
-        if ( ! $this->info ) {
-            $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->info || ! empty( $this->info->error ) ) {
-                $this->info = false;
-                return $default_api;
-            }
-        }
-
-        // Create a new stdClass object and populate it with our plugin information.
-        $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
-        $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
-
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
-
-        if ( ! empty( $changelog ) ) {
-             if ( ! empty( $description ) ) {
-                $api->sections['description'] = $description;
-                $api->sections['changelog']   = $changelog;
-             } else {
-                $api->sections['changelog']   = $changelog;
-             }
-        } else if ( ! empty( $description ) ) {
-            $api->sections['description'] = $description;
-        } else {
-            $api->sections = array();
-        }     
-
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
-
-        // Return the new API object with our custom data.
-        return $api;
+	// Perform the remote request to retrieve our plugin information. If it fails, return the default object.
+	if ( ! $this->info ) {
+	    $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
+	    if ( ! $this->info || ! empty( $this->info->error ) ) {
+		$this->info = false;
+		return $default_api;
+	    }
+	}
+
+	// Create a new stdClass object and populate it with our plugin information.
+	$api                        = new stdClass;
+	$api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
+	$api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
+	$api->version               = isset( $this->info->version )        ? $this->info->version        : '';
+	$api->author                = isset( $this->info->author )         ? $this->info->author         : '';
+	$api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
+	$api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
+	$api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
+	$api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
+	$api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
+
+	$changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
+	$description                = isset( $this->info->description )    ? $this->info->description     : '';
+
+	if ( ! empty( $changelog ) ) {
+	     if ( ! empty( $description ) ) {
+		$api->sections['description'] = $description;
+		$api->sections['changelog']   = $changelog;
+	     } else {
+		$api->sections['changelog']   = $changelog;
+	     }
+	} else if ( ! empty( $description ) ) {
+	    $api->sections['description'] = $description;
+	} else {
+	    $api->sections = array();
+	}     
+
+	$api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+
+	// Return the new API object with our custom data.
+	return $api;
 
     }
 
     // Integration with ManageWP
     public function premium_update_push( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
-
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
-            $plugin_data['type']        = 'plugin';
-            $plugin_data['slug']        = $update->slug;
-            $plugin_data['new_version'] = $update->version;
-            $premium_update[]           = $plugin_data;
-        }
-        return $premium_update;
+	if ( ! function_exists( 'get_plugin_data' ) ) {
+	    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
+
+	$update = $this->set_plugins_api( array() );
+	if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
+	    $plugin_data                = get_plugin_data( $update->slug );
+	    $plugin_data['type']        = 'plugin';
+	    $plugin_data['slug']        = $update->slug;
+	    $plugin_data['new_version'] = $update->version;
+	    $premium_update[]           = $plugin_data;
+	}
+	return $premium_update;
     }
 
     // Integration with ManageWP
     public function premium_update( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        }
-
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
-            $plugin_data['type']        = 'plugin';
-            $plugin_data['slug']        = $update->slug;
-            $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
-            array_push( $premium_update, $plugin_data );
-        }
-        return $premium_update;
+	if ( ! function_exists( 'get_plugin_data' ) ) {
+	    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
+
+	$update = $this->set_plugins_api( array() );
+	if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
+	    $plugin_data                = get_plugin_data( $update->slug );
+	    $plugin_data['type']        = 'plugin';
+	    $plugin_data['slug']        = $update->slug;
+	    $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
+	    array_push( $premium_update, $plugin_data );
+	}
+	return $premium_update;
     }
 
     /**
@@ -325,47 +325,47 @@ 
      */
     public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
 
-        // Build the body of the request.
-        $body = wp_parse_args(
-            $body,
-            array(
-                'tgm-updater-action'     => $action,
-                'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
-                'tgm-updater-referer'    => site_url(),
-                'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
-                'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
-            )
-        );
-        $body = http_build_query( $body, '', '&' );
-
-        // Build the headers of the request.
-        $headers = wp_parse_args(
-            $headers,
-            array(
-                'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
-            )
-        );
-
-        // Setup variable for wp_remote_post.
-        $post = array(
-            'headers' => $headers,
-            'body'    => $body
-        );
-
-        // Perform the query and retrieve the response.
-        $response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
-
-        // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
-            return false;
-        }
-
-        // Return the json decoded content.
-        return json_decode( $response_body );
+	// Build the body of the request.
+	$body = wp_parse_args(
+	    $body,
+	    array(
+		'tgm-updater-action'     => $action,
+		'tgm-updater-key'        => $this->key,
+		'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+		'tgm-updater-referer'    => site_url(),
+		'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
+		'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
+	    )
+	);
+	$body = http_build_query( $body, '', '&' );
+
+	// Build the headers of the request.
+	$headers = wp_parse_args(
+	    $headers,
+	    array(
+		'Content-Type'   => 'application/x-www-form-urlencoded',
+		'Content-Length' => strlen( $body )
+	    )
+	);
+
+	// Setup variable for wp_remote_post.
+	$post = array(
+	    'headers' => $headers,
+	    'body'    => $body
+	);
+
+	// Perform the query and retrieve the response.
+	$response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
+	$response_code = wp_remote_retrieve_response_code( $response );
+	$response_body = wp_remote_retrieve_body( $response );
+
+	// Bail out early if there are any errors.
+	if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+	    return false;
+	}
+
+	// Return the json decoded content.
+	return json_decode( $response_body );
 
     }
 }
\ No newline at end of file

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/common.php

Braces +1 added lines, -1 removed lines

@@ -390,7 +390,7 @@
 	return $shareasale_id;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){

Spacing +56 added lines, -56 removed lines

@@ -150,32 +150,32 @@ 
 				'copytoclip'       				=> esc_html__( 'Copy to Clipboard', 'google-analytics-for-wordpress' ),
 				'failed'           				=> esc_html__( 'Failed!', 'google-analytics-for-wordpress' ),
 				'admin_nonce'      				=> wp_create_nonce( 'mi-admin-nonce' ),
-				'shorten'         				=> esc_html__( 'Shorten URL' ,'google-analytics-for-wordpress'),
-				'shortened'        				=> esc_html__( 'Shortened!' ,'google-analytics-for-wordpress'),
-				'working'          				=> esc_html__( 'Working...' ,'google-analytics-for-wordpress'),
-				'importtext'       				=> esc_html__( 'Import' ,'google-analytics-for-wordpress'),
-				'imported'         				=> esc_html__( 'Imported!' ,'google-analytics-for-wordpress'),
-				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:' ,'google-analytics-for-wordpress'),
-				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'redirect_loading_error_title'  => esc_html__( "Authentication Error:" ,'google-analytics-for-wordpress'),
-				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....' ,'google-analytics-for-wordpress'),
-				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:" ,'google-analytics-for-wordpress'),
-				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!' ,'google-analytics-for-wordpress'),
-				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore." ,'google-analytics-for-wordpress'),
-				'verify_loading_title_text'  	=> esc_html__( 'Verifying....' ,'google-analytics-for-wordpress'),
-				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'verify_loading_error_title' 	=> esc_html__( "Verification Error:" ,'google-analytics-for-wordpress'),
-				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!' ,'google-analytics-for-wordpress'),
-				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!" ,'google-analytics-for-wordpress'),
-				'ok_text' 						=> esc_html__( "OK" ,'google-analytics-for-wordpress'),
-				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate" ,'google-analytics-for-wordpress'),
+				'shorten'         				=> esc_html__( 'Shorten URL', 'google-analytics-for-wordpress' ),
+				'shortened'        				=> esc_html__( 'Shortened!', 'google-analytics-for-wordpress' ),
+				'working'          				=> esc_html__( 'Working...', 'google-analytics-for-wordpress' ),
+				'importtext'       				=> esc_html__( 'Import', 'google-analytics-for-wordpress' ),
+				'imported'         				=> esc_html__( 'Imported!', 'google-analytics-for-wordpress' ),
+				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:', 'google-analytics-for-wordpress' ),
+				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'redirect_loading_error_title'  => esc_html__( "Authentication Error:", 'google-analytics-for-wordpress' ),
+				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....', 'google-analytics-for-wordpress' ),
+				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:", 'google-analytics-for-wordpress' ),
+				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!', 'google-analytics-for-wordpress' ),
+				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore.", 'google-analytics-for-wordpress' ),
+				'verify_loading_title_text'  	=> esc_html__( 'Verifying....', 'google-analytics-for-wordpress' ),
+				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'verify_loading_error_title' 	=> esc_html__( "Verification Error:", 'google-analytics-for-wordpress' ),
+				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!', 'google-analytics-for-wordpress' ),
+				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!", 'google-analytics-for-wordpress' ),
+				'ok_text' 						=> esc_html__( "OK", 'google-analytics-for-wordpress' ),
+				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate", 'google-analytics-for-wordpress' ),
 				'refresh_report_title'          => esc_html__( 'Refreshing Report', 'google-analytics-for-wordpress' ),
 				'refresh_report_text'           => esc_html__( 'Loading new report data...', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Success', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Retrieved the new report data successfully', 'google-analytics-for-wordpress' ),
 				'refresh_report_failure_title'  => esc_html__( 'Error', 'google-analytics-for-wordpress' ),
-				'timezone'						=> date('e'),
+				'timezone'						=> date( 'e' ),
 			)
 		);
 
@@ -230,7 +230,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 
@@ -249,16 +249,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
@@ -306,15 +306,15 @@ 
 
 	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 ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
@@ -329,15 +329,15 @@ 
 
 	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 ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
@@ -352,13 +352,13 @@ 
 
 	// Remove actions from themes that are not following best practices and break the admin doing so
 		// Theme: Newspaper by tagDiv
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_js');
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_css');
-			remove_action('admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic');
-			remove_action('admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic');
-			remove_action('admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999);
-			remove_action('print_media_templates', 'td_custom_gallery_settings_hook');
-			remove_action('print_media_templates', 'td_change_backbone_js_hook');
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_js' );
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_css' );
+			remove_action( 'admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic' );
+			remove_action( 'admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic' );
+			remove_action( 'admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999 );
+			remove_action( 'print_media_templates', 'td_custom_gallery_settings_hook' );
+			remove_action( 'print_media_templates', 'td_change_backbone_js_hook' );
 }
 add_action( 'admin_enqueue_scripts', 'monsterinsights_remove_conflicting_asset_files', 9999 );
 
@@ -370,65 +370,65 @@ 
  *
  * @return null Return early if not on the proper screen.
  */
-function hide_non_monsterinsights_warnings () {
+function hide_non_monsterinsights_warnings() {
 	// Bail if we're not on a MonsterInsights screen.
 	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'monsterinsights' ) === false ) {
 		return;
 	}
 
 	global $wp_filter;
-	if ( !empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
+		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 ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
+		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 ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
+		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 ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 }
-add_action('admin_print_scripts', 'hide_non_monsterinsights_warnings');  
+add_action( 'admin_print_scripts', 'hide_non_monsterinsights_warnings' );  
 
 /**
  * Called whenever an upgrade button / link is displayed in Lite, this function will
@@ -489,7 +489,7 @@ 
 	return $shareasale_id;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){
@@ -505,9 +505,9 @@ 
 }
 
 function monsterinsights_ublock_notice() {
-	ob_start();?>
+	ob_start(); ?>
 	<div id="monsterinsights-ublock-origin-error" class="error inline" style="display:none;">
-		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">');
+		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' );
 		?>
 	</div>
 	<?php