awesomemotive / google-analytics-for-wordpress

includes/options.php

Indentation +16 added lines, -16 removed lines

@@ -195,14 +195,14 @@ 
 }
 
  /**
- * Helper method for deleting a setting's value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting a setting's value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
 	if ( empty( $key ) ){
@@ -245,14 +245,14 @@ 
 }
 
  /**
- * Helper method for deleting multiple settings value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting multiple settings value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
 	if ( empty( $keys ) || ! is_array( $keys ) ){

Spacing +15 added lines, -15 removed lines

@@ -47,7 +47,7 @@ 
  */
 function monsterinsights_get_option( $key = '', $default = false ) {
 	global $monsterinsights_settings;
-	$value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
+	$value = ! empty( $monsterinsights_settings[$key] ) ? $monsterinsights_settings[$key] : $default;
 	$value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
 	return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
 }
@@ -146,7 +146,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -177,7 +177,7 @@ 
 	$value = apply_filters( 'monsterinsights_update_option', $value, $key );
 
 	// Next let's try to update the value
-	$settings[ $key ] = $value;
+	$settings[$key] = $value;
 	$did_update = false;
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( $option_name, $settings );
@@ -186,9 +186,9 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
-		$monsterinsights_settings[ $key ] = $value;
+		$monsterinsights_settings[$key] = $value;
 	}
 
 	return $did_update;
@@ -205,7 +205,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -224,8 +224,8 @@ 
 	//}
 
 	// Next let's try to remove the key
-	if( isset( $settings[ $key ] ) ) {
-		unset( $settings[ $key ] );
+	if ( isset( $settings[$key] ) ) {
+		unset( $settings[$key] );
 	}
 
 	$did_update = false;
@@ -236,7 +236,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -255,7 +255,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -275,8 +275,8 @@ 
 
 	// Next let's try to remove the keys
 	foreach ( $keys as $key ) {
-		if( isset( $settings[ $key ] ) ) {
-			unset( $settings[ $key ] );
+		if ( isset( $settings[$key] ) ) {
+			unset( $settings[$key] );
 		}
 	}
 
@@ -288,7 +288,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -379,8 +379,8 @@ 
 	);
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			unset( $settings[ $e ] );
+		if ( ! empty( $settings[$e] ) ) {
+			unset( $settings[$e] );
 		}
 	}
 	return wp_json_encode( $settings );

Braces +7 added lines, -7 removed lines

@@ -94,7 +94,7 @@ 
  * @return string The UA to use.
  */
 function monsterinsights_get_network_ua() {
-	if ( is_multisite() ) {	
+	if ( is_multisite() ) {
 		return '';
 	}
 	
@@ -146,7 +146,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -186,7 +186,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings[ $key ] = $value;
 	}
@@ -205,7 +205,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -236,7 +236,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -255,7 +255,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -288,7 +288,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}

includes/deprecated.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
 	 */
 	if ( ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
-		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html ( $message ) );
+		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html( $message ) );
 	}
 }
 
@@ -177,7 +177,7 @@ 
 	 */
 	if ( ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
 		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s.', 'google-analytics-for-wordpress' ), $function, $version, '<strong>', '</strong>' ) );
-		trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+		trigger_error( print_r( $backtrace, 1 ) ); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 		// Alternatively we could dump this to a file.
 	}
 }

includes/license.php

Spacing +31 added lines, -31 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,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="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="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -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="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="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/api-request.php

Spacing +13 added lines, -13 removed lines

@@ -136,21 +136,21 @@ 
 		$this->method    = $method;
 
 		$default_token   = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token();
-		$default_key     = ! empty( $args['network'] ) && $args['network'] ? MonsterInsights()->auth->get_network_key()   : MonsterInsights()->auth->get_key();
+		$default_key     = ! empty( $args['network'] ) && $args['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   = is_network_admin() || ( ! empty( $args['network'] ) && $args['network'] ) ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
+			$this->license = is_network_admin() || ( ! empty( $args['network'] ) && $args['network'] ) ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
 		}
 		$this->plugin    = MonsterInsights()->plugin_slug;
 		$this->miversion = MONSTERINSIGHTS_VERSION;
