awesomemotive / google-analytics-for-wordpress

googleanalytics.php

Spacing +7 added lines, -7 removed lines

@@ -370,11 +370,11 @@ 
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file ) );
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) );
 		}
 	}
 
@@ -394,7 +394,7 @@ 
 		}
 
 		// Traditional WordPress plugin locale filter.
-		$mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
+		$mi_locale  = apply_filters( 'plugin_locale', $mi_locale, 'google-analytics-for-wordpress' );
 		$mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale );
 
 		// Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
@@ -433,7 +433,7 @@ 
 	public function monsterinsights_pro_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -459,7 +459,7 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
-		$monsterinsights_settings  = monsterinsights_get_options();
+		$monsterinsights_settings = monsterinsights_get_options();
 	}
 
 
@@ -473,7 +473,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/license-compat.php';
 			self::$instance->license = new MonsterInsights_License_Compat();
@@ -788,7 +788,7 @@ 
  *
  * @return void
  */
-function monsterinsights_lite_call_install_and_upgrade(){
+function monsterinsights_lite_call_install_and_upgrade() {
 	add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
 }
 

includes/compatibility-check.php

Spacing +1 added lines, -1 removed lines

@@ -322,7 +322,7 @@
 			$url = admin_url( 'plugins.php' );
 
 			// Check for MS dashboard
-			if( is_network_admin() ) {
+			if ( is_network_admin() ) {
 				$url = network_admin_url( 'plugins.php' );
 			}
 

includes/measurement-protocol-v4.php

Spacing +3 added lines, -3 removed lines

@@ -66,9 +66,9 @@ 
 			}
 
 			if ( array_key_exists( $key, $args ) ) {
-				$out[ $key ] = $args[ $key ];
+				$out[$key] = $args[$key];
 			} else {
-				$out[ $key ] = $default;
+				$out[$key] = $default;
 			}
 		}
 
@@ -87,7 +87,7 @@ 
 
 		if ( $this->is_debug ) {
 			foreach ( $body['events'] as $index => $event ) {
-				$body['events'][ $index ]['params']['debug_mode'] = true;
+				$body['events'][$index]['params']['debug_mode'] = true;
 			}
 		}
 

