awesomemotive / google-analytics-for-wordpress

lite/includes/admin/reports/report-forms.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

includes/license.php

Spacing +33 added lines, -33 removed lines

@@ -87,10 +87,10 @@ 
 		$license_key  = ! empty( $license_key ) ? $license_key : MonsterInsights()->license->get_default_license_key();
 		return $license_key;
 	}
-	public function get_site_license_key(){
+	public function get_site_license_key() {
 		return ( ! empty( $this->site['key'] ) && is_string( $this->site['key'] ) && strlen( $this->site['key'] ) > 10 ) ? $this->site['key'] : '';
 	}
-	public function get_network_license_key(){
+	public function get_network_license_key() {
 		return ( ! empty( $this->network['key'] ) && is_string( $this->network['key'] ) && strlen( $this->network['key'] ) > 10 ) ? $this->network['key'] : '';
 	}
 
@@ -98,7 +98,7 @@ 
 		return $this->licensed;
 	}
 
-	public function is_site_licensed(){
+	public function is_site_licensed() {
 		return    ! empty( $this->site['key'] ) // has key
 			   &&   $this->get_site_license_type() // has type
 			   && ! $this->site_license_expired()  // isn't expired
@@ -117,28 +117,28 @@ 
 	}
 
 
-	public function get_site_license_updates(){
+	public function get_site_license_updates() {
 		return get_option( 'monsterinsights_license_updates', '' );
 	}
-	public function get_network_license_updates(){
+	public function get_network_license_updates() {
 		return get_site_option( 'monsterinsights_network_license_updates', '' );
 	}
 
-	public function set_site_license_updates(){
+	public function set_site_license_updates() {
 		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
 	}
 	public function set_network_license_updates() {
 		update_site_option( 'monsterinsights_network_license_updates', strtotime( '+8 hours' ) );
 	}
 
-	public function delete_site_license_updates(){
+	public function delete_site_license_updates() {
 		delete_option( 'monsterinsights_license_updates' );
 	}
-	public function delete_network_license_updates(){
+	public function delete_network_license_updates() {
 		delete_site_option( 'monsterinsights_license_updates' );
 	}
 
-	public function time_to_check_site_license(){
+	public function time_to_check_site_license() {
 		$timestamp = get_option( 'monsterinsights_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -151,7 +151,7 @@ 
 			}
 		}
 	}	
-	public function time_to_check_network_license(){
+	public function time_to_check_network_license() {
 		$timestamp = get_site_option( 'monsterinsights_network_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -165,21 +165,21 @@ 
 		}
 	}
 
-	public function set_site_license( $data = array() ){
+	public function set_site_license( $data = array() ) {
 		update_option( 'monsterinsights_license', $data );
 		$this->set_site_license_updates();
-		$this->site      = $data;
+		$this->site = $data;
 	}
-	public function set_network_license( $data = array() ){
+	public function set_network_license( $data = array() ) {
 		update_site_option( 'monsterinsights_network_license', $data );
 		$this->set_network_license_updates();
-		$this->network   = $data;
+		$this->network = $data;
 	}
 
 	public function delete_site_license() {
 		delete_option( 'monsterinsights_license' );
 		$this->delete_site_license_updates();
-		$this->site      = array();
+		$this->site = array();
 	}
 	public function delete_network_license() {
 		delete_site_option( 'monsterinsights_network_license' );
@@ -187,21 +187,21 @@ 
 		$this->network = array();
 	}
 
-	public function get_license_type(){
+	public function get_license_type() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 
 		return $this->using_network_license() ? $this->get_network_license_type() : $this->get_site_license_type();
 	}
-	public function get_site_license_type(){
+	public function get_site_license_type() {
 		return ( $this->get_site_license_key() && ! empty( $this->site['type'] ) && $this->is_valid_license_type( $this->site['type'] ) ) ? $this->site['type'] : '';
 	}
-	public function get_network_license_type(){
+	public function get_network_license_type() {
 		return ( $this->get_network_license_key() && ! empty( $this->network['type'] ) && $this->is_valid_license_type( $this->network['type'] ) ) ? $this->network['type'] : '';
 	}
 
-	public function license_has_error(){
+	public function license_has_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -215,7 +215,7 @@ 
 			   || $this->site_license_invalid()  // is invalid
 		;
 	}
-	public function network_license_has_error(){
+	public function network_license_has_error() {
 		return 
 				  $this->network_license_expired()  // is expired
 			   || $this->network_license_disabled()  // is disabled
@@ -223,21 +223,21 @@ 
 		;
 	}
 
-	public function license_expired(){
+	public function license_expired() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->network_license_expired() : $this->site_license_expired();
 	}
-	public function site_license_expired(){
+	public function site_license_expired() {
 		return ! empty( $this->site['is_expired'] );
 	}
-	public function network_license_expired(){
+	public function network_license_expired() {
 		return ! empty( $this->network['is_expired'] );
 	}
 
-	public function license_disabled(){
+	public function license_disabled() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -247,11 +247,11 @@ 
 	public function site_license_disabled() {
 		return ! empty( $this->site['is_disabled'] );
 	}
-	public function network_license_disabled(){
+	public function network_license_disabled() {
 		return ! empty( $this->network['is_disabled'] );
 	}
 
-	public function license_invalid(){
+	public function license_invalid() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -261,21 +261,21 @@ 
 	public function site_license_invalid() {
 		return ! empty( $this->site['is_invalid'] );
 	}
-	public function network_license_invalid(){
+	public function network_license_invalid() {
 		return ! empty( $this->network['is_invalid'] );
 	}
 
 
-	public function get_license_error(){
+	public function get_license_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->get_network_license_error() : $this->get_site_license_error();
 	}
-	public function get_site_license_error(){
+	public function get_site_license_error() {
 		if ( $this->site_license_expired() ) {
-			return 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( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			return 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( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
 			return esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
 		} else if ( $this->site_license_invalid() ) {
@@ -284,9 +284,9 @@ 
 		return '';
 	}
 
-	public function get_network_license_error(){
+	public function get_network_license_error() {
 		if ( $this->site_license_expired() ) {
-			return 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( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			return 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( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
 			return esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
 		} else if ( $this->site_license_invalid() ) {
@@ -362,7 +362,7 @@ 
 		return $can_access;
 	}
 
-	public function get_default_license_key(){
+	public function get_default_license_key() {
 		if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 			return MONSTERINSIGHTS_LICENSE_KEY;
 		}

Braces +30 added lines, -30 removed lines

@@ -87,18 +87,18 @@ 
 		$license_key  = ! empty( $license_key ) ? $license_key : MonsterInsights()->license->get_default_license_key();
 		return $license_key;
 	}
-	public function get_site_license_key(){
+	public function get_site_license_key() {
 		return ( ! empty( $this->site['key'] ) && is_string( $this->site['key'] ) && strlen( $this->site['key'] ) > 10 ) ? $this->site['key'] : '';
 	}
-	public function get_network_license_key(){
+	public function get_network_license_key() {
 		return ( ! empty( $this->network['key'] ) && is_string( $this->network['key'] ) && strlen( $this->network['key'] ) > 10 ) ? $this->network['key'] : '';
 	}
 
-	public function has_license() { 
+	public function has_license() {
 		return $this->licensed;
 	}
 
-	public function is_site_licensed(){
+	public function is_site_licensed() {
 		return    ! empty( $this->site['key'] ) // has key
 			   &&   $this->get_site_license_type() // has type
 			   && ! $this->site_license_expired()  // isn't expired
@@ -117,28 +117,28 @@ 
 	}
 
 
-	public function get_site_license_updates(){
+	public function get_site_license_updates() {
 		return get_option( 'monsterinsights_license_updates', '' );
 	}
-	public function get_network_license_updates(){
+	public function get_network_license_updates() {
 		return get_site_option( 'monsterinsights_network_license_updates', '' );
 	}
 
-	public function set_site_license_updates(){
+	public function set_site_license_updates() {
 		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
 	}
 	public function set_network_license_updates() {
 		update_site_option( 'monsterinsights_network_license_updates', strtotime( '+8 hours' ) );
 	}
 
-	public function delete_site_license_updates(){
+	public function delete_site_license_updates() {
 		delete_option( 'monsterinsights_license_updates' );
 	}
-	public function delete_network_license_updates(){
+	public function delete_network_license_updates() {
 		delete_site_option( 'monsterinsights_license_updates' );
 	}
 
-	public function time_to_check_site_license(){
+	public function time_to_check_site_license() {
 		$timestamp = get_option( 'monsterinsights_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -151,7 +151,7 @@ 
 			}
 		}
 	}	
-	public function time_to_check_network_license(){
+	public function time_to_check_network_license() {
 		$timestamp = get_site_option( 'monsterinsights_network_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -165,12 +165,12 @@ 
 		}
 	}
 
-	public function set_site_license( $data = array() ){
+	public function set_site_license( $data = array() ) {
 		update_option( 'monsterinsights_license', $data );
 		$this->set_site_license_updates();
 		$this->site      = $data;
 	}
-	public function set_network_license( $data = array() ){
+	public function set_network_license( $data = array() ) {
 		update_site_option( 'monsterinsights_network_license', $data );
 		$this->set_network_license_updates();
 		$this->network   = $data;
@@ -187,21 +187,21 @@ 
 		$this->network = array();
 	}
 
-	public function get_license_type(){
+	public function get_license_type() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 
 		return $this->using_network_license() ? $this->get_network_license_type() : $this->get_site_license_type();
 	}
-	public function get_site_license_type(){
+	public function get_site_license_type() {
 		return ( $this->get_site_license_key() && ! empty( $this->site['type'] ) && $this->is_valid_license_type( $this->site['type'] ) ) ? $this->site['type'] : '';
 	}
-	public function get_network_license_type(){
+	public function get_network_license_type() {
 		return ( $this->get_network_license_key() && ! empty( $this->network['type'] ) && $this->is_valid_license_type( $this->network['type'] ) ) ? $this->network['type'] : '';
 	}
 
-	public function license_has_error(){
+	public function license_has_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -215,7 +215,7 @@ 
 			   || $this->site_license_invalid()  // is invalid
 		;
 	}
-	public function network_license_has_error(){
+	public function network_license_has_error() {
 		return 
 				  $this->network_license_expired()  // is expired
 			   || $this->network_license_disabled()  // is disabled
@@ -223,21 +223,21 @@ 
 		;
 	}
 
-	public function license_expired(){
+	public function license_expired() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->network_license_expired() : $this->site_license_expired();
 	}
-	public function site_license_expired(){
+	public function site_license_expired() {
 		return ! empty( $this->site['is_expired'] );
 	}
-	public function network_license_expired(){
+	public function network_license_expired() {
 		return ! empty( $this->network['is_expired'] );
 	}
 
-	public function license_disabled(){
+	public function license_disabled() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -247,11 +247,11 @@ 
 	public function site_license_disabled() {
 		return ! empty( $this->site['is_disabled'] );
 	}
-	public function network_license_disabled(){
+	public function network_license_disabled() {
 		return ! empty( $this->network['is_disabled'] );
 	}
 
-	public function license_invalid(){
+	public function license_invalid() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -261,19 +261,19 @@ 
 	public function site_license_invalid() {
 		return ! empty( $this->site['is_invalid'] );
 	}
-	public function network_license_invalid(){
+	public function network_license_invalid() {
 		return ! empty( $this->network['is_invalid'] );
 	}
 
 
-	public function get_license_error(){
+	public function get_license_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->get_network_license_error() : $this->get_site_license_error();
 	}
-	public function get_site_license_error(){
+	public function get_site_license_error() {
 		if ( $this->site_license_expired() ) {
 			return 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( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -284,7 +284,7 @@ 
 		return '';
 	}
 
-	public function get_network_license_error(){
+	public function get_network_license_error() {
 		if ( $this->site_license_expired() ) {
 			return 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( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -295,7 +295,7 @@ 
 		return '';
 	}
 
-	public function license_can( $requires = 'lite' ) {		
+	public function license_can( $requires = 'lite' ) {
 		if ( ! monsterinsights_is_pro_version() || ! $this->has_license() ) {
 			return $requires === 'lite';
 		}
@@ -362,7 +362,7 @@ 
 		return $can_access;
 	}
 
-	public function get_default_license_key(){
+	public function get_default_license_key() {
 		if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 			return MONSTERINSIGHTS_LICENSE_KEY;
 		}

includes/admin/tracking.php

Spacing +9 added lines, -9 removed lines

@@ -94,14 +94,14 @@ 
 		$data['usagetracking'] = get_option( 'monsterinsights_usage_tracking_config', false );
 		$data['usercount']     = function_exists( 'get_user_count' ) ? get_user_count() : 'Not Set';
 		$data['usesauth']      = $usesauth;
-		$data['timezoneoffset']= date('P');
-		$data['installed_lite']= get_option( 'monsterinsights_installed_lite', array() );
+		$data['timezoneoffset'] = date( 'P' );
+		$data['installed_lite'] = get_option( 'monsterinsights_installed_lite', array() );
 		$data['installed_pro'] = get_option( 'monsterinsights_installed_pro', array() );
 
 
 
 		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
@@ -111,7 +111,7 @@ 
 		foreach ( $plugins as $key => $plugin ) {
 			if ( in_array( $plugin, $active_plugins ) ) {
 				// Remove active plugins from list so we can show active and inactive separately
-				unset( $plugins[ $key ] );
+				unset( $plugins[$key] );
 			}
 		}
 
@@ -129,7 +129,7 @@ 
 			return false;
 		}
 
-		if( ! $this->tracking_allowed() && ! $override ) {
+		if ( ! $this->tracking_allowed() && ! $override ) {
 			return false;
 		}
 
@@ -161,15 +161,15 @@ 
 	public function schedule_send() {
 		if ( ! wp_next_scheduled( 'monsterinsights_usage_tracking_cron' ) ) {
 			$tracking             = array();
-			$tracking['day']      = rand( 0, 6  );
+			$tracking['day']      = rand( 0, 6 );
 			$tracking['hour']     = rand( 0, 23 );
 			$tracking['minute']   = rand( 0, 59 );
 			$tracking['second']   = rand( 0, 59 );
-			$tracking['offset']   = ( $tracking['day']    * DAY_IN_SECONDS    ) +
-									( $tracking['hour']   * HOUR_IN_SECONDS   ) +
+			$tracking['offset']   = ( $tracking['day'] * DAY_IN_SECONDS ) +
+									( $tracking['hour'] * HOUR_IN_SECONDS ) +
 									( $tracking['minute'] * MINUTE_IN_SECONDS ) +
 									 $tracking['second'];
-			$tracking['initsend'] = strtotime("next sunday") + $tracking['offset'];
+			$tracking['initsend'] = strtotime( "next sunday" ) + $tracking['offset'];
 
 			wp_schedule_event( $tracking['initsend'], 'weekly', 'monsterinsights_usage_tracking_cron' );
 			update_option( 'monsterinsights_usage_tracking_config', $tracking );

lite/includes/admin/reports/report-realtime.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }

googleanalytics.php

Braces +2 added lines, -2 removed lines

@@ -502,7 +502,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php';
 			self::$instance->license = new MonsterInsights_License();
@@ -795,7 +795,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' );
 }
 

Spacing +13 added lines, -13 removed lines

@@ -233,14 +233,14 @@ 
 				self::$instance->notices          = new MonsterInsights_Notice_Admin();
 				self::$instance->license_actions  = new MonsterInsights_License_Actions();
 				self::$instance->reporting 	      = new MonsterInsights_Reporting();
-				self::$instance->api_auth    	  = new MonsterInsights_API_Auth();
+				self::$instance->api_auth = new MonsterInsights_API_Auth();
 				if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 					self::$instance->require_updater();
 				} else {
 					add_action( 'admin_init', array( self::$instance, 'require_updater' ) );
 				}
 
-				self::$instance->routes 		  = new MonsterInsights_Rest_Routes();
+				self::$instance->routes = new MonsterInsights_Rest_Routes();
 			}
 
 			if ( monsterinsights_is_pro_version() ) {
@@ -351,11 +351,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 ) );
 		}
 	}
 
@@ -375,7 +375,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
@@ -414,7 +414,7 @@ 
 	public function monsterinsights_wp_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -435,7 +435,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' );
 		}
 		?>
@@ -461,7 +461,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();
 	}
 
 
@@ -475,7 +475,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php';
 			self::$instance->license = new MonsterInsights_License();
@@ -642,7 +642,7 @@ 
 			$instance->api_auth->delete_auth();
 
 			// Delete data
-			$instance->reporting->delete_aggregate_data('site');
+			$instance->reporting->delete_aggregate_data( 'site' );
 
 			// Delete license
 			$instance->license->delete_site_license();
@@ -653,7 +653,7 @@ 
 		$instance->api_auth->uninstall_network_auth();
 
 		// Delete network data
-		$instance->reporting->delete_aggregate_data('network');
+		$instance->reporting->delete_aggregate_data( 'network' );
 
 		// Delete network license
 		$instance->license->delete_network_license();
@@ -662,7 +662,7 @@ 
 		$instance->api_auth->delete_auth();
 
 		// Delete data
-		$instance->reporting->delete_aggregate_data('site');
+		$instance->reporting->delete_aggregate_data( 'site' );
 
 		// Delete license
 		$instance->license->delete_site_license();
@@ -756,7 +756,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/admin/licensing/updater.php

Indentation +180 added lines, -180 removed lines

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

Spacing +12 added lines, -12 removed lines

@@ -140,7 +140,7 @@ 
         //add_filter( 'mwp_premium_perform_update', array( $this, 'premium_update' ) );
 
 	    // Add additional info if the license is expired.
-	    add_action( 'in_plugin_update_message-'. $this->plugin_path, array( $this, 'maybe_show_license_expired_message' ), 10, 2 );
+	    add_action( 'in_plugin_update_message-' . $this->plugin_path, array( $this, 'maybe_show_license_expired_message' ), 10, 2 );
     }
 
 	public function maybe_show_license_expired_message( $plugin_data, $response ) {
@@ -257,18 +257,18 @@ 
 
         // Create a new stdClass object and populate it with our plugin information.
         $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
+        $api->name                  = isset( $this->info->name ) ? $this->info->name : '';
+        $api->slug                  = isset( $this->info->slug ) ? $this->info->slug : '';
+        $api->version               = isset( $this->info->version ) ? $this->info->version : '';
+        $api->author                = isset( $this->info->author ) ? $this->info->author : '';
         $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
+        $api->requires              = isset( $this->info->requires ) ? $this->info->requires : '';
+        $api->tested                = isset( $this->info->tested ) ? $this->info->tested : '';
+        $api->last_updated          = isset( $this->info->last_updated ) ? $this->info->last_updated : '';
+        $api->homepage              = isset( $this->info->homepage ) ? $this->info->homepage : '';
 
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
+        $changelog                  = isset( $this->info->changelog ) ? $this->info->changelog : '';
+        $description                = isset( $this->info->description ) ? $this->info->description : '';
 
         if ( ! empty( $changelog ) ) {
              if ( ! empty( $description ) ) {
@@ -283,7 +283,7 @@ 
             $api->sections = array();
         }
 
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+        $api->download_link = isset( $this->info->download_link ) ? $this->info->download_link : '';
 
         // Return the new API object with our custom data.
         return $api;

lite/includes/admin/onboarding-wizard.php

Spacing +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
 			),
 			admin_url( 'admin.php' )
 		);
-		$url    = esc_url( $url );
+		$url = esc_url( $url );
 
 		ob_start();
 		if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
 		// Check for wizard-specific parameter
 		// Allow plugins to disable the onboarding wizard
 		// Check if current user is allowed to save settings.
-		if ( ! ( isset( $_GET['page'] ) || 'monsterinsights-onboarding' !== $_GET['page'] || apply_filters( 'monsterinsights_enable_onboarding_wizard', true ) || ! current_user_can( 'monsterinsights_save_settings' ) ) ) { // WPCS: CSRF ok, input var ok.
+		if ( ! ( isset( $_GET['page'] ) || 'monsterinsights-onboarding' !== $_GET['page'] || apply_filters( 'monsterinsights_enable_onboarding_wizard', true ) || ! current_user_can( 'monsterinsights_save_settings' ) ) ) {
+// WPCS: CSRF ok, input var ok.
 			return;
 		}
 

lite/includes/admin/welcome.php

Braces +2 added lines, -1 removed lines

@@ -28,7 +28,8 @@
 		delete_transient( '_monsterinsights_activation_redirect' );
 
 		// Bail if activating from network, or bulk.
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { // WPCS: CSRF ok, input var ok.
+		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+// WPCS: CSRF ok, input var ok.
 			return;
 		}
 

includes/api-request.php

Spacing +19 added lines, -19 removed lines

@@ -155,25 +155,25 @@ 
 		$this->network   = is_network_admin() || ! empty( $args['network'] );
 
 		$default_token   = $this->network ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token();
-		$default_key     = $this->network ? MonsterInsights()->auth->get_network_key()   : MonsterInsights()->auth->get_key();
+		$default_key     = $this->network ? MonsterInsights()->auth->get_network_key() : MonsterInsights()->auth->get_key();
 
-		$this->token     = ! empty( $args['token'] )     ? $args['token']  : $default_token;
-		$this->key       = ! empty( $args['key'] ) 	     ? $args['key']    : $default_key;
-		$this->tt        = ! empty( $args['tt'] ) 		 ? $args['tt']     : '';
-		$this->return    = ! empty( $args['return'] )    ? $args['return'] : '';
-		$this->start     = ! empty( $args['start'] )	 ? $args['start']  : '';
-		$this->end       = ! empty( $args['end'] )  	 ? $args['end']    : '';
+		$this->token     = ! empty( $args['token'] ) ? $args['token'] : $default_token;
+		$this->key       = ! empty( $args['key'] ) ? $args['key'] : $default_key;
+		$this->tt        = ! empty( $args['tt'] ) ? $args['tt'] : '';
+		$this->return    = ! empty( $args['return'] ) ? $args['return'] : '';
+		$this->start     = ! empty( $args['start'] ) ? $args['start'] : '';
+		$this->end       = ! empty( $args['end'] ) ? $args['end'] : '';
 
 		// We need to do this hack so that the network panel + the site_url of the main site are distinct
 		$this->site_url  = is_network_admin() ? network_admin_url() : site_url();
 
 		if ( monsterinsights_is_pro_version() ) {
-			$this->license   = $this->network ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
+			$this->license = $this->network ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
 		}
 		$this->plugin    = MonsterInsights()->plugin_slug;
 		$this->miversion = MONSTERINSIGHTS_VERSION;
-		$this->sitei     = ! empty( $args['sitei'] )   ? $args['sitei'] : '';
-		$this->testurl   = ! empty( $args['testurl'] ) ? $args['testurl']    : '';
+		$this->sitei     = ! empty( $args['sitei'] ) ? $args['sitei'] : '';
+		$this->testurl   = ! empty( $args['testurl'] ) ? $args['testurl'] : '';
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	public function request() {
 		// Make sure we're not blocked
 		$blocked = $this->is_blocked( $this->url );
-		if ( $blocked || is_wp_error( $blocked )  ) {
+		if ( $blocked || is_wp_error( $blocked ) ) {
 			if ( is_wp_error( $blocked ) ) {
 				return new WP_Error( 'api-error', sprintf( __( 'The firewall of your server is blocking outbound calls. Please contact your hosting provider to fix this issue. %s', 'google-analytics-for-wordpress' ), $blocked->get_error_message() ) );
 			} else {
@@ -243,14 +243,14 @@ 
 		}
 
 		if ( 'GET' == $this->method ) {
-			$body['time']   = time(); // just to avoid caching
+			$body['time'] = time(); // just to avoid caching
 		}
 
-		$body['timezone'] = date('e');
+		$body['timezone'] = date( 'e' );
 
 		$body['network']  = $this->network ? 'network' : 'site';
 
-		$body['ip']   = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
+		$body['ip'] = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
 
 		// This filter will be removed in the future.
 		$body   = apply_filters( 'monsterinsights_api_request_body', $body );
@@ -281,7 +281,7 @@ 
 		);
 
 		// Perform the query and retrieve the response.
-		$response      = 'GET' == $this->method ? wp_remote_get( esc_url_raw( $this->url ) . '?' . $string, $data ) : wp_remote_post( esc_url_raw( $this->url ), $data );
+		$response = 'GET' == $this->method ? wp_remote_get( esc_url_raw( $this->url ) . '?' . $string, $data ) : wp_remote_post( esc_url_raw( $this->url ), $data );
 
 		//return new WP_Error( 'debug', '<pre>' . var_export( $response, true ) . '</pre>' );
 
@@ -300,7 +300,7 @@ 
 
 		// If not a 200 status header, send back error.
 		if ( 200 != $response_code ) {
-			$type  = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
+			$type = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
 
 			if ( empty( $response_code ) ) {
 				return new WP_Error( $type, __( 'The API was unreachable.', 'google-analytics-for-wordpress' ) );
@@ -387,7 +387,7 @@ 
 		// and for image linking purposes in Google Images. We use it to test outbound connections since it is run on google.com
 		// and is only a few bytes large. Plus on Google's main CDN so it loads in most places in 0.07 seconds or less. Perfect for our
 		// use case of quickly testing outbound connections. 
-		$testurl = ! empty( $this->testurl ) ? $this->testurl :'http://www.google.com/blank.html';
+		$testurl = ! empty( $this->testurl ) ? $this->testurl : 'http://www.google.com/blank.html';
 		if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) {
 			if ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
 				$wp_http      = new WP_Http();
@@ -402,7 +402,7 @@ 
 						'body'          => ''
 					);
 					$response = wp_remote_get( $testurl, $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+					if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 						return false;
 					} else {
 						if ( is_wp_error( $response ) ) {
@@ -424,7 +424,7 @@ 
 			);
 			$response = wp_remote_get( $testurl, $params );
 
-			if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 				return false;
 			} else {
 				if ( is_wp_error( $response ) ) {