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

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>';
 		}
 		$output .= '<td>';
@@ -1024,9 +1024,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 );
 }
@@ -1038,8 +1038,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 {
@@ -1052,6 +1052,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/register-settings.php

Spacing +25 added lines, -25 removed lines

@@ -173,13 +173,13 @@ 
 			)
 		),
 		/** Demographics Settings */
-		'demographics' => apply_filters('monsterinsights_settings_demographics',
+		'demographics' => apply_filters( 'monsterinsights_settings_demographics',
 			array(
 				'demographics' => array(
 					'id'          => 'demographics',
 					'name'        => __( 'Enable Demographics and Interests Reports for Remarketing and Advertising', 'google-analytics-for-wordpress' ),
 					'desc'        => sprintf( esc_html__( 'Check this setting to add the Demographics and Remarketing features to your Google Analytics tracking code. Make sure to enable Demographics and Remarketing in your Google Analaytics account. We have a guide for how to do that in our %1$sknowledge base%2$s. For more information about Remarketing, we refer you to %3$sGoogle\'s documentation%2$s.', 'google-analytics-for-wordpress. Note that usage of this function is affected by privacy and cookie laws around the world. Be sure to follow the laws that affect your target audience.' ), '<a href="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
-									'</a>','<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
+									'</a>', '<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
 					),
 					'type' 		  => 'checkbox',
 				),
@@ -192,7 +192,7 @@ 
 			)
 		),
 		/** Enhanced Link Attribution Settings */
-		'links' => apply_filters('monsterinsights_settings_links',
+		'links' => apply_filters( 'monsterinsights_settings_links',
 			array(
 				'enhanced_link_attribution' => array(
 					'id'          => 'enhanced_link_attribution',
@@ -227,7 +227,7 @@ 
 			)
 		),
 		/** File Download Settings */
-		'files' => apply_filters('monsterinsights_settings_files',
+		'files' => apply_filters( 'monsterinsights_settings_files',
 			array(
 				'track_download_as' => array(
 					'id'          => 'track_download_as',
@@ -249,7 +249,7 @@ 
 			)
 		),
 		/** Affiliate Tracking Settings */
-		'affiliates' => apply_filters('monsterinsights_settings_affiliates',
+		'affiliates' => apply_filters( 'monsterinsights_settings_affiliates',
 			array(
 				'track_internal_as_outbound' => array(
 					'id'          => 'track_internal_as_outbound',
@@ -266,68 +266,68 @@ 
 			)
 		),
 		/** Social Tracking Settings */
-		'social' => apply_filters('monsterinsights_settings_social',
+		'social' => apply_filters( 'monsterinsights_settings_social',
 			array()
 		),
 		/** Ad Tracking Settings */
-		'ads' => apply_filters('monsterinsights_settings_ads',
+		'ads' => apply_filters( 'monsterinsights_settings_ads',
 			array()
 		),
 		/** Forms Tracking Settings */
-		'forms' => apply_filters('monsterinsights_settings_forms',
+		'forms' => apply_filters( 'monsterinsights_settings_forms',
 			array()
 		),
 		/** eCommerce Tracking Settings */
-		'ecommerce' => apply_filters('monsterinsights_settings_ecommerce',
+		'ecommerce' => apply_filters( 'monsterinsights_settings_ecommerce',
 			array()
 		),
 		/** Media Tracking Settings */
-		'media' => apply_filters('monsterinsights_settings_media',
+		'media' => apply_filters( 'monsterinsights_settings_media',
 			array()
 		),
 		/** Members Tracking Settings */
-		'memberships' => apply_filters('monsterinsights_settings_memberships',
+		'memberships' => apply_filters( 'monsterinsights_settings_memberships',
 			array()
 		),
 		/** Dimensions Tracking Settings */
-		'dimensions' => apply_filters('monsterinsights_settings_dimensions',
+		'dimensions' => apply_filters( 'monsterinsights_settings_dimensions',
 			array()
 		),
 		/** Performance Tracking Settings */
-		'performance' => apply_filters('monsterinsights_settings_performance',
+		'performance' => apply_filters( 'monsterinsights_settings_performance',
 			array()
 		),
 		/** AMP Tracking Settings */
-		'amp' => apply_filters('monsterinsights_settings_amp',
+		'amp' => apply_filters( 'monsterinsights_settings_amp',
 			array()
 		),
 		/** Google Optimize Tracking Settings */
-		'goptimize' => apply_filters('monsterinsights_settings_goptimize',
+		'goptimize' => apply_filters( 'monsterinsights_settings_goptimize',
 			array()
 		),
 		/** Facebook Instant Articles Tracking Settings */
-		'fbia' => apply_filters('monsterinsights_settings_fbia',
+		'fbia' => apply_filters( 'monsterinsights_settings_fbia',
 			array()
 		),
 		/** Bounce Reduction Settings */
-		'bounce' => apply_filters('monsterinsights_settings_bounce',
+		'bounce' => apply_filters( 'monsterinsights_settings_bounce',
 			array()
 		),
 		/** Reporting Tracking Settings */
-		'reporting' => apply_filters('monsterinsights_settings_reporting',
+		'reporting' => apply_filters( 'monsterinsights_settings_reporting',
 			array()
 		),
 		/** Notifications Tracking Settings */
-		'notifications' => apply_filters('monsterinsights_settings_notifications',
+		'notifications' => apply_filters( 'monsterinsights_settings_notifications',
 			array()
 		),
 		/** Compatibility Tracking Settings */
-		'compatibility' => apply_filters('monsterinsights_settings_compatibility',
+		'compatibility' => apply_filters( 'monsterinsights_settings_compatibility',
 			array(
 				'subdomain_tracking' => array(
 					'id'          => 'subdomain_tracking',
 					'name'        => __( 'Domain to track as:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' ,'</a>' ),
+					'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ),
 					'type' 		  => 'text',
 				),
 				'custom_code' => array(
@@ -339,18 +339,18 @@ 
 				'debug_mode' => array(
 					'id'          => 'debug_mode',
 					'name'        => __( 'Enable Debug Mode', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress'),
+					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress' ),
 					'type' 		  => 'checkbox',
 				),
 			)
 		),
 		/** Permissions Tracking Settings */
-		'permissions' => apply_filters('monsterinsights_settings_permissions',
+		'permissions' => apply_filters( 'monsterinsights_settings_permissions',
 			array(
 				'view_reports' => array(
 					'id'          => 'view_reports',
 					'name'        => __( 'Let these user roles see reports (and the dashboard):', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports and dashboard, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>'),
+					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports and dashboard, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>' ),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,
@@ -360,7 +360,7 @@ 
 				'save_settings' => array(
 					'id'          => 'save_settings',
 					'name'        => __( 'Let these user roles save settings:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>' ),
+					'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>' ),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,

includes/admin/settings/tab-tracking.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
                 $class = ( 0 === $i ? ' monsterinsights-active' : '' ); 
                 ?>
                  <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
-                    <?php if ( $item['level'] === 'lite' ||  $is_pro ) { ?>
+                    <?php if ( $item['level'] === 'lite' || $is_pro ) { ?>
                     <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
                     <?php } ?>
                      <div class="monsterinsights-subtab-settings-notices">
@@ -90,7 +90,7 @@ 
                     </div>
                     <!-- Settings Form -->
                     <?php $class = ( $item['level'] !== 'lite' && ! $is_pro ) ? 'monsterinsights-no-settings-shown' : ''; ?>
-                    <form id="monsterinsights-tracking-<?php echo esc_attr( $id );?>-tab" class="<?php echo $class; ?>" method="post">
+                    <form id="monsterinsights-tracking-<?php echo esc_attr( $id ); ?>-tab" class="<?php echo $class; ?>" method="post">
                         <table class="form-table">
                             <tbody>
                                 <?php
@@ -101,7 +101,7 @@ 
                             </tbody>
                         </table>
                         <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
-                        <?php if ( $item['level'] === 'lite' && !$is_pro ) { ?>
+                        <?php if ( $item['level'] === 'lite' && ! $is_pro ) { ?>
                             <div class="monsterinsights-upsell-under-box">
                                 <h2><?php esc_html_e( "Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress' ); ?></h2>
                                 <p class="monsterinsights-upsell-lite-text"><?php esc_html_e( "By upgrading to MonsterInsights Pro, you get access to numerous addons and tools that help you better understand what people are doing on your website, so you can keep doing more of what's working. Some of the features include: Ecommerce tracking, Author tracking, Post Type tracking, Ads tracking, Google AMP tracking, Performance optimization, and so much more!", 'google-analytics-for-wordpress' ); ?></p>

includes/admin/settings/tab-general.php

Spacing +14 added lines, -14 removed lines

@@ -127,7 +127,7 @@ 
                 <tbody>
                     <?php if ( ! $profile_name ) { ?>
                     <!-- Manual UA -->
-                    <tr id="monsterinsights-google-ua-box" <?php echo ( ! $ua_code ? 'class="monsterinsights-hideme"' : ''); ?> >
+                    <tr id="monsterinsights-google-ua-box" <?php echo ( ! $ua_code ? 'class="monsterinsights-hideme"' : '' ); ?> >
                         <th scope="row">
                             <label for="monsterinsights-google-ua"><?php esc_html_e( 'Manually enter your UA code', 'google-analytics-for-wordpress' ); ?></label>
                         </th>
@@ -145,7 +145,7 @@ 
                     echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
                     ?>
 
-                    <?php if ( $tracking_mode === 'ga' || monsterinsights_is_debug_mode() ){  ?>
+                    <?php if ( $tracking_mode === 'ga' || monsterinsights_is_debug_mode() ) {  ?>
                     <tr id="monsterinsights-tracking-mode">
                         <th scope="row">
                             <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Pick Tracking Mode', 'google-analytics-for-wordpress' ); ?></label>
@@ -154,17 +154,17 @@ 
                             <?php
                             $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'general' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
                             ?>
-                            <label><input type="radio" name="tracking_mode" value="ga" <?php checked( $tracking_mode, 'ga' ); ?> ><?php esc_html_e('GA.js (Deprecated)', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="tracking_mode" value="analytics" <?php checked( $tracking_mode, 'analytics' ); ?> ><?php esc_html_e( 'Analytics.js (Universal Analytics)', 'google-analytics-for-wordpress'); ?> </label>
-                            <?php if ($tracking_mode === 'ga' ) { ?>
-                            <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
+                            <label><input type="radio" name="tracking_mode" value="ga" <?php checked( $tracking_mode, 'ga' ); ?> ><?php esc_html_e( 'GA.js (Deprecated)', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="tracking_mode" value="analytics" <?php checked( $tracking_mode, 'analytics' ); ?> ><?php esc_html_e( 'Analytics.js (Universal Analytics)', 'google-analytics-for-wordpress' ); ?> </label>
+                            <?php if ( $tracking_mode === 'ga' ) { ?>
+                            <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ) );
                             ?>
                             <?php } ?>
                         </td>
                     </tr>
                     <?php } ?>
 
-                    <?php if ( $tracking_mode !== 'ga' && $events_mode === 'php' ){  ?>
+                    <?php if ( $tracking_mode !== 'ga' && $events_mode === 'php' ) {  ?>
                     <tr id="monsterinsights-tracking-mode">
                         <th scope="row">
                             <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Switch to JS events tracking', 'google-analytics-for-wordpress' ); ?></label>
@@ -173,22 +173,22 @@ 
                             <?php
                             $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_jsevents', 'return' => 'general' ) ), 'monsterinsights-switch-to-jsevents-nonce' ) );
                             ?>
-                            <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking and we will eventually discontinue PHP based events tracking. To switch %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
+                            <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking and we will eventually discontinue PHP based events tracking. To switch %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ) );
                          ?>
                         </td>
                     </tr>
                     <?php } ?>
 
-                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ){  ?>
+                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ) {  ?>
                     <?php $automatic_updates = $automatic_updates ? $automatic_updates : 'none'; ?>
                     <tr id="monsterinsights-automatic-updates-mode">
                         <th scope="row">
                             <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Automatic Updates', 'google-analytics-for-wordpress' ); ?></label>
                         </th>
                         <td>
-                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e('Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e( 'Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress' ); ?> </label>
                         </td>
                     </tr>
                     <?php } ?>
@@ -197,7 +197,7 @@ 
                     <?php
                     $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
                     $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ! $anon_tracking || monsterinsights_is_debug_mode() ){
+                    if ( ! $anon_tracking || monsterinsights_is_debug_mode() ) {
                         echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
                     }
                     ?>
@@ -232,7 +232,7 @@ 
  * @return void
  */
 function monsterinsights_settings_save_general() {
-    $throw_notice    = false;
+    $throw_notice = false;
     $manual_ua_code = isset( $_POST['manual_ua_code'] ) ? $_POST['manual_ua_code'] : '';
     $manual_ua_code = monsterinsights_is_valid_ua( $manual_ua_code ); // also sanitizes the string
     

includes/admin/capabilities.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
  * @return array Array of caps needed to have this meta cap. If returned array is empty, user has the capability.
  */
 function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
-    switch( $cap ) {
+    switch ( $cap ) {
         case 'monsterinsights_view_dashboard' :
             $roles = monsterinsights_get_option( 'view_reports', array() );
 
@@ -85,4 +85,4 @@ 
     }
     return $caps;
 }
-add_filter( 'map_meta_cap','monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file
+add_filter( 'map_meta_cap', 'monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file

includes/admin/reports/overview.php

Spacing +21 added lines, -21 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Adds/Refreshes the data
-	public function add_report_data( $client, $id ){
+	public function add_report_data( $client, $id ) {
 		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
 			return false;
 		}
@@ -44,22 +44,22 @@ 
 		$dates = $this->get_date_range();
 
 		// Pageviews
-		$pageviews = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start']  . '&end-date=' . $dates['end']  . '&metrics=ga%3Apageviews&dimensions=ga%3Adate&max-results=' . $this->get_api_max_limit() );
+		$pageviews = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start'] . '&end-date=' . $dates['end'] . '&metrics=ga%3Apageviews&dimensions=ga%3Adate&max-results=' . $this->get_api_max_limit() );
 		$pageviews = $this->parse_request( $pageviews );
 		update_option( 'monsterinsights_report_overview_pageviews', $pageviews );
 		
 		// Top posts and pages
-		$top_content = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start']  . '&end-date=' . $dates['end']  . '&metrics=ga%3Apageviews&dimensions=ga%3ApagePath&sort=-ga%3Apageviews&max-results=' . $this->get_api_max_limit() );
+		$top_content = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start'] . '&end-date=' . $dates['end'] . '&metrics=ga%3Apageviews&dimensions=ga%3ApagePath&sort=-ga%3Apageviews&max-results=' . $this->get_api_max_limit() );
 		$top_content = $this->parse_request( $top_content );
 		update_option( 'monsterinsights_report_overview_top_content', $top_content );
 
 		// Top sources
-		$top_sources = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start']  . '&end-date=' . $dates['end']  . '&metrics=ga%3Apageviews&dimensions=ga%3Asource&sort=-ga%3Apageviews&max-results=' . $this->get_api_max_limit() );
+		$top_sources = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start'] . '&end-date=' . $dates['end'] . '&metrics=ga%3Apageviews&dimensions=ga%3Asource&sort=-ga%3Apageviews&max-results=' . $this->get_api_max_limit() );
 		$top_sources = $this->parse_request( $top_sources );
 		update_option( 'monsterinsights_report_overview_top_sources', $top_sources );
 
 		// Top countries
-		$countries = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start']  . '&end-date=' . $dates['end']  . '&metrics=ga%3Apageviews&dimensions=ga%3AcountryIsoCode&sort=-ga%3Apageviews&max-results=' . $this->get_api_max_limit() );
+		$countries = $client->do_request( 'https://www.googleapis.com/analytics/v3/data/ga?ids=ga%3A' . $id . '&start-date=' . $dates['start'] . '&end-date=' . $dates['end'] . '&metrics=ga%3Apageviews&dimensions=ga%3AcountryIsoCode&sort=-ga%3Apageviews&max-results=' . $this->get_api_max_limit() );
 		$countries = $this->parse_request( $countries );
 		update_option( 'monsterinsights_report_overview_countries', $countries );
 
@@ -67,7 +67,7 @@ 
 	}
 
 	// Gets the data
-	public function get_report_data( ){
+	public function get_report_data( ) {
 		$data = array();
 		$data['pageviews'] = get_option( 'monsterinsights_report_overview_pageviews', array() );
 		$data['top-content'] = get_option( 'monsterinsights_report_overview_top_content', array() );
@@ -77,7 +77,7 @@ 
 	}
 
 	// Removes report data
-	public function delete_report_data(){
+	public function delete_report_data() {
 		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
 			return false;
 		}
@@ -90,20 +90,20 @@ 
 	}
 
 	// Outputs the report.
-	public function show_report( ){
+	public function show_report( ) {
 		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
 			return false;
 		}
 		$data = $this->get_report_data();
 
 		$pageviews = ! empty( $data['pageviews'] ) ? $data['pageviews'] : false;
-		$top 	   = ! empty( $data['top-content'] ) ? $data['top-content'] : false;
+		$top = ! empty( $data['top-content'] ) ? $data['top-content'] : false;
 		$sources   = ! empty( $data['top-sources'] ) ? $data['top-sources'] : false;
 		$countries = ! empty( $data['countries'] ) ? $data['countries'] : false;
 		?>
 		<?php
 		if ( ( empty( $pageviews ) && empty( $top ) && empty( $sources ) && empty( $countries ) ) || ( empty( $top['total']['ga:pageviews'] ) ) || ( empty( $top['data'] ) ) ) {
-			echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'If you\'ve just installed MonsterInsights, data may take up to 24 hours to populate here. Check back soon!','google-analytics-for-wordpress'), 'info', false, array() );
+			echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'If you\'ve just installed MonsterInsights, data may take up to 24 hours to populate here. Check back soon!', 'google-analytics-for-wordpress' ), 'info', false, array() );
 			return;
 		}
 
@@ -456,9 +456,9 @@ 
 									$i++;
 								}
 								$title   = isset( $countries_values[0] ) ? esc_html( $countries_values[0] ) : __( 'Country not set', 'google-analytics-for-wordpress' );
-								$title   = isset( $list_of_countries[ $title ] ) ? esc_html( $list_of_countries[ $title ] )  : $title;
+								$title   = isset( $list_of_countries[$title] ) ? esc_html( $list_of_countries[$title] ) : $title;
 								$views   = isset( $countries_values[1] ) ? absint( $countries_values[1] ) : 0;
-								$percent = ! empty( $countries['total']['ga:pageviews'] ) &&  absint( $countries['total']['ga:pageviews'] ) > 0 ? $views / absint( $countries['total']['ga:pageviews'] ) : 0;
+								$percent = ! empty( $countries['total']['ga:pageviews'] ) && absint( $countries['total']['ga:pageviews'] ) > 0 ? $views / absint( $countries['total']['ga:pageviews'] ) : 0;
 								$percent = number_format( $percent * 100, 2 ) . '%';
 							?>
 							<div class="monsterinsights-data-row">
@@ -477,12 +477,12 @@ 
 
 	public function parse_request( $request ) {
 		$to_save = array();
-		if ( ! empty( $request['response'] ) && ! empty( $request['response']['code'] ) && 200 == $request['response']['code'] ){
+		if ( ! empty( $request['response'] ) && ! empty( $request['response']['code'] ) && 200 == $request['response']['code'] ) {
 			$dates = $this->get_date_range();
 			$to_save['start-date'] = $dates['start'];
 			$to_save['end-date']   = $dates['end'];
-			$to_save['total'] 	   = isset( $request['body']['totalsForAllResults'] ) ? $request['body']['totalsForAllResults'] : 0 ;
-			$to_save['data'] 	   = isset( $request['body']['rows'] ) ? $request['body']['rows'] : array();
+			$to_save['total'] = isset( $request['body']['totalsForAllResults'] ) ? $request['body']['totalsForAllResults'] : 0;
+			$to_save['data'] = isset( $request['body']['rows'] ) ? $request['body']['rows'] : array();
 		} else {
 			monsterinsights_update_option( 'cron_failed', true );
 		}
@@ -692,17 +692,17 @@ 
 		} else {
 			$list_of_countries = array_flip( monsterinsights_get_country_list() );
 			foreach ( $countries['data'] as $countries_index => $countries_values ) {
-				$title   = isset( $countries_values[0] ) ? esc_html( $countries_values[0] ) : false;
+				$title = isset( $countries_values[0] ) ? esc_html( $countries_values[0] ) : false;
 				if ( ! $title ) {
 					continue;
 				}
 
-				if ( isset( $js_countries[ $title ] ) ) {
+				if ( isset( $js_countries[$title] ) ) {
 					$views   = isset( $countries_values[1] ) ? absint( $countries_values[1] ) : 0;
-					$js_countries[ $title ] = $views;
-				} else if ( isset( $list_of_countries[ $title ] ) ) {
+					$js_countries[$title] = $views;
+				} else if ( isset( $list_of_countries[$title] ) ) {
 					$views   = isset( $countries_values[1] ) ? absint( $countries_values[1] ) : 0;
-					$js_countries[ $list_of_countries[ $title ] ] = $views;				
+					$js_countries[$list_of_countries[$title]] = $views;				
 				} else {
 					continue;
 				}
@@ -711,7 +711,7 @@ 
 
 		$to_return = "{" . PHP_EOL;
 		foreach ( $js_countries as $country => $value ) {
-			$to_return .= '"' . esc_js( $country ) . '": ' . esc_js(  $value ) . "," . PHP_EOL;
+			$to_return .= '"' . esc_js( $country ) . '": ' . esc_js( $value ) . "," . PHP_EOL;
 		}
 		$to_return .= "}" . PHP_EOL;
 		return $to_return;

includes/admin/reporting.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 				// Clear data + last run + failed
 				$this->delete_aggregate_data();
 
-		} else if ( ! $dashboards_disabled && $dashboards_disabled_old ){
+		} else if ( ! $dashboards_disabled && $dashboards_disabled_old ) {
 			// The dashboards are now being enabled
 				// Refresh data + schedule cron
 				$this->refresh_aggregate_data();
@@ -121,7 +121,7 @@ 
 		$last_run = monsterinsights_get_option( 'cron_last_run', false );
 
 		// See if issue connecting or expired
-		if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date('Ymd', time() ) ) { 
+		if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date( 'Ymd', time() ) ) { 
 			$this->run_cron();
 		}
 	}

includes/admin/googleauth.php

Spacing +17 added lines, -17 removed lines

@@ -15,7 +15,7 @@ 
 }
 
 function monsterinsights_google_auth_start_view( $reauth = false ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_start_view' : 'monsterinsights_google_auth_start_view' ;
+    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_start_view' : 'monsterinsights_google_auth_start_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
@@ -37,8 +37,8 @@ 
                 <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'AUTHENTICATION', 'google-analytics-for-wordpress' ); ?> </div>
                 <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'Authenticate your Google Analytics account with MonsterInsights', 'google-analytics-for-wordpress' ); ?> </div>
             <?php } ?>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'start';?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'start'; ?>">
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
@@ -62,7 +62,7 @@ 
     return $contents;
 }
 function monsterinsights_google_auth_enterkey_view( $reauth = false, $auth_url = '', $error = '' ) {
-    $class    = ( $reauth ) ? 'monsterinsights_google_auth_reauth_enterkey_view' : 'monsterinsights_google_auth_enterkey_view' ;
+    $class    = ( $reauth ) ? 'monsterinsights_google_auth_reauth_enterkey_view' : 'monsterinsights_google_auth_enterkey_view';
     $auth_url = esc_js( esc_url( $auth_url ) );
     ob_start(); 
     ?>
@@ -79,11 +79,11 @@ 
          <?php } ?>
          <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
             <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_enterkey_view_title"><?php esc_html_e( 'ENTER GOOGLE CODE', 'google-analytics-for-wordpress' ); ?> </div>
-            <a id="monsterinsights-google-oauth-window" class="button" onclick="monsterinsights_popupwindow('<?php echo esc_js( esc_attr( esc_url( $auth_url ) ) );  ?>',500,500);"><?php esc_html_e( 'Click To Get Google Code', 'google-analytics-for-wordpress' ); ?> </a>
+            <a id="monsterinsights-google-oauth-window" class="button" onclick="monsterinsights_popupwindow('<?php echo esc_js( esc_attr( esc_url( $auth_url ) ) ); ?>',500,500);"><?php esc_html_e( 'Click To Get Google Code', 'google-analytics-for-wordpress' ); ?> </a>
             <label for="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_label_enterkey_view"><?php esc_html_e( 'Copy the Google code into the box below and click next', 'google-analytics-for-wordpress' ); ?> </label>
-            <input type="text"   id="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_enterkey_view" name="monsterinsights_step_data" placeholder="<?php esc_html_e( 'Paste Google Code here', 'google-analytics-for-wordpress'); ?>">
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ($reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'enterkey';?>">
+            <input type="text"   id="monsterinsights_step_data" class="monsterinsights_google_auth_step_data_enterkey_view" name="monsterinsights_step_data" placeholder="<?php esc_html_e( 'Paste Google Code here', 'google-analytics-for-wordpress' ); ?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'enterkey'; ?>">
             <?php if ( ! empty( $error ) ) { ?>
                 <div class="monsterinsights_google_auth_enterkey_error notice notice-warning" style="margin:0px;padding:0px;"><p><?php esc_html_e( $error ); ?><p></div>
             <?php } ?>
@@ -110,7 +110,7 @@ 
     return $contents;    
 }
 function monsterinsights_google_auth_selectprofile_view( $reauth = false, $selectprofile = '', $error = '' ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_selectprofile_view' : 'monsterinsights_google_auth_selectprofile_view' ;
+    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_selectprofile_view' : 'monsterinsights_google_auth_selectprofile_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
@@ -129,8 +129,8 @@ 
             <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'SELECT PROFILE', 'google-analytics-for-wordpress' ); ?> </div>
             <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'Select the Google Analytics Profile to Use', 'google-analytics-for-wordpress' ); ?> </div>
             <?php echo $selectprofile; ?>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'selectprofile';?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'selectprofile'; ?>">
             <?php if ( ! empty( $error ) ) { ?>
                 <div class="monsterinsights_google_auth_selectprofile_error notice notice-warning" style="margin:0px;padding:0px;"><p><?php esc_html_e( $error ); ?><p></div>
             <?php } ?>
@@ -157,7 +157,7 @@ 
     return $contents;  
 }
 function monsterinsights_google_auth_done_view( $reauth = false ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_done_view' : 'monsterinsights_google_auth_done_view' ;
+    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_done_view' : 'monsterinsights_google_auth_done_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
@@ -171,8 +171,8 @@ 
          <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
             <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_start_view_title"><?php esc_html_e( 'DONE', 'google-analytics-for-wordpress' ); ?> </div>
             <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_start_view_description"><?php esc_html_e( 'You\'re all set!', 'google-analytics-for-wordpress' ); ?> </div>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done';?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done'; ?>">
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">
@@ -197,7 +197,7 @@ 
 }
 
 function monsterinsights_google_auth_error_view( $reauth = false, $error = '' ) {
-    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_exit_view' : 'monsterinsights_google_auth_exit_view' ;
+    $class = ( $reauth ) ? 'monsterinsights_google_auth_reauth_exit_view' : 'monsterinsights_google_auth_exit_view';
     ob_start(); 
     ?>
     <div class="<?php echo $class; ?>">
@@ -214,8 +214,8 @@ 
          <div id="monsterinsights_google_auth_box_contents" <?php if ( $reauth ) { echo 'class="monsterinsights_google_auth_reauth"'; } ?> >
             <div class="monsterinsights_google_auth_view_title monsterinsights_google_auth_exit_view_title"><?php esc_html_e( 'ERROR', 'google-analytics-for-wordpress' ); ?> </div>
             <div class="monsterinsights_google_auth_view_description monsterinsights_google_auth_exit_view_description"><?php echo $error; ?> </div>
-            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth) ? 'true' : 'false';?>">
-            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done';?>">
+            <input type="hidden" id="monsterinsightsreauth" name="monsterinsightsreauth" value="<?php echo ( $reauth ) ? 'true' : 'false'; ?>">
+            <input type="hidden" id="monsterinsightsview" name="monsterinsightsview" value="<?php echo 'done'; ?>">
         </div>
         <div id="monsterinsights_google_auth_box_footer">
             <div id="monsterinsights_google_auth_box_footer_left">