includes/auth.php

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
 
 final class MonsterInsights_Auth {
 
-	private $profile  = array();
+	private $profile = array();
 	private $network = array();
 
 	/**
@@ -63,7 +63,7 @@ 
 			return $result;
 		}
 
-		return $this->get_connected_type() === $type && ! empty( $this->profile[ $type ] );
+		return $this->get_connected_type() === $type && ! empty( $this->profile[$type] );
 	}
 
 	public function is_network_authed( $type = false ) {
@@ -73,7 +73,7 @@ 
 			return $result;
 		}
 
-		return $this->get_connected_type() === $type && ! empty( $this->network[ $type ] );
+		return $this->get_connected_type() === $type && ! empty( $this->network[$type] );
 	}
 
 	public function get_analytics_profile( $force = false ) {
@@ -96,9 +96,9 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
-		$this->profile      = $data;
+		$this->profile = $data;
 
 		// If this is the first time, save the date when they connected.
 		$over_time    = get_option( 'monsterinsights_over_time', array() );
@@ -116,12 +116,12 @@ 
 		}
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
-		$this->network      = $data;
+		$this->network = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -138,7 +138,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -174,7 +174,7 @@ 
 
 		do_action( 'monsterinsights_reports_delete_aggregate_data' );
 
-		$this->profile      = $data;
+		$this->profile = $data;
 		$this->set_analytics_profile( $data );
 	}
 
@@ -198,8 +198,8 @@ 
 				$key = $is_authed_ua ? 'v4' : 'ua';
 			}
 
-			if ( $key && ! empty( $data[ $key ] ) ) {
-				unset( $data[ $key ] );
+			if ( $key && ! empty( $data[$key] ) ) {
+				unset( $data[$key] );
 			}
 		} else {
 			$is_dual_tracking_id_v4 = monsterinsights_is_valid_v4_id( $id );
@@ -218,13 +218,13 @@ 
 				$key = $is_dual_tracking_id_v4 ? 'v4' : 'ua';
 			}
 
-			$data[ $key ] = $id;
+			$data[$key] = $id;
 		}
 
 		return $data;
 	}
 
-	public function set_dual_tracking_id ( $id = '' ) {
+	public function set_dual_tracking_id( $id = '' ) {
 		$data = empty( $this->profile ) ? array() : $this->profile;
 
 		$is_manual_ua = $this->is_manual( 'ua' );
@@ -241,7 +241,7 @@ 
 		$this->set_analytics_profile( $prepared_data );
 	}
 
-	public function set_network_dual_tracking_id ( $id = '' ) {
+	public function set_network_dual_tracking_id( $id = '' ) {
 		$data = empty( $this->network ) ? array() : $this->network;
 
 		$is_manual_ua = $this->is_network_manual( 'ua' );
@@ -271,13 +271,13 @@ 
 		if ( empty( $this->profile ) ) {
 			$data['manual_v4'] = $v4;
 		} else {
-			$data           = $this->profile;
+			$data = $this->profile;
 			$data['manual_v4'] = $v4;
 		}
 
 		do_action( 'monsterinsights_reports_delete_aggregate_data' );
 
-		$this->profile      = $data;
+		$this->profile = $data;
 		$this->set_analytics_profile( $data );
 	}
 
@@ -317,7 +317,7 @@ 
 		if ( empty( $this->network ) ) {
 			$data['manual_v4'] = $v4;
 		} else {
-			$data           = $this->network;
+			$data = $this->network;
 			$data['manual_v4'] = $v4;
 		}
 
@@ -425,51 +425,51 @@ 
 		return ! empty( $this->network['v4'] ) ? monsterinsights_is_valid_v4_id( $this->network['v4'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() { // also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() { // also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 

includes/helpers.php

Spacing +42 added lines, -42 removed lines

@@ -32,8 +32,8 @@ 
 		$user = new WP_User( $user_id );
 	}
 
-	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
+	$track_user = true;
+	$roles = monsterinsights_get_option( 'ignore_users', array() );
 
 	if ( ! empty( $roles ) && is_array( $roles ) ) {
 		foreach ( $roles as $role ) {
@@ -182,7 +182,7 @@ 
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+	return rand( 100000000, 999999999 ) . '.' . time();
 }
 
 
@@ -202,7 +202,7 @@ 
 		$stop = time();
 	}
 
-	$diff = (int) abs( $stop -  $start );
+	$diff = (int) abs( $stop - $start );
 	$hours = round( $diff / HOUR_IN_SECONDS );
 	return $hours;
 }
@@ -260,7 +260,7 @@ 
 	$editable_roles = apply_filters( 'editable_roles', $all_roles );
 
 	foreach ( $editable_roles as $id => $name ) {
-		$roles[ $id ] = translate_user_role( $name['name'] );
+		$roles[$id] = translate_user_role( $name['name'] );
 	}
 
 	return $roles;
@@ -286,7 +286,7 @@ 
 
 	foreach ( $editable_roles as $id => $role ) {
 		if ( isset( $role['capabilities']['manage_options'] ) && $role['capabilities']['manage_options'] ) {
-			$roles[ $id ] = translate_user_role( $role['name'] );
+			$roles[$id] = translate_user_role( $role['name'] );
 		}
 	}
 
@@ -332,7 +332,7 @@ 
 
 		}
 		if ( substr_count( $host, '.' ) > 1 ) {
-			$subdomains_to_check =  array( 'dev.', '*.staging.', 'beta.', 'test.' );
+			$subdomains_to_check = array( 'dev.', '*.staging.', 'beta.', 'test.' );
 			foreach ( $subdomains_to_check as $subdomain ) {
 				$subdomain = str_replace( '.', '(.)', $subdomain );
 				$subdomain = str_replace( array( '*', '(.)' ), '(.*)', $subdomain );
@@ -348,16 +348,16 @@ 
 
 // Set cookie to expire in 2 years
 function monsterinsights_get_cookie_expiration_date( $time ) {
-	return date('D, j F Y H:i:s', time() + $time );
+	return date( 'D, j F Y H:i:s', time() + $time );
 }
 
 function monsterinsights_string_ends_with( $string, $ending ) {
-	$strlen = strlen($string);
-	$endinglen = strlen($ending);
+	$strlen = strlen( $string );
+	$endinglen = strlen( $ending );
 	if ( $endinglen > $strlen ) {
 		return false;
 	}
-	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
+	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen ) === 0;
 }
 
 function monsterinsights_string_starts_with( $string, $start ) {
@@ -887,11 +887,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'api.monsterinsights.com/v2/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -935,7 +935,7 @@ 
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists( 'remove_class_filter' ) ) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -956,7 +956,7 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[$tag] ) ) return FALSE;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -965,33 +965,33 @@ 
 		 *
 		 * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
 		 */
-		if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-			$callbacks = &$wp_filter[ $tag ]->callbacks;
+		if ( is_object( $wp_filter[$tag] ) && isset( $wp_filter[$tag]->callbacks ) ) {
+			$callbacks = &$wp_filter[$tag]->callbacks;
 		} else {
-			$callbacks = &$wp_filter[ $tag ];
+			$callbacks = &$wp_filter[$tag];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[$priority] ) || empty( $callbacks[$priority] ) ) return FALSE;
 		// Loop through each filter for the specified priority, looking for our class & method
