awesomemotive / google-analytics-for-wordpress

lite/includes/admin/reports/report-ecommerce.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

lite/includes/admin/reports/report-publisher.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

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/pages/addons.php

Indentation +105 added lines, -105 removed lines

@@ -18,20 +18,20 @@ 
     global $admin_page_hooks;
    
     if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
-        return false;
+	return false;
     }
 
     $settings_page = false;
     if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_addons' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( ! empty( $admin_page_hooks['monsterinsights_settings'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] . '_page_monsterinsights_addons' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( ! empty( $admin_page_hooks['monsterinsights_network'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_network'] . '_page_monsterinsights_addons-network' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     return $settings_page;
@@ -46,16 +46,16 @@ 
  */
 function monsterinsights_maybe_refresh_addons() {
     if ( ! monsterinsights_is_addons_page() ) {
-        return;
+	return;
     }
 
 
     if ( empty( $_POST['google-analytics-for-wordpress-refresh-addons-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['google-analytics-for-wordpress-refresh-addons'], 'google-analytics-for-wordpress-refresh-addons' ) ) {
-        return;
+	return;
     }
 
     monsterinsights_get_addons_data( MonsterInsights()->license->get_valid_license_key() );
@@ -93,14 +93,14 @@ 
     <div id="monsterinsights-addons" class="wrap">
         <div class="monsterinsights-clear">
             <?php
-            /** 
-             * Developer Alert:
-             *
-             * Per the README, this is considered an internal hook and should
-             * not be used by other developers. This hook's behavior may be modified
-             * or the hook may be removed at any time, without warning.
-             */
-            ?>
+	    /** 
+	     * Developer Alert:
+	     *
+	     * Per the README, this is considered an internal hook and should
+	     * not be used by other developers. This hook's behavior may be modified
+	     * or the hook may be removed at any time, without warning.
+	     */
+	    ?>
             <?php do_action( 'monsterinsights_addons_section' ); ?>
         </div>
     </div>
@@ -117,14 +117,14 @@ 
 
     // If error(s) occurred during license key verification, display them and exit now.
     if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->get_valid_license_key() ) {
-        ?>
+	?>
         <div class="error below-h2">
             <p>
                 <?php esc_html_e( 'In order to get access to Addons, you need to resolve your license key errors.', 'google-analytics-for-wordpress' ); ?>
             </p>
         </div>
         <?php
-        return;
+	return;
     }
 
     // Get Addons
@@ -133,7 +133,7 @@ 
     // If no Addon(s) were returned, our API call returned an error.
     // Show an error message with a button to reload the page, which will trigger another API call.
     if ( ! $addons ) {
-        ?>
+	?>
         <form id="monsterinsights-addons-refresh-addons-form" method="post">
             <p>
                 <?php esc_html_e( 'There was an issue retrieving the addons for this site. Please click on the button below the refresh the addons data.', 'google-analytics-for-wordpress' ); ?>
@@ -143,7 +143,7 @@ 
             </p>
         </form>
         <?php
-        return;
+	return;
     }
 
     // If here, we have Addons to display, so let's output them now.
@@ -153,9 +153,9 @@ 
     ?>
     <div id="monsterinsights-addons">
         <?php
-        // Output Addons the User is licensed to use.
-        if ( count( $addons['licensed'] )> 0 ) {
-            ?>
+	// Output Addons the User is licensed to use.
+	if ( count( $addons['licensed'] )> 0 ) {
+	    ?>
             <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3>
                 
@@ -163,19 +163,19 @@ 
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['licensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
-                        }
-                        ?>
+			foreach ( (array) $addons['licensed'] as $i => $addon ) {
+			    monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
+			}
+			?>
                     </div>
                 </div>
             </div>
             <?php
-        } // Close licensed addons
+	} // Close licensed addons
 
-        // Output Addons the User isn't licensed to use.
-        if ( count( $addons['unlicensed'] ) > 0 ) {
-            ?>
+	// Output Addons the User isn't licensed to use.
+	if ( count( $addons['unlicensed'] ) > 0 ) {
+	    ?>
             <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3>
                 <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p>
@@ -184,16 +184,16 @@ 
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
-                        }
-                        ?>
+			foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
+			    monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
+			}
+			?>
                     </div>
                 </div>
             </div>
             <?php
-        } // Close unlicensed addons
-        ?>
+	} // Close unlicensed addons
+	?>
     </div>
     <?php
 