@@ -220,10 +220,10 @@ 
 		}
 
 		if ( 'GET' == $this->method ) {
-			$body['time']   = time(); // just to avoid caching
+			$body['time'] = time(); // just to avoid caching
 		}
 
-		$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 );
@@ -267,7 +267,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' ) );
@@ -372,7 +372,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 {
 						return true;
@@ -390,7 +390,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 {
 				return true;

includes/frontend/events/class-analytics-events.php

Spacing +6 added lines, -6 removed lines

@@ -90,14 +90,14 @@ 
 		$internal_label = esc_js( $internal_label );
 
 		// Get inbound as outbound to track
-		$inbound_paths = monsterinsights_get_option( 'track_internal_as_outbound','' );
+		$inbound_paths = monsterinsights_get_option( 'track_internal_as_outbound', '' );
 		$inbound_paths = explode( ',', $inbound_paths );
 		if ( ! is_array( $inbound_paths ) ) {
 			$inbound_paths = array( $inbound_paths );
 		}
 		$i = 0;
-		foreach ( $inbound_paths as $path ){
-			$inbound_paths[ $i ] = esc_js( trim( $path ) );
+		foreach ( $inbound_paths as $path ) {
+			$inbound_paths[$i] = esc_js( trim( $path ) );
 			$i++;
 		}
 
@@ -110,14 +110,14 @@ 
 			$download_extensions = array( $download_extensions );
 		}
 		$i = 0;
-		foreach( $download_extensions as $extension ){
-			$download_extensions[ $i ] = esc_js( trim( $extension ) );
+		foreach ( $download_extensions as $extension ) {
+			$download_extensions[$i] = esc_js( trim( $extension ) );
 			$i++;
 		}
 
 		$download_extensions = implode( ",", $download_extensions );
 
-		$is_debug_mode     =  monsterinsights_is_debug_mode();
+		$is_debug_mode = monsterinsights_is_debug_mode();
 		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
 			$is_debug_mode = 'true';
 		} else {

Braces +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
 			$inbound_paths = array( $inbound_paths );
 		}
 		$i = 0;
-		foreach ( $inbound_paths as $path ){
+		foreach ( $inbound_paths as $path ) {
 			$inbound_paths[ $i ] = esc_js( trim( $path ) );
 			$i++;
 		}
@@ -110,7 +110,7 @@ 
 			$download_extensions = array( $download_extensions );
 		}
 		$i = 0;
-		foreach( $download_extensions as $extension ){
+		foreach( $download_extensions as $extension ) {
 			$download_extensions[ $i ] = esc_js( trim( $extension ) );
 			$i++;
 		}

includes/frontend/class-tracking-abstract.php

Indentation +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -74,6 +74,6 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-         return "<!-- MonsterInsights Abstract Tracking class -->";
+	 return "<!-- MonsterInsights Abstract Tracking class -->";
     }
 }
\ No newline at end of file

includes/frontend/tracking/class-tracking-analytics.php

Spacing +5 added lines, -5 removed lines

@@ -85,8 +85,8 @@ 
 
 		if ( $create && ! empty( $create ) && is_array( $create ) ) {
 			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+			$create = str_replace( '"', "'", $create );
+			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "', " . $create;
 		} else {
 			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
 		}
@@ -162,10 +162,10 @@ 
 	 */
 	public function frontend_output( ) {
 		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
+		$is_debug_mode  = monsterinsights_is_debug_mode();
+		$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
 		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src       = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+			$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
 		}
 		$compat  = monsterinsights_get_option( 'gatracker_compatibility_mode', false );
 		$compat  = $compat ? 'window.ga = __gaTracker;' : '';

includes/frontend/tracking/class-tracking-disabled.php

Indentation +12 added lines, -12 removed lines

@@ -58,7 +58,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -74,16 +74,16 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = PHP_EOL . '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->' . PHP_EOL;
-        $ua      =  monsterinsights_get_ua();
-        if ( empty( $ua ) ) {
-            $output .=  '<!-- ' . esc_html__( 'MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
-        } else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-            $output .=  '<!-- ' . esc_html__( 'MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data. To view the Google Analytics code, view the source code either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
-        } else {
-            $output .=  '<!-- ' . esc_html__( 'The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
-        }
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->' . PHP_EOL . PHP_EOL;
-        return $output;
+	$output  = PHP_EOL . '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->' . PHP_EOL;
+	$ua      =  monsterinsights_get_ua();
+	if ( empty( $ua ) ) {
+	    $output .=  '<!-- ' . esc_html__( 'MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+	} else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
+	    $output .=  '<!-- ' . esc_html__( 'MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data. To view the Google Analytics code, view the source code either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+	} else {
+	    $output .=  '<!-- ' . esc_html__( 'The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+	}
+	$output .=  '<!-- / Google Analytics by MonsterInsights -->' . PHP_EOL . PHP_EOL;
+	return $output;
     }
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -74,16 +74,16 @@
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = PHP_EOL . '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->' . PHP_EOL;
-        $ua      =  monsterinsights_get_ua();
+        $output  = PHP_EOL . '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION . ' - https://www.monsterinsights.com/ -->' . PHP_EOL;
+        $ua      = monsterinsights_get_ua();
         if ( empty( $ua ) ) {
-            $output .=  '<!-- ' . esc_html__( 'MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+            $output .= '<!-- ' . esc_html__( 'MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
         } else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-            $output .=  '<!-- ' . esc_html__( 'MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data. To view the Google Analytics code, view the source code either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+            $output .= '<!-- ' . esc_html__( 'MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data. To view the Google Analytics code, view the source code either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
         } else {
-            $output .=  '<!-- ' . esc_html__( 'The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
+            $output .= '<!-- ' . esc_html__( 'The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' ) . ' -->' . PHP_EOL;
         }
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->' . PHP_EOL . PHP_EOL;
+        $output .= '<!-- / Google Analytics by MonsterInsights -->' . PHP_EOL . PHP_EOL;
         return $output;
     }
 }
\ No newline at end of file

includes/admin/pages/reports.php

Spacing +15 added lines, -15 removed lines

@@ -38,7 +38,7 @@ 
 	 * not be used by other developers. This hook's behavior may be modified
 	 * or the hook may be removed at any time, without warning.
 	 */
-	$reports =  apply_filters( 'monsterinsights_get_reports', array() );
+	$reports = apply_filters( 'monsterinsights_get_reports', array() );
 	return $reports;
 }
 
@@ -90,7 +90,7 @@ 
 					<div id="monsterinsights-main-tab-<?php echo esc_attr( $report->name ); ?>" class="monsterinsights-main-nav-tab monsterinsights-nav-tab">
 						<div class="monsterinsights-reports-action-bar monsterinsights-clear">
 							<div class="monsterinsights-reports-action-bar-title">
-								<?php echo esc_html( sprintf( __( '%s Report', 'google-analytics-for-wordpress' ), $report->title  ) ); ?>
+								<?php echo esc_html( sprintf( __( '%s Report', 'google-analytics-for-wordpress' ), $report->title ) ); ?>
 							</div>
 							<div class="monsterinsights-reports-action-bar-actions"><?php 
 								/** 
@@ -132,15 +132,15 @@ 
 	check_ajax_referer( 'mi-admin-nonce', 'security' );
 
 	// Get variables
-	$start 		 = ! empty( $_REQUEST['start'] )  		? $_REQUEST['start']		: '';
-	$end 		 = ! empty( $_REQUEST['end'] )    		? $_REQUEST['end']   		: '';
-	$name        = ! empty( $_REQUEST['report'] )    	? $_REQUEST['report']       : '';
-	$isnetwork   = ! empty( $_REQUEST['isnetwork'] )    ? $_REQUEST['isnetwork']    : '';
+	$start = ! empty( $_REQUEST['start'] ) ? $_REQUEST['start'] : '';
+	$end = ! empty( $_REQUEST['end'] ) ? $_REQUEST['end'] : '';
+	$name        = ! empty( $_REQUEST['report'] ) ? $_REQUEST['report'] : '';
+	$isnetwork   = ! empty( $_REQUEST['isnetwork'] ) ? $_REQUEST['isnetwork'] : '';
 
 
 	// Current user can authenticate
 	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_send_json_error( array(	'message' => __( "You don't have permission to view MonsterInsights reports.", 'google-analytics-for-wordpress' ) ) );
+		wp_send_json_error( array( 'message' => __( "You don't have permission to view MonsterInsights reports.", 'google-analytics-for-wordpress' ) ) );
 	}
 
 	if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -148,15 +148,15 @@ 
 	}
 
 	// Only for Pro users, require a license key to be entered first so we can link to things.
-	if ( monsterinsights_is_pro_version()  ) {
+	if ( monsterinsights_is_pro_version() ) {
 		if ( ! MonsterInsights()->license->is_site_licensed() && ! MonsterInsights()->license->is_network_licensed() ) {
-			wp_send_json_error( array(	'message' => __( "You can't view MonsterInsights reports because you are not licensed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You can't view MonsterInsights reports because you are not licensed.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( MonsterInsights()->license->is_site_licensed() && ! MonsterInsights()->license->site_license_has_error() ) {
 			// good to go: site licensed
 		} else if ( MonsterInsights()->license->is_network_licensed() && ! MonsterInsights()->license->network_license_has_error() ) {
 			// good to go: network licensed
 		} else {
-			wp_send_json_error( array(	'message' => __( "You can't view MonsterInsights reports due to license key errors.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You can't view MonsterInsights reports due to license key errors.", 'google-analytics-for-wordpress' ) ) );
 		}
 	}
 
@@ -164,20 +164,20 @@ 
 	$site_auth   = MonsterInsights()->auth->get_viewname();
 	$ms_auth     = is_multisite() && MonsterInsights()->auth->get_network_viewname();
 	if ( ! $site_auth && ! $ms_auth ) {
-		wp_send_json_error( array(	'message' => __( "You must authenticate with MonsterInsights before you can view reports.", 'google-analytics-for-wordpress' ) ) );
+		wp_send_json_error( array( 'message' => __( "You must authenticate with MonsterInsights before you can view reports.", 'google-analytics-for-wordpress' ) ) );
 	}
 
 	if ( empty( $name ) ) {
-		wp_send_json_error( array(	'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) );
+		wp_send_json_error( array( 'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) );
 	}
 
 	$report = MonsterInsights()->reporting->get_report( $name );
 
 	if ( empty( $report ) ) {
-		wp_send_json_error( array(	'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) );
+		wp_send_json_error( array( 'message' => __( "Unknown report. Try refreshing and retrying. Contact support if this issue persists.", 'google-analytics-for-wordpress' ) ) );
 	}
 
-	$args  = array( 'start' => $start, 'end' => $end );
+	$args = array( 'start' => $start, 'end' => $end );
 	if ( $isnetwork ) {
 		$args['network'] = true;
 	}
@@ -191,7 +191,7 @@ 
 				   'success' => true 
 			) 
 		);
-		wp_send_json_success( array( 'html' => $data  ) );
+		wp_send_json_success( array( 'html' => $data ) );
 	} else {
 		wp_send_json_error( array( 'message' => $data['error'] ) );
 	}