-		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
+		foreach ( (array) $callbacks[$priority] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter['function'] ) || ! is_array( $filter['function'] ) ) continue;
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter['function'][0] ) ) continue;
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter['function'][1] !== $method_name ) continue;
 			// Method matched, now let's check the Class
-			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
+			if ( get_class( $filter['function'][0] ) === $class_name ) {
 				// Now let's remove it from the array
-				unset( $callbacks[ $priority ][ $filter_id ] );
+				unset( $callbacks[$priority][$filter_id] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[$priority] ) ) unset( $callbacks[$priority] );
 				// and if the only filter for that tag, set the tag to an empty array
 				if ( empty( $callbacks ) ) $callbacks = array();
 				// If using WordPress older than 4.7
-				if ( ! is_object( $wp_filter[ $tag ] ) ) {
+				if ( ! is_object( $wp_filter[$tag] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
-					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
+					unset( $GLOBALS['merged_filters'][$tag] );
 				}
 				return TRUE;
 			}
@@ -1000,7 +1000,7 @@ 
 	}
 } // End function exists
 
-if ( ! function_exists ( 'remove_class_action' ) ) {
+if ( ! function_exists( 'remove_class_action' ) ) {
 	/**
 	 * Remove Class Action Without Access to Class Object
 	 *
@@ -1070,7 +1070,7 @@ 
 		}
 
 		foreach ( $translations->entries as $msgid => $entry ) {
-			$locale[ $msgid ] = $entry->translations;
+			$locale[$msgid] = $entry->translations;
 		}
 
 		return $locale;
@@ -1221,7 +1221,7 @@ 
 
 		$pattern = '/UA-[0-9-]+/';
 		if ( $type === 'ua' && isset( $options['ga-UID'] ) && preg_match( $pattern, $options['ga-UID'] ) ) {
-			++ $count;
+			++$count;
 		}
 	}
 
@@ -1232,7 +1232,7 @@ 
 
 		$pattern = '/UA-[0-9-]+/';
 		if ( $type === 'ua' && ! empty( $code ) && preg_match( $pattern, $code ) ) {
-			++ $count;
+			++$count;
 		}
 	}
 
@@ -1294,7 +1294,7 @@ 
 	$connected_type = MonsterInsights()->auth->get_connected_type();
 	if ( $type === $connected_type && strpos( $body, 'googletagmanager.com/gtag/js?id=' . $current_code ) !== false ) {
 		// In that case, we can safely deduct one from the total count
-		-- $total_count;
+		--$total_count;
 	}
 
 	if ( $total_count > $limit ) {
@@ -1336,7 +1336,7 @@ 
 	$response_code = wp_remote_retrieve_response_code( $request );
 
 	if ( in_array( $response_code, $accepted_http_codes, true ) ) {
-		$body            = wp_remote_retrieve_body( $request );
+		$body = wp_remote_retrieve_body( $request );
 
 		$errors = array_merge(
 			monsterinsights_detect_tracking_code_error( $body ),
@@ -1367,7 +1367,7 @@ 
  * @param string $url The url to which users get redirected.
  */
 function monsterinsights_custom_track_pretty_links_redirect( $url ) {
-	if ( ! function_exists( 'monsterinsights_mp_track_event_call' ) && ! function_exists( 'monsterinsights_mp_collect_v4') ) {
+	if ( ! function_exists( 'monsterinsights_mp_track_event_call' ) && ! function_exists( 'monsterinsights_mp_collect_v4' ) ) {
 		return;
 	}
 	// Try to determine if click originated on the same site.
@@ -1514,22 +1514,22 @@ 
  *
  * @return trimed sentence
  */
-function monsterinsights_trim_text( $text, $count ){
-	$text 	= str_replace("  ", " ", $text);
-	$string = explode(" ", $text);
+function monsterinsights_trim_text( $text, $count ) {
+	$text = str_replace( "  ", " ", $text );
+	$string = explode( " ", $text );
 	$trimed = "";
 
 	for ( $wordCounter = 0; $wordCounter <= $count; $wordCounter++ ) {
 		$trimed .= isset( $string[$wordCounter] ) ? $string[$wordCounter] : '';
 
-		if ( $wordCounter < $count ){
+		if ( $wordCounter < $count ) {
 			$trimed .= " ";
 		} else {
 			$trimed .= "...";
 		}
 	}
 
-	$trimed = trim($trimed);
+	$trimed = trim( $trimed );
 
 	return $trimed;
 }
@@ -1605,7 +1605,7 @@ 
 	$monsterinsights_reference = isset( $_GET['monsterinsights_reference'] ) ? $_GET['monsterinsights_reference'] : '';
 
 	if ( 'post-new.php' === $pagenow && 'pretty-link' === $post_type && 'url_builder' === $monsterinsights_reference ) {
-		$onboard  = get_option( 'prli_onboard' );
+		$onboard = get_option( 'prli_onboard' );
 
 		if ( $onboard == 'welcome' || $onboard == 'update' ) {
 			update_option( 'monsterinsights_backup_prli_onboard_value', $onboard );
@@ -1625,7 +1625,7 @@ 
 	$post_type = isset( $_GET['post_type'] ) ? $_GET['post_type'] : '';
 
 	if ( 'edit.php' === $pagenow && 'pretty-link' === $post_type ) {
-		$onboard   = get_option( 'monsterinsights_backup_prli_onboard_value' );
+		$onboard = get_option( 'monsterinsights_backup_prli_onboard_value' );
 
 		if ( class_exists( 'PrliBaseController' ) && ( $onboard == 'welcome' || $onboard == 'update' ) ) {
 			update_option( 'prli_onboard', $onboard );

includes/measurement-protocol.php

Spacing +9 added lines, -9 removed lines

@@ -22,16 +22,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 ) {
@@ -79,7 +79,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(),
@@ -100,7 +100,7 @@ 
 	// Unset empty values to reduce request size
 	foreach ( $body as $key => $value ) {
 		if ( empty( $value ) ) {
-			unset( $body[ $key ] );
+			unset( $body[$key] );
 		}
 	}
 
@@ -151,7 +151,7 @@ 
 		'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 );
 

includes/admin/admin.php

Spacing +30 added lines, -30 removed lines

@@ -28,13 +28,13 @@ 
 
     if ( $hook === 'monsterinsights_settings' ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
+        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543' );
 
         add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
@@ -121,7 +121,7 @@ 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
     $hook = 'monsterinsights_network';
     $submenu_base = add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) );
-    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  $menu_icon_inline, '100.00013467543' );
+    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', $menu_icon_inline, '100.00013467543' );
 
     add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
@@ -170,7 +170,7 @@ 
 function monsterinsights_add_admin_body_class_tools_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
 
-    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id  ) {
+    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id ) {
         return $classes;
     }
 
@@ -186,7 +186,7 @@ 
  */
 function monsterinsights_add_admin_body_class_addons_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
-    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id  ) {
+    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id ) {
         return $classes;
     }
 
@@ -202,15 +202,15 @@ 
  * @return array $links
  */
 function monsterinsights_add_action_links( $links ) {
-    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="'. monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
+    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) . '">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
     array_unshift( $links, $docs );
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     }
 
@@ -224,7 +224,7 @@ 
 
 	// If lite, show a link where they can get pro from
 	if ( ! monsterinsights_is_pro_version() ) {
-		$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) .'" style="font-weight:700; color: #1da867;">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+		$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) . '" style="font-weight:700; color: #1da867;">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
 		array_unshift( $links, $get_pro );
 	}
 
@@ -249,14 +249,14 @@ 
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
 
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
 
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     }
@@ -264,7 +264,7 @@ 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
 
@@ -284,7 +284,7 @@ 
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
         // Translators: Placeholders add a link to the wordpress.org repository.
-        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -325,7 +325,7 @@ 
         $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
         $urltwo    = $submenu_base . '#/about/getting-started';
         $message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
-        echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
+        echo '<div class="notice notice-info"><p style="font-weight:700">' . $title . '</p><p>' . $message . '</p><p><a href="' . $urlone . '" class="button-primary">' . $primary . '</a>&nbsp;&nbsp;&nbsp;<a href="' . $urltwo . '" class="button-secondary">' . $secondary . '</a></p></div>';
         return;
     }
 
@@ -334,18 +334,18 @@ 
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
         // Translators: Adds a link to retrieve the license.
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
 	            // Translators: Adds a link to the license renewal.
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
                 $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->site_license_invalid() ) {
@@ -354,7 +354,7 @@ 
         } else if ( MonsterInsights()->license->get_network_license_key() ) {
             if ( MonsterInsights()->license->network_license_expired() ) {
             	// Translators: Adds a link to renew license.
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->network_license_disabled() ) {
                 $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->network_license_invalid() ) {
@@ -362,7 +362,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -389,7 +389,7 @@ 
 	    }
 
 	    if ( $message ) {
-		    echo '<div class="error"><p>'. $message.'</p></div>';
+		    echo '<div class="error"><p>' . $message . '</p></div>';
 		    return;
 	    }
 
@@ -442,7 +442,7 @@ 
     //     }
     // }
 
-    $notices   = get_option( 'monsterinsights_notices' );
+    $notices = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
         $notices = array();
     }
@@ -488,7 +488,7 @@ 
 
     // 8. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -508,7 +508,7 @@ 
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
                     // Translators: Placeholders add a link to the MonsterInsights website.
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) . '">', ' &raquo;</a>' );
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -521,7 +521,7 @@ 
 
     // 9. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -540,7 +540,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) . '">', ' &raquo;</a>' );
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -554,8 +554,8 @@ 
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
         $page = $page . '#/advanced';
         // Translators: Adds a link to the settings panel.