@@ -215,37 +215,37 @@ 
     
     // Get addons data from transient or perform API query if no transient.
     if ( false === ( $addons = get_transient( '_monsterinsights_addons' ) ) ) {
-        $addons = monsterinsights_get_addons_data( $key );
+	$addons = monsterinsights_get_addons_data( $key );
     }
 
     // If no Addons exist, return false
     if ( ! $addons ) {
-        return false;
+	return false;
     }
 
     // Iterate through Addons, to build two arrays: 
     // - Addons the user is licensed to use,
     // - Addons the user isn't licensed to use.
     $results = array(
-        'licensed'  => array(),
-        'unlicensed'=> array(),
+	'licensed'  => array(),
+	'unlicensed'=> array(),
     );
     foreach ( (array) $addons as $i => $addon ) {
 
-        // Determine whether the user is licensed to use this Addon or not.
-        if ( 
-            empty( $type ) ||
-            ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
-            ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
-            ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
-        ) {
-            // Unlicensed
-            $results['unlicensed'][] = $addon;
-            continue;
-        }
-
-        // Licensed
-        $results['licensed'][] = $addon;
+	// Determine whether the user is licensed to use this Addon or not.
+	if ( 
+	    empty( $type ) ||
+	    ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
+	    ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
+	    ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
+	) {
+	    // Unlicensed
+	    $results['unlicensed'][] = $addon;
+	    continue;
+	}
+
+	// Licensed
+	$results['licensed'][] = $addon;
 
     }
 
@@ -268,21 +268,21 @@ 
     // Get Addons
     // If the key is valid, we'll get personalised upgrade URLs for each Addon (if necessary) and plugin update information.
     if ( $key ) {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
     } else {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
     }
     
     // If there was an API error, set transient for only 10 minutes.
     if ( ! $addons ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // If there was an error retrieving the addons, set the error.
     if ( isset( $addons->error ) ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // Otherwise, our request worked. Save the data and return it.
@@ -303,9 +303,9 @@ 
     $keys = array_keys( get_plugins() );
 
     foreach ( $keys as $key ) {
-        if ( preg_match( '|^' . $slug . '|', $key ) ) {
-            return $key;
-        }
+	if ( preg_match( '|^' . $slug . '|', $key ) ) {
+	    return $key;
+	}
     }
 
     return $slug;
@@ -328,24 +328,24 @@ 
     $slug = str_replace( 'monsterinsights-', '', $addon->slug );
     $slug = 'monsterinsights-' . $addon->slug;
     if ( $slug === 'monsterinsights-ecommerce' ) {
-        $slug = 'ga-ecommerce';
+	$slug = 'ga-ecommerce';
     } 
 
     $plugin_basename   = monsterinsights_get_plugin_basename_from_slug( $slug );
     $categories = implode( ',', $addon->categories );
     if ( ! $installed_plugins ) {
-        $installed_plugins = get_plugins();
+	$installed_plugins = get_plugins();
     }
    
     // If the Addon doesn't supply an upgrade_url key, it's because the user hasn't provided a license
     // get_upgrade_link() will return the Lite or Pro link as necessary for us.
     if ( ! isset( $addon->upgrade_url ) ) {
-        $addon->upgrade_url = monsterinsights_get_upgrade_link();
+	$addon->upgrade_url = monsterinsights_get_upgrade_link();
     }
 
     // Link user to doc to install MI pro to install addons
     if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-        $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" );
+	$addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" );
     }
 
     // Output the card
@@ -353,19 +353,19 @@ 
     <div class="monsterinsights-addon">
         <h3 class="monsterinsights-addon-title"><?php echo esc_html( $addon->title ); ?></h3>
         <?php
-        if ( ! empty( $addon->image ) ) {
-            ?>
+	if ( ! empty( $addon->image ) ) {
+	    ?>
             <img class="monsterinsights-addon-thumb" src="<?php echo esc_attr( esc_url( $addon->image ) ); ?>" alt="<?php echo esc_attr( $addon->title ); ?>" />
             <?php
-        }
-        ?>
+	}
+	?>
 
         <p class="monsterinsights-addon-excerpt"><?php echo esc_html( $addon->excerpt ); ?></p>
 
         <?php
-        // If the Addon is unlicensed, show the upgrade button 
-        if ( ! $is_licensed ) {
-            ?>
+	// If the Addon is unlicensed, show the upgrade button 
+	if ( ! $is_licensed ) {
+	    ?>
             <div class="monsterinsights-addon-active monsterinsights-addon-message">
                 <div class="interior">
                     <div class="monsterinsights-addon-upgrade">
@@ -377,15 +377,15 @@ 
                 </div>
             </div>
             <?php
-        } else {
-            // Addon is licensed
-
-            // If the plugin is not installed, display an install message and button.
-            if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-                if ( empty( $addon->url ) ) {
-                    $addon->url = '';
-                }
-                ?>
+	} else {
+	    // Addon is licensed
+
+	    // If the plugin is not installed, display an install message and button.
+	    if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+		if ( empty( $addon->url ) ) {
+		    $addon->url = '';
+		}
+		?>
                 <div class="monsterinsights-addon-not-installed monsterinsights-addon-message">
                     <div class="interior">
                          <?php if ( monsterinsights_is_pro_version() ) { ?>
@@ -408,22 +408,22 @@ 
                     </div>
                 </div>
                 <?php
-            } else {
-                // Plugin is installed.
+	    } else {
+		// Plugin is installed.
                 
-                $active = false;
-                $ms_active = is_plugin_active_for_network( $plugin_basename );
-                $ss_active = is_plugin_active( $plugin_basename );
-
-                if ( is_multisite() && is_network_admin() ) {
-                    $active = is_plugin_active_for_network( $plugin_basename );
-                } else {
-                    $active = is_plugin_active( $plugin_basename );
-                }
-
-                if ( $active ) {
-                    // Plugin is active. Display the active message and deactivate button.
-                    ?>
+		$active = false;
+		$ms_active = is_plugin_active_for_network( $plugin_basename );
+		$ss_active = is_plugin_active( $plugin_basename );
+
+		if ( is_multisite() && is_network_admin() ) {
+		    $active = is_plugin_active_for_network( $plugin_basename );
+		} else {
+		    $active = is_plugin_active( $plugin_basename );
+		}
+
+		if ( $active ) {
+		    // Plugin is active. Display the active message and deactivate button.
+		    ?>
                     <div class="monsterinsights-addon-active monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
@@ -449,9 +449,9 @@ 
                         </div>
                     </div>
                     <?php
-                } else {
-                    // Plugin is inactivate. Display the inactivate mesage and activate button.
-                    ?>
+		} else {
+		    // Plugin is inactivate. Display the inactivate mesage and activate button.
+		    ?>
                     <div class="monsterinsights-addon-inactive monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
@@ -474,10 +474,10 @@ 
                         </div>
                     </div>
                     <?php
-                }
-            }
-        }
-        ?>
+		}
+	    }
+	}
+	?>
     </div>
     <?php
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,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.
      */
-    do_action('monsterinsights_head');
+    do_action( 'monsterinsights_head' );
     ?>
     <?php echo monsterinsights_ublock_notice(); ?>
     <div id="monsterinsights-addon-heading" class="monsterinsights-addons-subheading monsterinsights-clearfix-after">
@@ -154,7 +154,7 @@ 
     <div id="monsterinsights-addons">
         <?php
         // Output Addons the User is licensed to use.
-        if ( count( $addons['licensed'] )> 0 ) {
+        if ( count( $addons['licensed'] ) > 0 ) {
             ?>
             <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3>
@@ -178,7 +178,7 @@ 
             ?>
             <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3>
-                <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p>
+                <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url . '">', '</a>' ); ?></p>
                 
                 <div id="monsterinsights-addons-unlicensed" class="monsterinsights-addons">
                     <!-- list container class required for list.js -->
@@ -331,7 +331,7 @@ 
         $slug = 'ga-ecommerce';
     } 
 
-    $plugin_basename   = monsterinsights_get_plugin_basename_from_slug( $slug );
+    $plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug );
     $categories = implode( ',', $addon->categories );
     if ( ! $installed_plugins ) {
         $installed_plugins = get_plugins();
@@ -344,7 +344,7 @@ 
     }
 
     // Link user to doc to install MI pro to install addons
-    if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+    if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[$plugin_basename] ) ) {
         $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" );
     }
 
@@ -381,7 +381,7 @@ 
             // Addon is licensed
 
             // If the plugin is not installed, display an install message and button.
-            if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+            if ( ! isset( $installed_plugins[$plugin_basename] ) ) {
                 if ( empty( $addon->url ) ) {
                     $addon->url = '';
                 }
@@ -427,17 +427,17 @@ 
                     <div class="monsterinsights-addon-active monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } else { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } ?> 
-                            <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) ) { ?>
+                            <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active ) ) { ?>
                             <div class="monsterinsights-addon-action">
                                 <a class="button button-primary monsterinsights-addon-action-button monsterinsights-deactivate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>">
                                     <i class="monsterinsights-toggle-on"></i>
                                     <?php if ( is_multisite() && is_network_admin() && $ms_active ) { ?>
                                         <?php esc_html_e( 'Network deactivate', 'google-analytics-for-wordpress' ); ?> 
-                                    <?php } else if ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) { ?>
+                                    <?php } else if ( is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active ) { ?>
                                         <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> 
                                     <?php } else { ?>
                                         <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> 
@@ -455,9 +455,9 @@ 
                     <div class="monsterinsights-addon-inactive monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } else { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } ?> 
                             <div class="monsterinsights-addon-action">
                                 <a class="button button-primary monsterinsights-addon-action-button monsterinsights-activate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>">

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'], 'data' => $data['data'] ) );
 	}

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 );