-        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>' . $message . '</p></div>';
         return;
     }
 }
@@ -618,10 +618,10 @@ 
 			'Your Measurement Protocol API Secret is currently left blank, so you won\'t be able to use some of the tracking features with your GA4 property. %1$sPlease enter your Measurement Protocol API Secret here.%2$s',
 			'google-analytics-for-wordpress'
 		),
-		'<a href="' . esc_url( $page ). '">',
+		'<a href="' . esc_url( $page ) . '">',
 		'</a>'
 	);
-	echo '<div class="error"><p>'. $message.'</p></div>';
+	echo '<div class="error"><p>' . $message . '</p></div>';
 }
 
 add_action( 'admin_notices', 'monsterinsights_empty_measurement_protocol_token' );

includes/admin/api-auth.php

Spacing +48 added lines, -48 removed lines

@@ -28,23 +28,23 @@ 
 	public function __construct() {
 
 		// Authentication Actions
-		add_action( 'wp_ajax_monsterinsights_maybe_authenticate',    array( $this, 'maybe_authenticate' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_reauthenticate',  array( $this, 'maybe_reauthenticate' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_verify',          array( $this, 'maybe_verify' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_delete',          array( $this, 'maybe_delete' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_authenticate', array( $this, 'maybe_authenticate' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_reauthenticate', array( $this, 'maybe_reauthenticate' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_verify', array( $this, 'maybe_verify' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_delete', array( $this, 'maybe_delete' ) );
 
-		add_action( 'admin_init',          							 array( $this, 'authenticate_listener' ) );
-		add_action( 'admin_init',          							 array( $this, 'reauthenticate_listener' ) );
+		add_action( 'admin_init', array( $this, 'authenticate_listener' ) );
+		add_action( 'admin_init', array( $this, 'reauthenticate_listener' ) );
 
-		add_action( 'wp_ajax_nopriv_monsterinsights_is_installed',    array( $this, 'is_installed' ) );
-		add_action( 'wp_ajax_nopriv_monsterinsights_rauthenticate',   array( $this, 'rauthenticate' ) );
+		add_action( 'wp_ajax_nopriv_monsterinsights_is_installed', array( $this, 'is_installed' ) );
+		add_action( 'wp_ajax_nopriv_monsterinsights_rauthenticate', array( $this, 'rauthenticate' ) );
 
 		add_filter( 'monsterinsights_maybe_authenticate_siteurl', array( $this, 'before_redirect' ) );
 
 		add_action( 'wp_ajax_nopriv_monsterinsights_push_mp_token', array( $this, 'handle_relay_mp_token_push' ) );
 	}
 
-	public function get_tt(){
+	public function get_tt() {
 		$tt = is_network_admin() ? get_site_option( 'monsterinsights_network_tt', '' ) : get_option( 'monsterinsights_site_tt', '' );
 		if ( empty( $tt ) ) {
 			// if TT is empty, generate a new one, save it and then return it
@@ -54,12 +54,12 @@ 
 		return $tt;
 	}
 
-	public function rotate_tt(){
+	public function rotate_tt() {
 		$tt = $this->generate_tt();
 		is_network_admin() ? update_site_option( 'monsterinsights_network_tt', $tt ) : update_option( 'monsterinsights_site_tt', $tt );
 	}
 
-	public function generate_tt(){
+	public function generate_tt() {
 		return hash( 'sha512', wp_generate_password( 128, true, true ) . AUTH_SALT . uniqid( "", true ) );
 	}
 
@@ -77,14 +77,14 @@ 
 		);
 	}
 
-	public function maybe_authenticate(){
+	public function maybe_authenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can authenticate
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -101,9 +101,9 @@ 
 
 		// we do not have a current auth
 		if ( ! $this->is_network_admin() && MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot authenticate. Please re-authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot authenticate. Please re-authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( $this->is_network_admin() && MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot network authenticate. Please re-authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot network authenticate. Please re-authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$sitei = $this->get_sitei();
@@ -173,7 +173,7 @@ 
 		wp_send_json_success();
 	}
 
-	public function authenticate_listener(){
+	public function authenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'auth' ) {
 			return;
@@ -191,12 +191,12 @@ 
 
 		// Make sure has required params
 		if (
-			empty( $_REQUEST['key'] )    ||
-			empty( $_REQUEST['token'] )  ||
+			empty( $_REQUEST['key'] ) ||
+			empty( $_REQUEST['token'] ) ||
 			empty( $_REQUEST['miview'] ) ||
-			empty( $_REQUEST['a'] )      ||
-			empty( $_REQUEST['w'] )      ||
-			empty( $_REQUEST['p'] )      ||
+			empty( $_REQUEST['a'] ) ||
+			empty( $_REQUEST['w'] ) ||
+			empty( $_REQUEST['p'] ) ||
 			( empty( $_REQUEST['ua'] ) && empty( $_REQUEST['v4'] ) )
 		) {
 			return;
@@ -230,7 +230,7 @@ 
 			$profile['measurement_protocol_secret'] = sanitize_text_field( $_REQUEST['mp'] );
 		}
 
-		$profile[ $code_key ] = $code_value;
+		$profile[$code_key] = $code_value;
 
 		$worked = $this->verify_auth( $profile );
 		if ( ! $worked || is_wp_error( $worked ) ) {
@@ -244,7 +244,7 @@ 
 		$where = $this->is_network_admin() ? 'network' : 'site';
 		MonsterInsights()->reporting->delete_aggregate_data( $where );
 
-		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' )  : admin_url( 'admin.php?page=monsterinsights_settings' ) ;
+		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$url = add_query_arg( array(
 			 'mi_action' => 'auth',
 			 'success'   => 'true',
@@ -254,14 +254,14 @@ 
 		exit;
 	}
 
-	public function maybe_reauthenticate(){
+	public function maybe_reauthenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can authenticate
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to re-authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to re-authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -278,9 +278,9 @@ 
 
 		// we do have a current auth
 		if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate the network. Please authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate the network. Please authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$siteurl = add_query_arg( array(
@@ -306,7 +306,7 @@ 
 		wp_send_json_success( array( 'redirect' => $siteurl ) );
 	}
 
-	public function reauthenticate_listener(){
+	public function reauthenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'reauth' ) {
 			return;
@@ -369,7 +369,7 @@ 
 			$profile['measurement_protocol_secret'] = sanitize_text_field( $_REQUEST['mp'] );
 		}
 
-		$profile[ $code_key ] = $code_value;
+		$profile[$code_key] = $code_value;
 
 		// Save Profile
 		$this->is_network_admin() ? MonsterInsights()->auth->set_network_analytics_profile( $profile ) : MonsterInsights()->auth->set_analytics_profile( $profile );
@@ -378,7 +378,7 @@ 
 		$where = $this->is_network_admin() ? 'network' : 'site';
 		MonsterInsights()->reporting->delete_aggregate_data( $where );
 
-		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' )  : admin_url( 'admin.php?page=monsterinsights_settings' ) ;
+		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$url = add_query_arg( array(
 			 'mi_action' => 'reauth',
 			 'success'   => 'true',
@@ -389,14 +389,14 @@ 
 		exit;
 	}
 
-	public function maybe_verify(){
+	public function maybe_verify() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can verify
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to verify MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to verify MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -405,9 +405,9 @@ 
 
 		// we have an auth to verify
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( monsterinsights_is_pro_version() ) {
@@ -418,14 +418,14 @@ 
 		}
 
 		$worked = $this->verify_auth();
-		if ( $worked && ! is_wp_error(  $worked ) ) {
+		if ( $worked && ! is_wp_error( $worked ) ) {
 			wp_send_json_success( array( 'message' => __( "Successfully verified.", 'google-analytics-for-wordpress' ) ) );
 		} else {
 			wp_send_json_error( array( 'message' => __( "Could not verify.", 'google-analytics-for-wordpress' ) ) );
 		}
 	}
 
-	public function verify_auth( $credentials = array() ){
+	public function verify_auth( $credentials = array() ) {
 		$creds = ! empty( $credentials ) ? $credentials : ( $this->is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile( true ) : MonsterInsights()->auth->get_analytics_profile( true ) );
 
 		if ( empty( $creds['key'] ) ) {
@@ -444,14 +444,14 @@ 
 		}
 	}
 
-	public function maybe_delete(){
+	public function maybe_delete() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can delete
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to deauthenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to deauthenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -460,9 +460,9 @@ 
 
 		// we have an auth to delete
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( monsterinsights_is_pro_version() ) {
@@ -475,7 +475,7 @@ 
 		$force = ! empty( $_REQUEST['forcedelete'] ) && $_REQUEST['forcedelete'] === 'true';
 
 		$worked = $this->delete_auth( $force );
-		if ( $worked && ! is_wp_error(  $worked ) ) {
+		if ( $worked && ! is_wp_error( $worked ) ) {
 			wp_send_json_success( array( 'message' => __( "Successfully deauthenticated.", 'google-analytics-for-wordpress' ) ) );
 		} else {
 			if ( $force ) {
@@ -486,7 +486,7 @@ 
 		}
 	}
 
-	public function delete_auth( $force = false ){
+	public function delete_auth( $force = false ) {
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
 			return false;
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
@@ -502,13 +502,13 @@ 
 		// If we have a new siteurl enabled option and the profile site doesn't match the current site, deactivate anyways
 		if ( is_network_admin() ) {
 			$siteurl = network_admin_url();
-			if ( ! empty( $creds['neturl' ] ) && $creds['neturl'] !== $siteurl ) {
+			if ( ! empty( $creds['neturl'] ) && $creds['neturl'] !== $siteurl ) {
 				MonsterInsights()->auth->delete_network_analytics_profile( true );
 				return true;
 			}
 		} else {
 			$siteurl = site_url();
-			if ( ! empty( $creds['siteurl' ] ) && $creds['siteurl'] !== $siteurl ) {
+			if ( ! empty( $creds['siteurl'] ) && $creds['siteurl'] !== $siteurl ) {
 				MonsterInsights()->auth->delete_analytics_profile( true );
 				return true;
 			}
@@ -585,15 +585,15 @@ 
 		// 	return $sitei;
 		// }
 
-		$auth_key        = defined( 'AUTH_KEY' )        ? AUTH_KEY 		  : '';
+		$auth_key        = defined( 'AUTH_KEY' ) ? AUTH_KEY 		  : '';
 		$secure_auth_key = defined( 'SECURE_AUTH_KEY' ) ? SECURE_AUTH_KEY : '';
-		$logged_in_key   = defined( 'LOGGED_IN_KEY' )   ? LOGGED_IN_KEY   : '';
+		$logged_in_key   = defined( 'LOGGED_IN_KEY' ) ? LOGGED_IN_KEY   : '';
 
 		$sitei = $auth_key . $secure_auth_key . $logged_in_key;
-		$sitei = preg_replace('/[^a-zA-Z0-9]/', '', $sitei );
+		$sitei = preg_replace( '/[^a-zA-Z0-9]/', '', $sitei );
 		$sitei = sanitize_text_field( $sitei );
 		$sitei = trim( $sitei );
-		$sitei = ( strlen($sitei) > 30 ) ? substr($sitei, 0, 30 ) : $sitei;
+		$sitei = ( strlen( $sitei ) > 30 ) ? substr( $sitei, 0, 30 ) : $sitei;
 		return $sitei;
 	}