includes/admin/reports/overview.php

Spacing +11 added lines, -11 removed lines

@@ -89,12 +89,12 @@ 
 		}
 
 		$datapoints = array();
-		foreach ( $data[ $class ]['datapoints'] as $datapoint ) {
+		foreach ( $data[$class]['datapoints'] as $datapoint ) {
 			$datapoints[] = esc_js( $datapoint );
 		}
 
 		$trendpoints = array();
-		foreach ( $data[ $class ]['trendpoints'] as $trendpoint ) {
+		foreach ( $data[$class]['trendpoints'] as $trendpoint ) {
 			$trendpoints[] = esc_js( $trendpoint );
 		}
 
@@ -132,7 +132,7 @@ 
 							}
 						} );
 
-						var ctx = document.getElementById( "monsterinsights-overview-<?php echo $class;?>" );
+						var ctx = document.getElementById( "monsterinsights-overview-<?php echo $class; ?>" );
 						var data = {
 							labels: [<?php echo implode( ', ', $labels ); ?>],
 							datasets: [
@@ -157,8 +157,8 @@ 
 									pointHoverRadius: 6,//The radius of the point when hovered.
 
 
-									labels: [<?php echo implode( ', ', $labels );   ?>],
-									data: [<?php echo implode( ', ', $datapoints );   ?>],
+									labels: [<?php echo implode( ', ', $labels ); ?>],
+									data: [<?php echo implode( ', ', $datapoints ); ?>],
 									trend: [<?php echo implode( ', ', $trendpoints ); ?>],
 								},
 							]
@@ -246,7 +246,7 @@ 
 							} );
 						};
 
-						var MonsterInsightsOverview<?php echo time();?> = new Chart( ctx, {
+						var MonsterInsightsOverview<?php echo time(); ?> = new Chart( ctx, {
 							type: 'LineWithLine',
 							data: data,
 							plugins: [
@@ -867,12 +867,12 @@ 
 						$countries = monsterinsights_get_country_list( true );
 						$i         = 1;
 						foreach ( $data['countries'] as $icountry => $countrydata ) {
-							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+							if ( ! empty( $countries[$countrydata['iso']] ) ) {
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[$countrydata['iso']] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							} else {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
-							$i ++;
+							$i++;
 						}
 						?>
 					</ul>
@@ -913,7 +913,7 @@ 
 							     . number_format_i18n( $referralsdata['sessions'] ) .
 							     '</span>' .
 							     '</li>';
-							$i ++;
+							$i++;
 						}
 						?>
 					</ul>
@@ -959,7 +959,7 @@ 
 							     number_format_i18n( $toppagesdata['sessions'] ) .
 							     '</span>' .
 							     '</li>';
-							$i ++;
+							$i++;
 						}
 						?>
 					</ul>

lite/includes/admin/dashboard-widget.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	public function __construct() {
 		// Allow dashboard widget to be hidden on multisite installs
-		$show_widget         = is_multisite() ? apply_filters( 'monsterinsights_show_dashboard_widget', true ) : true;
+		$show_widget = is_multisite() ? apply_filters( 'monsterinsights_show_dashboard_widget', true ) : true;
 		if ( ! $show_widget ) {
 			return false;
 		}
@@ -61,8 +61,8 @@ 
 
 		// Attept to place the widget at the top.
 		$normal_dashboard = $wp_meta_boxes['dashboard']['normal']['core'];
-		$widget_instance  = array( self::WIDGET_KEY => $normal_dashboard[ self::WIDGET_KEY ] );
-		unset( $normal_dashboard[ self::WIDGET_KEY ] );
+		$widget_instance  = array( self::WIDGET_KEY => $normal_dashboard[self::WIDGET_KEY] );
+		unset( $normal_dashboard[self::WIDGET_KEY] );
 		$sorted_dashboard                             = array_merge( $widget_instance, $normal_dashboard );
 		$wp_meta_boxes['dashboard']['normal']['core'] = $sorted_dashboard;
 	}