awesomemotive / google-analytics-for-wordpress

includes/admin/capabilities.php

Indentation +42 added lines, -42 removed lines

@@ -35,54 +35,54 @@
 function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
  
     switch( $cap ) {
-        case 'monsterinsights_view_dashboard' :
-            $roles = monsterinsights_get_option( 'view_reports', array() );
+	case 'monsterinsights_view_dashboard' :
+	    $roles = monsterinsights_get_option( 'view_reports', array() );
 
-            $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
-                            $user_can_via_settings = true;
-                            break;
-                        }
-                    }
-                }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                if ( user_can( $user_id, $roles ) ) {
-                    $user_can_via_settings = true;
-                }
-            }
+	    $user_can_via_settings = false;
+	    if ( ! empty( $roles ) && is_array( $roles ) ) {
+		foreach ( $roles as $role ) {
+		    if ( is_string( $role ) ) {
+			if ( user_can( $user_id, $role ) ) {
+			    $user_can_via_settings = true;
+			    break;
+			}
+		    }
+		}
+	    } else if ( ! empty( $roles ) && is_string( $roles ) ) {
+		if ( user_can( $user_id, $roles ) ) {
+		    $user_can_via_settings = true;
+		}
+	    }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
-                $caps = array();
-            }
+	    if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+		$caps = array();
+	    }
             
-            break;
-         case 'monsterinsights_save_settings' :
-            $roles = monsterinsights_get_option( 'save_settings', array() );
+	    break;
+	 case 'monsterinsights_save_settings' :
+	    $roles = monsterinsights_get_option( 'save_settings', array() );
 
-            $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
-                            $user_can_via_settings = true;
-                            break;
-                        }
-                    }
-                }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                 if ( user_can( $user_id, $roles ) ) {
-                    $user_can_via_settings = true;
-                }
-            }
+	    $user_can_via_settings = false;
+	    if ( ! empty( $roles ) && is_array( $roles ) ) {
+		foreach ( $roles as $role ) {
+		    if ( is_string( $role ) ) {
+			if ( user_can( $user_id, $role ) ) {
+			    $user_can_via_settings = true;
+			    break;
+			}
+		    }
+		}
+	    } else if ( ! empty( $roles ) && is_string( $roles ) ) {
+		 if ( user_can( $user_id, $roles ) ) {
+		    $user_can_via_settings = true;
+		}
+	    }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
-                $caps = array();
-            }
+	    if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+		$caps = array();
+	    }
 
-            break;
+	    break;
     }
     return $caps;
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
  */
 function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
  
-    switch( $cap ) {
+    switch ( $cap ) {
         case 'monsterinsights_view_dashboard' :
             $roles = monsterinsights_get_option( 'view_reports', array() );
 
@@ -86,4 +86,4 @@ 
     }
     return $caps;
 }
-add_filter( 'map_meta_cap','monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file
+add_filter( 'map_meta_cap', 'monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file

includes/admin/api-auth.php

Braces +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
 		add_action( 'admin_init',          							 array( $this, 'reauthenticate_listener' ) );
 	}
 
-	public function get_tt(){
+	public function get_tt() {
 		$tt = is_network_admin() ? get_site_option( 'monsterinsights_network_tt', '' ) : get_option( 'monsterinsights_site_tt', '' );
 		if ( empty( $tt ) ) {
 			// if TT is empty, generate a new one, save it and then return it
@@ -47,12 +47,12 @@ 
 		return $tt;
 	}
 	
-	public function rotate_tt(){
+	public function rotate_tt() {
 		$tt = $this->generate_tt();
 		is_network_admin() ? update_site_option( 'monsterinsights_network_tt', $tt ) : update_option( 'monsterinsights_site_tt', $tt );
 	}
 
-	public function generate_tt(){
+	public function generate_tt() {
 		return hash( 'sha512', wp_generate_password( 128, true, true ) . AUTH_SALT . uniqid( "", true ) );
 	}
 
@@ -61,7 +61,7 @@ 
 		return hash_equals( $tt, $passed_tt );
 	}
 
-	public function maybe_authenticate(){
+	public function maybe_authenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -106,7 +106,7 @@ 
 	}
 
 
-	public function authenticate_listener(){
+	public function authenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'auth' ) {
 			return;
@@ -175,7 +175,7 @@ 
 		exit;
 	}
 
-	public function maybe_reauthenticate(){
+	public function maybe_reauthenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -222,7 +222,7 @@ 
 		wp_send_json_success( array( 'redirect' => $siteurl ) );
 	}
 
-	public function reauthenticate_listener(){
+	public function reauthenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'reauth' ) {
 			return;
@@ -290,7 +290,7 @@ 
 		exit;
 	}
 
-	public function maybe_verify(){
+	public function maybe_verify() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -324,7 +324,7 @@ 
 		}
 	}
 
-	public function verify_auth( $credentials = array() ){
+	public function verify_auth( $credentials = array() ) {
 		$creds = ! empty( $credentials ) ? $credentials : ( $this->is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile( true ) : MonsterInsights()->auth->get_analytics_profile( true ) );
 
 		if ( empty( $creds['key'] ) ) {
@@ -341,7 +341,7 @@ 
 		}
 	}
 
-	public function maybe_delete(){
+	public function maybe_delete() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
@@ -381,7 +381,7 @@ 
 		}
 	}
 
-	public function delete_auth( $force = false ){
+	public function delete_auth( $force = false ) {
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
 			return false;
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {

Spacing +51 added lines, -51 removed lines

@@ -28,16 +28,16 @@ 
 	public function __construct() {
 
 		// Authentication Actions
-		add_action( 'wp_ajax_monsterinsights_maybe_authenticate',    array( $this, 'maybe_authenticate' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_reauthenticate',  array( $this, 'maybe_reauthenticate' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_verify',          array( $this, 'maybe_verify' ) );
-		add_action( 'wp_ajax_monsterinsights_maybe_delete',          array( $this, 'maybe_delete' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_authenticate', array( $this, 'maybe_authenticate' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_reauthenticate', array( $this, 'maybe_reauthenticate' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_verify', array( $this, 'maybe_verify' ) );
+		add_action( 'wp_ajax_monsterinsights_maybe_delete', array( $this, 'maybe_delete' ) );
 
-		add_action( 'admin_init',          							 array( $this, 'authenticate_listener' ) );
-		add_action( 'admin_init',          							 array( $this, 'reauthenticate_listener' ) );
+		add_action( 'admin_init', array( $this, 'authenticate_listener' ) );
+		add_action( 'admin_init', array( $this, 'reauthenticate_listener' ) );
 	}
 
-	public function get_tt(){
+	public function get_tt() {
 		$tt = is_network_admin() ? get_site_option( 'monsterinsights_network_tt', '' ) : get_option( 'monsterinsights_site_tt', '' );
 		if ( empty( $tt ) ) {
 			// if TT is empty, generate a new one, save it and then return it
@@ -47,12 +47,12 @@ 
 		return $tt;
 	}
 	
-	public function rotate_tt(){
+	public function rotate_tt() {
 		$tt = $this->generate_tt();
 		is_network_admin() ? update_site_option( 'monsterinsights_network_tt', $tt ) : update_option( 'monsterinsights_site_tt', $tt );
 	}
 
-	public function generate_tt(){
+	public function generate_tt() {
 		return hash( 'sha512', wp_generate_password( 128, true, true ) . AUTH_SALT . uniqid( "", true ) );
 	}
 
@@ -61,14 +61,14 @@ 
 		return hash_equals( $tt, $passed_tt );
 	}
 
-	public function maybe_authenticate(){
+	public function maybe_authenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can authenticate
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -78,14 +78,14 @@ 
 		// Only for Pro users, require a license key to be entered first so we can link to things.
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		// we do not have a current auth
 		if ( ! $this->is_network_admin() && MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot authenticate. Please re-authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot authenticate. Please re-authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( $this->is_network_admin() && MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot network authenticate. Please re-authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot network authenticate. Please re-authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$siteurl = add_query_arg( array(
@@ -106,7 +106,7 @@ 
 	}
 
 
-	public function authenticate_listener(){
+	public function authenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'auth' ) {
 			return;
@@ -124,12 +124,12 @@ 
 		}
 
 		// Make sure has required params
-		if ( empty( $_REQUEST['key'] )      ||
-			 empty( $_REQUEST['token'] )    ||
-			 empty( $_REQUEST['ua'] )       ||
-			 empty( $_REQUEST['miview'] )   ||
-			 empty( $_REQUEST['a'] )        ||
-			 empty( $_REQUEST['w'] )        ||
+		if ( empty( $_REQUEST['key'] ) ||
+			 empty( $_REQUEST['token'] ) ||
+			 empty( $_REQUEST['ua'] ) ||
+			 empty( $_REQUEST['miview'] ) ||
+			 empty( $_REQUEST['a'] ) ||
+			 empty( $_REQUEST['w'] ) ||
 			 empty( $_REQUEST['p'] )
 		) {
 			return;
@@ -166,7 +166,7 @@ 
 		$where = $this->is_network_admin() ? 'network' : 'site';
 		MonsterInsights()->reporting->delete_aggregate_data( $where );
 
-		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' )  : admin_url( 'admin.php?page=monsterinsights_settings' ) ;
+		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$url = add_query_arg( array(
 			 'mi_action' => 'auth',
 			 'success'   => 'true',
@@ -175,14 +175,14 @@ 
 		exit;
 	}
 
-	public function maybe_reauthenticate(){
+	public function maybe_reauthenticate() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can authenticate
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to re-authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to re-authenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -192,14 +192,14 @@ 
 		// Only for Pro users, require a license key to be entered first so we can link to things.
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		// we do have a current auth
 		if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot re-authenticate the network. Please authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot re-authenticate the network. Please authenticate on the network settings panel.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$siteurl = add_query_arg( array(
@@ -222,7 +222,7 @@ 
 		wp_send_json_success( array( 'redirect' => $siteurl ) );
 	}
 
-	public function reauthenticate_listener(){
+	public function reauthenticate_listener() {
 		// Make sure it's for us
 		if ( empty( $_REQUEST['mi-oauth-action'] ) || $_REQUEST['mi-oauth-action'] !== 'reauth' ) {
 			return;
@@ -240,10 +240,10 @@ 
 
 		// Make sure has required params
 		if (
-			 empty( $_REQUEST['ua'] )       ||
-			 empty( $_REQUEST['miview'] )   ||
-			 empty( $_REQUEST['a'] )        ||
-			 empty( $_REQUEST['w'] )        ||
+			 empty( $_REQUEST['ua'] ) ||
+			 empty( $_REQUEST['miview'] ) ||
+			 empty( $_REQUEST['a'] ) ||
+			 empty( $_REQUEST['w'] ) ||
 			 empty( $_REQUEST['p'] )       
 		) {
 			return;
@@ -281,7 +281,7 @@ 
 		$where = $this->is_network_admin() ? 'network' : 'site';
 		MonsterInsights()->reporting->delete_aggregate_data( $where );
 
-		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' )  : admin_url( 'admin.php?page=monsterinsights_settings' ) ;
+		$url = $this->is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 		$url = add_query_arg( array(
 			 'mi_action' => 'reauth',
 			 'success'   => 'true',
@@ -290,14 +290,14 @@ 
 		exit;
 	}
 
-	public function maybe_verify(){
+	public function maybe_verify() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can verify
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to verify MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to verify MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -306,25 +306,25 @@ 
 
 		// we have an auth to verify
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please authenticate.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot verify. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot verify. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$worked = $this->verify_auth();
-		if ( $worked && ! is_wp_error(  $worked ) ) {
+		if ( $worked && ! is_wp_error( $worked ) ) {
 			wp_send_json_success( array( 'message' => __( "Successfully verified.", 'google-analytics-for-wordpress' ) ) );
 		} else {
 			wp_send_json_error( array( 'message' => __( "Could not verify.", 'google-analytics-for-wordpress' ) ) );
 		}
 	}
 
-	public function verify_auth( $credentials = array() ){
+	public function verify_auth( $credentials = array() ) {
 		$creds = ! empty( $credentials ) ? $credentials : ( $this->is_network_admin() ? MonsterInsights()->auth->get_network_analytics_profile( true ) : MonsterInsights()->auth->get_analytics_profile( true ) );
 
 		if ( empty( $creds['key'] ) ) {
@@ -341,14 +341,14 @@ 
 		}
 	}
 
-	public function maybe_delete(){
+	public function maybe_delete() {
 
 		// Check nonce
 		check_ajax_referer( 'mi-admin-nonce', 'nonce' );
 
 		// current user can delete
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			wp_send_json_error( array(	'message' => __( "You don't have permission to deauthenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "You don't have permission to deauthenticate MonsterInsights.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		if ( ! empty( $_REQUEST['isnetwork'] ) && $_REQUEST['isnetwork'] ) {
@@ -357,20 +357,20 @@ 
 
 		// we have an auth to delete
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. You are not currently authed.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$valid = is_network_admin() ? MonsterInsights()->license->is_network_licensed() : MonsterInsights()->license->is_site_licensed();
 		if ( monsterinsights_is_pro_version() && ! $valid ) {
-			wp_send_json_error( array(	'message' => __( "Cannot deauthenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
+			wp_send_json_error( array( 'message' => __( "Cannot deauthenticate. Please enter a valid, active license key for MonsterInsights Pro into the settings.", 'google-analytics-for-wordpress' ) ) );
 		}
 
 		$force = ! empty( $_REQUEST['forcedelete'] ) && $_REQUEST['forcedelete'] === 'true';
 
 		$worked = $this->delete_auth( $force );
-		if ( $worked && ! is_wp_error(  $worked ) ) {
+		if ( $worked && ! is_wp_error( $worked ) ) {
 			wp_send_json_success( array( 'message' => __( "Successfully deauthenticated.", 'google-analytics-for-wordpress' ) ) );
 		} else {
 			if ( $force ) {
@@ -381,7 +381,7 @@ 
 		}
 	}
 
-	public function delete_auth( $force = false ){
+	public function delete_auth( $force = false ) {
 		if ( $this->is_network_admin() && ! MonsterInsights()->auth->is_network_authed() ) {
 			return false;
 		} else if ( ! $this->is_network_admin() && ! MonsterInsights()->auth->is_authed() ) {
@@ -425,15 +425,15 @@ 
 	}
 
 	public function get_sitei() {
-		$auth_key        = defined( 'AUTH_KEY' )        ? AUTH_KEY 		  : '';
+		$auth_key        = defined( 'AUTH_KEY' ) ? AUTH_KEY 		  : '';
 		$secure_auth_key = defined( 'SECURE_AUTH_KEY' ) ? SECURE_AUTH_KEY : '';
-		$logged_in_key   = defined( 'LOGGED_IN_KEY' )   ? LOGGED_IN_KEY   : '';
+		$logged_in_key   = defined( 'LOGGED_IN_KEY' ) ? LOGGED_IN_KEY   : '';
 
 		$sitei = $auth_key . $secure_auth_key . $logged_in_key;
-		$sitei = preg_replace('/[^a-zA-Z0-9]/', '', $sitei );
+		$sitei = preg_replace( '/[^a-zA-Z0-9]/', '', $sitei );
 		$sitei = sanitize_text_field( $sitei );
 		$sitei = trim( $sitei );
-		$sitei = ( strlen($sitei) > 30 ) ? substr($sitei, 0, 30 ) : $sitei;
+		$sitei = ( strlen( $sitei ) > 30 ) ? substr( $sitei, 0, 30 ) : $sitei;
 		return $sitei;
 	}
 }
\ No newline at end of file

includes/admin/reporting.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 	}
 
-	public function add_report( $report = false ){
+	public function add_report( $report = false ) {
 		if ( empty( $report ) || ! is_object( $report ) ) {
 			return;
 		}

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 	}
 
-	public function add_report( $report = false ){
+	public function add_report( $report = false ) {
 		if ( empty( $report ) || ! is_object( $report ) ) {
 			return;
 		}

includes/admin/reports/abstract-report.php

Braces +5 added lines, -5 removed lines

@@ -34,13 +34,13 @@ 
 	}
 
 	// Let's get the HTML to output for a particular report. This is not the AJAX endpoint. Args can hold things (generally start/end date range)
-	protected function get_report_html( $args = array() ) { 
+	protected function get_report_html( $args = array() ) {
 		/* Defined in the report class */ 
 		// For ajax, args start, end, and data will be set with the data to use. Else call $this->get_data( array( 'default' => true ) )
 		return ''; 
 	}
 
-	public function additional_data(){
+	public function additional_data() {
 		return array();
 	}
 
@@ -54,7 +54,7 @@ 
 			return monsterinsights_get_message( 'error', esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
 		}
 
-		if ( monsterinsights_get_option( 'dashboard_disabled', false ) ) { 
+		if ( monsterinsights_get_option( 'dashboard_disabled', false ) ) {
 			if ( current_user_can( 'monsterinsights_save_settings' ) ) {
 				$url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_settings' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 				return monsterinsights_get_message( 'error',
@@ -69,7 +69,7 @@ 
 			}
 		}
 
-		if ( monsterinsights_is_pro_version() ){
+		if ( monsterinsights_is_pro_version() ) {
 			if ( ! MonsterInsights()->license->has_license() ) {
 				$url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_settings' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 				return monsterinsights_get_message( 'error', esc_html__( 'You do not have an active license. Please %1$scheck your license configuration.%2$s', 'google-analytics-for-wordpress' ),'<a href="' . $url . '">','</a>' );
@@ -351,7 +351,7 @@ 
 if ( ! class_exists( 'MonsterInsightsDateTime' ) ) {
 	class MonsterInsightsDateTime extends DateTime {
 		public static function createFromFormat( $format, $time, $timezone = null ) {
-			if ( ! $timezone ) { 
+			if ( ! $timezone ) {
 				$timezone = new DateTimeZone( date_default_timezone_get() );
 			}
 			if ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {

Spacing +33 added lines, -33 removed lines

@@ -30,7 +30,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function __construct() {
-		add_filter( 'monsterinsights_reports_abstract_get_data_pre_cache', array( $this, 'requirements' ), 10 , 3 );
+		add_filter( 'monsterinsights_reports_abstract_get_data_pre_cache', array( $this, 'requirements' ), 10, 3 );
 	}
 
 	// Let's get the HTML to output for a particular report. This is not the AJAX endpoint. Args can hold things (generally start/end date range)
@@ -40,7 +40,7 @@ 
 		return ''; 
 	}
 
-	public function additional_data(){
+	public function additional_data() {
 		return array();
 	}
 
@@ -51,7 +51,7 @@ 
 	public function show_report( $args = array() ) {
 
 		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return monsterinsights_get_message( 'error', esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+			return monsterinsights_get_message( 'error', esc_html__( 'Access denied', 'google-analytics-for-wordpress' ) );
 		}
 
 		if ( monsterinsights_get_option( 'dashboard_disabled', false ) ) { 
@@ -69,10 +69,10 @@ 
 			}
 		}
 
-		if ( monsterinsights_is_pro_version() ){
+		if ( monsterinsights_is_pro_version() ) {
 			if ( ! MonsterInsights()->license->has_license() ) {
 				$url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_settings' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-				return monsterinsights_get_message( 'error', esc_html__( 'You do not have an active license. Please %1$scheck your license configuration.%2$s', 'google-analytics-for-wordpress' ),'<a href="' . $url . '">','</a>' );
+				return monsterinsights_get_message( 'error', esc_html__( 'You do not have an active license. Please %1$scheck your license configuration.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' );
 			} else if ( MonsterInsights()->license->license_has_error() ) {
 				return monsterinsights_get_message( 'error', $this->get_license_error() );
 			}
@@ -107,13 +107,13 @@ 
 			return monsterinsights_get_message( 'error', $args['error'] );
 		}
 
-		if ( empty( $args['data' ] ) || ! is_array( $args['data' ] ) ) {
+		if ( empty( $args['data'] ) || ! is_array( $args['data'] ) ) {
 			if ( monsterinsights_is_pro_version() ) {
 				return '';
 			} else {
 				// Try to get default data.
 				$args = $this->get_data( array( 'default' => true ) );
-				if ( empty( $args['data'] ) || is_array( $args['data' ] ) ) {
+				if ( empty( $args['data'] ) || is_array( $args['data'] ) ) {
 					return monsterinsights_get_message( 'error', __( 'No data found', 'google-analytics-for-wordpress' ) );
 				}
 
@@ -147,7 +147,7 @@ 
 		}
 		
 		$start = ! empty( $args['start'] ) && $this->is_valid_date( $args['start'] ) ? $args['start'] : '';
-		$end   = ! empty( $args['end'] )   && $this->is_valid_date( $args['end'] )   ? $args['end']   : '';
+		$end   = ! empty( $args['end'] ) && $this->is_valid_date( $args['end'] ) ? $args['end'] : '';
 
 		if ( ! MonsterInsights()->license->license_can( $this->level ) ) {
 			return array(
@@ -202,11 +202,11 @@ 
 				$data = ! $site_auth && $ms_auth ? get_site_transient( $transient ) : get_transient( $transient );
 			}
 
-			if ( ! empty( $data )             &&
-				 ! empty( $data['expires'] )  &&
+			if ( ! empty( $data ) &&
+				 ! empty( $data['expires'] ) &&
 				   $data['expires'] >= time() &&
-				 ! empty( $data['data'] )     && 
-				 ! empty( $data['p'] )        && 
+				 ! empty( $data['data'] ) && 
+				 ! empty( $data['p'] ) && 
 				   $data['p'] === $p
 			) {
 				return array(
@@ -216,12 +216,12 @@ 
 			}
 
 			// Nothing in cache, either not saved before, expired or mismatch. Let's grab from API
-			$api_options = array( 'start' => $start, 'end' => $end);
+			$api_options = array( 'start' => $start, 'end' => $end );
 			if ( ! $site_auth && $ms_auth ) {
 				$api_options['network'] = true;
 			}
 			
-			$api   = new MonsterInsights_API_Request( 'analytics/reports/' . $this->name . '/', $api_options, 'GET' );
+			$api = new MonsterInsights_API_Request( 'analytics/reports/' . $this->name . '/', $api_options, 'GET' );
 
 			$additional_data = $this->additional_data();
 			
@@ -229,7 +229,7 @@ 
 				$api->set_additional_data( $additional_data );
 			}
 			
-			$ret   = $api->request();
+			$ret = $api->request();
 			//echo print_r( $ret['data']);wp_die();
 			
 			if ( is_wp_error( $ret ) ) {
@@ -290,44 +290,44 @@ 
 	// Is a valid date value
 	public function is_valid_date( $date = '' ) {
 		$d = MonsterInsightsDateTime::createFromFormat( 'Y-m-d', $date );
-		return $d && $d->format('Y-m-d') === $date;
+		return $d && $d->format( 'Y-m-d' ) === $date;
 	}
 
 	/**
 	 * Do not use the functions below this. They are unused and are just here so people
 	 * with out of date MonsterInsights addons won't get fatal errors.
 	 */
-	protected function get_api_max_limit() {return 300;}
-	protected function get_date_range() {return array();}
+	protected function get_api_max_limit() {return 300; }
+	protected function get_date_range() {return array(); }
 
 	public function get_upsell_notice() {
 		$has_level = MonsterInsights()->license->get_license_type();
 		$has_level = $has_level ? $has_level : 'lite';
 		$message = sprintf( __( 'You currently have a %s level license, but this report requires at least a %s level license to view the %s. Please upgrade to view this report.', 'google-analytics-for-wordpress' ), $has_level, $this->level, $this->title );
-		ob_start();?>
-		<div class="monsterinsights-upsell-report-container monsterinsights-upsell-report-<?php echo $this->name;?>-bg">
+		ob_start(); ?>
+		<div class="monsterinsights-upsell-report-container monsterinsights-upsell-report-<?php echo $this->name; ?>-bg">
 			<div class="monsterinsights-upsell-container">
 		  		<div class="row justify-content-center">
 					<div class="col-lg-10 col-lg-offset-1 align-self-center">
 						<div class="monsterinsights-upsell-card">
-							  <img class="monsterinsights-upgrade-mascot" src="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL );?>assets/css/images/mascot.png" srcset="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL );?>assets/css/images/mascot@2x.png 2x" alt="">
+							  <img class="monsterinsights-upgrade-mascot" src="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ); ?>assets/css/images/mascot.png" srcset="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ); ?>assets/css/images/mascot@2x.png 2x" alt="">
 								<div class="monsterinsights-upsell-card-card-content">
-								  <span class="monsterinsights-upsell-card-title"><?php esc_html_e( 'Ready to Get Analytics Super-Powers?', 'google-analytics-for-wordpress' );?></span>
-								  <p class="monsterinsights-upsell-card-subtitle"><strong><?php esc_html_e( '(And Crush Your Competition?)', 'google-analytics-for-wordpress' );?></strong></p> &nbsp;
+								  <span class="monsterinsights-upsell-card-title"><?php esc_html_e( 'Ready to Get Analytics Super-Powers?', 'google-analytics-for-wordpress' ); ?></span>
+								  <p class="monsterinsights-upsell-card-subtitle"><strong><?php esc_html_e( '(And Crush Your Competition?)', 'google-analytics-for-wordpress' ); ?></strong></p> &nbsp;
 								  <?php if ( monsterinsights_is_pro_version() ) { ?>
 									  <p ><?php echo sprintf( esc_html__( "Hey there! It looks like you've got the %s license installed on your site.
-									  That's awesome! %s",'google-analytics-for-wordpress'), $has_level, '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
+									  That's awesome! %s",'google-analytics-for-wordpress' ), $has_level, '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
 									   &nbsp;
-									  <p><?php echo sprintf( esc_html__( "Do you you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with %s level%s of our paid packages. You'll need to upgrade your license to get instant access.",'google-analytics-for-wordpress'), '<strong>' . $this->title, '</strong>','<a href="https://monsterinsights.com/my-account/">' . $this->level,'</a>' ); ?></p>
-									   &nbsp;<p><?php echo sprintf( esc_html__( "It's easy! To upgrade, navigate to %sMy Account%s on MonsterInsights.com, go to the licenses tab, and click upgrade. We also have a %sstep by step guide%s with pictures of this process.",'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/my-account/?utm_source=wpdashboard&utm_campaign=reportupsellpro"><strong>','</strong></a>', '<a href="https://www.monsterinsights.com/docs/upgrade-monsterinsights-license/" style="text-decoration:underline !important">', '</a>' ); ?></p>
-									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress');?></p>
+									  <p><?php echo sprintf( esc_html__( "Do you you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with %s level%s of our paid packages. You'll need to upgrade your license to get instant access.", 'google-analytics-for-wordpress' ), '<strong>' . $this->title, '</strong>', '<a href="https://monsterinsights.com/my-account/">' . $this->level, '</a>' ); ?></p>
+									   &nbsp;<p><?php echo sprintf( esc_html__( "It's easy! To upgrade, navigate to %sMy Account%s on MonsterInsights.com, go to the licenses tab, and click upgrade. We also have a %sstep by step guide%s with pictures of this process.", 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/my-account/?utm_source=wpdashboard&utm_campaign=reportupsellpro"><strong>', '</strong></a>', '<a href="https://www.monsterinsights.com/docs/upgrade-monsterinsights-license/" style="text-decoration:underline !important">', '</a>' ); ?></p>
+									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress' ); ?></p>
 									<?php } else { ?>
 									   <p><?php echo sprintf( esc_html__( "Hey there! %s It looks like you've got the free version of MonsterInsights installed on your site.
-									  That's awesome!",'google-analytics-for-wordpress'), '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
+									  That's awesome!",'google-analytics-for-wordpress' ), '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
 									   &nbsp;
-									  <p><?php echo sprintf( esc_html__( "Do you you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with %s level%s of our paid packages. To get instant access, you'll want to buy a MonsterInsights license, which also gives you access to powerful addons, expanded reporting (including the ability to use custom date ranges), comprehensive tracking features (like UserID tracking) and access to our world-class support team.",'google-analytics-for-wordpress'), '<strong>' . $this->title, '</strong>','<a href="https://monsterinsights.com/lite/">' . $this->level,'</a>' ); ?></p>
-									   &nbsp;<p><?php echo sprintf( esc_html__( "Upgrading is easy! To upgrade, navigate to %sour pricing page%s, purchase the required license, and then follow the %sinstructions in the email receipt%s to upgrade. It only takes a few minutes to unlock the most powerful, yet easy to use analytics tracking system for WordPress.",'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=reportupselllite"><strong>', '</strong></a>','<a style="text-decoration:underline !important" href="https://www.monsterinsights.com/docs/go-lite-pro/">', '</a>' ); ?></p>
-									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress');?></p>
+									  <p><?php echo sprintf( esc_html__( "Do you you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with %s level%s of our paid packages. To get instant access, you'll want to buy a MonsterInsights license, which also gives you access to powerful addons, expanded reporting (including the ability to use custom date ranges), comprehensive tracking features (like UserID tracking) and access to our world-class support team.", 'google-analytics-for-wordpress' ), '<strong>' . $this->title, '</strong>', '<a href="https://monsterinsights.com/lite/">' . $this->level, '</a>' ); ?></p>
+									   &nbsp;<p><?php echo sprintf( esc_html__( "Upgrading is easy! To upgrade, navigate to %sour pricing page%s, purchase the required license, and then follow the %sinstructions in the email receipt%s to upgrade. It only takes a few minutes to unlock the most powerful, yet easy to use analytics tracking system for WordPress.", 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=reportupselllite"><strong>', '</strong></a>', '<a style="text-decoration:underline !important" href="https://www.monsterinsights.com/docs/go-lite-pro/">', '</a>' ); ?></p>
+									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress' ); ?></p>
 									<?php } ?>
 								</div>
 								<div class="monsterinsights-upsell-card-action">
@@ -352,9 +352,9 @@ 
     		return '';
     	} else {
     		if ( ! empty( $data['reportprevrange'] ) && ! empty( $data['reportprevrange']['startDate'] ) && ! empty( $data['reportprevrange']['endDate'] ) ) {
-    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) .'%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '%26_u.date10%3D' . str_replace( '-', '', $data['reportprevrange']['startDate'] ) .'%26_u.date11%3D' . str_replace( '-', '', $data['reportprevrange']['endDate'] ) . '/';
+    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) . '%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '%26_u.date10%3D' . str_replace( '-', '', $data['reportprevrange']['startDate'] ) . '%26_u.date11%3D' . str_replace( '-', '', $data['reportprevrange']['endDate'] ) . '/';
     		} else {
-    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) .'%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '/';
+    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) . '%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '/';
     		}
     	}
     }

includes/admin/licensing/license-actions.php

Indentation +195 added lines, -195 removed lines

@@ -47,27 +47,27 @@ 
      * @since 6.0.0
      */
     public function __construct() {
-        add_action( 'admin_init', array( $this, 'admin_init' ) );
+	add_action( 'admin_init', array( $this, 'admin_init' ) );
     }
     
     public function admin_init() {
-        // Possibly verify the key.
-        $this->maybe_verify_key();
-
-        // Add potential admin notices for actions around the admin.
-        add_action( 'admin_notices', array( $this, 'monsterinsights_notices' ), 11 );
-        add_action( 'network_admin_notices', array( $this, 'monsterinsights_notices' ), 11 );
-
-        // Grab the license key. If it is not set (even after verification), return early.
-        $this->key = is_network_admin() ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
-        if ( ! $this->key ) {
-            return;
-        }
-
-        // Possibly handle validating, deactivating and refreshing license keys.
-        $this->maybe_validate_key();
-        $this->maybe_deactivate_key();
-        $this->maybe_refresh_key();
+	// Possibly verify the key.
+	$this->maybe_verify_key();
+
+	// Add potential admin notices for actions around the admin.
+	add_action( 'admin_notices', array( $this, 'monsterinsights_notices' ), 11 );
+	add_action( 'network_admin_notices', array( $this, 'monsterinsights_notices' ), 11 );
+
+	// Grab the license key. If it is not set (even after verification), return early.
+	$this->key = is_network_admin() ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
+	if ( ! $this->key ) {
+	    return;
+	}
+
+	// Possibly handle validating, deactivating and refreshing license keys.
+	$this->maybe_validate_key();
+	$this->maybe_deactivate_key();
+	$this->maybe_refresh_key();
     }
 
     /**
@@ -79,19 +79,19 @@ 
      */
     public function maybe_verify_key() {
 
-        if ( empty( $_POST['monsterinsights-license-key'] ) || strlen( $_POST['monsterinsights-license-key'] ) < 10 || empty( $_POST['monsterinsights-verify-submit'] ) ) {
-            return;
-        }
+	if ( empty( $_POST['monsterinsights-license-key'] ) || strlen( $_POST['monsterinsights-license-key'] ) < 10 || empty( $_POST['monsterinsights-verify-submit'] ) ) {
+	    return;
+	}
 
-        if ( ! wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' ) ) {
-            return;
-        }
+	if ( ! wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' ) ) {
+	    return;
+	}
 
-        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-            return;
-        }
+	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	    return;
+	}
 
-        $this->verify_key();
+	$this->verify_key();
 
     }
 
@@ -102,32 +102,32 @@ 
      */
     public function verify_key() {
 
-        // Perform a request to verify the key.
-        $verify = $this->perform_remote_request( 'verify-key', array( 'tgm-updater-key' => trim( $_POST['monsterinsights-license-key'] ) ) );
-
-        // If it returns false, send back a generic error message and return.
-        if ( ! $verify ) {
-            $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
-            return;
-        }
-
-        // If an error is returned, set the error and return.
-        if ( ! empty( $verify->error ) ) {
-            $this->errors[] = $verify->error;
-            return;
-        }
-
-        // Otherwise, our request has been done successfully. Update the option and set the success message.
-        $option                = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
-        $option['key']         = trim( $_POST['monsterinsights-license-key'] );
-        $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
-        $option['is_expired']  = false;
-        $option['is_disabled'] = false;
-        $option['is_invalid']  = false;
-        $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
-        is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
-        delete_transient( '_monsterinsights_addons' );
-        monsterinsights_get_addons_data( $option['key'] );
+	// Perform a request to verify the key.
+	$verify = $this->perform_remote_request( 'verify-key', array( 'tgm-updater-key' => trim( $_POST['monsterinsights-license-key'] ) ) );
+
+	// If it returns false, send back a generic error message and return.
+	if ( ! $verify ) {
+	    $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+	    return;
+	}
+
+	// If an error is returned, set the error and return.
+	if ( ! empty( $verify->error ) ) {
+	    $this->errors[] = $verify->error;
+	    return;
+	}
+
+	// Otherwise, our request has been done successfully. Update the option and set the success message.
+	$option                = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
+	$option['key']         = trim( $_POST['monsterinsights-license-key'] );
+	$option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
+	$option['is_expired']  = false;
+	$option['is_disabled'] = false;
+	$option['is_invalid']  = false;
+	$this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
+	is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
+	delete_transient( '_monsterinsights_addons' );
+	monsterinsights_get_addons_data( $option['key'] );
     }
 
     /**
@@ -138,10 +138,10 @@ 
      * @return null Return early if the transient has not expired yet.
      */
     public function maybe_validate_key() {
-        $check = is_network_admin() ? MonsterInsights()->license->time_to_check_network_license() : MonsterInsights()->license->time_to_check_site_license();
-        if ( $check ) {
-            $this->validate_key();
-        }
+	$check = is_network_admin() ? MonsterInsights()->license->time_to_check_network_license() : MonsterInsights()->license->time_to_check_site_license();
+	if ( $check ) {
+	    $this->validate_key();
+	}
     }
 
     /**
@@ -153,58 +153,58 @@ 
      */
     public function validate_key( $forced = false ) {
 
-        $validate = $this->perform_remote_request( 'validate-key', array( 'tgm-updater-key' => $this->key ) );
-
-        // If there was a basic API error in validation, only set the transient for 10 minutes before retrying.
-        if ( ! $validate ) {
-            // If forced, set contextual success message.
-            if ( $forced ) {
-                $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
-            }
-            return;
-        }
-
-        $option = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
-        $option['is_expired']  = false;
-        $option['is_disabled'] = false;
-        $option['is_invalid']  = false;
-
-        // If a key or author error is returned, the license no longer exists or the user has been deleted, so reset license.
-        if ( isset( $validate->key ) || isset( $validate->author ) ) {
-            $option['is_invalid']  = true;
-            is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
-            return;
-        }
-
-        // If the license has expired, set the transient and expired flag and return.
-        if ( isset( $validate->expired ) ) {
-            $option['is_expired']  = true;
-            is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
-            return;
-        }
-
-        // If the license is disabled, set the transient and disabled flag and return.
-        if ( isset( $validate->disabled ) ) {
-            $option['is_disabled'] = true;
-            is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
-            return;
-        }
-
-        // If forced, set contextual success message.
-        if ( ( ! empty( $validate->key ) || ! empty( $this->key ) ) && $forced ) {
-            $key = ! empty( $validate->key ) ? $validate->key : $this->key;
-            delete_transient( '_monsterinsights_addons' );
-            monsterinsights_get_addons_data( $key );
-            $this->success[] = esc_html__( 'Congratulations! Your key has been refreshed successfully.', 'google-analytics-for-wordpress' );
-        }
-
-        $option = array();
-        $option = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
-        $option['type']        = isset( $validate->type ) ? $validate->type : $option['type'];
-        $option['is_expired']  = false;
-        $option['is_disabled'] = false;
-        $option['is_invalid']  = false;
-        is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
+	$validate = $this->perform_remote_request( 'validate-key', array( 'tgm-updater-key' => $this->key ) );
+
+	// If there was a basic API error in validation, only set the transient for 10 minutes before retrying.
+	if ( ! $validate ) {
+	    // If forced, set contextual success message.
+	    if ( $forced ) {
+		$this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+	    }
+	    return;
+	}
+
+	$option = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
+	$option['is_expired']  = false;
+	$option['is_disabled'] = false;
+	$option['is_invalid']  = false;
+
+	// If a key or author error is returned, the license no longer exists or the user has been deleted, so reset license.
+	if ( isset( $validate->key ) || isset( $validate->author ) ) {
+	    $option['is_invalid']  = true;
+	    is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
+	    return;
+	}
+
+	// If the license has expired, set the transient and expired flag and return.
+	if ( isset( $validate->expired ) ) {
+	    $option['is_expired']  = true;
+	    is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
+	    return;
+	}
+
+	// If the license is disabled, set the transient and disabled flag and return.
+	if ( isset( $validate->disabled ) ) {
+	    $option['is_disabled'] = true;
+	    is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
+	    return;
+	}
+
+	// If forced, set contextual success message.
+	if ( ( ! empty( $validate->key ) || ! empty( $this->key ) ) && $forced ) {
+	    $key = ! empty( $validate->key ) ? $validate->key : $this->key;
+	    delete_transient( '_monsterinsights_addons' );
+	    monsterinsights_get_addons_data( $key );
+	    $this->success[] = esc_html__( 'Congratulations! Your key has been refreshed successfully.', 'google-analytics-for-wordpress' );
+	}
+
+	$option = array();
+	$option = is_network_admin() ? MonsterInsights()->license->get_network_license() : MonsterInsights()->license->get_site_license();
+	$option['type']        = isset( $validate->type ) ? $validate->type : $option['type'];
+	$option['is_expired']  = false;
+	$option['is_disabled'] = false;
+	$option['is_invalid']  = false;
+	is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
 
     }
 
@@ -217,19 +217,19 @@ 
      */
     public function maybe_deactivate_key() {
 
-        if ( empty( $_POST['monsterinsights-license-key'] ) || empty( $_POST['monsterinsights-deactivate-submit'] ) ) {
-            return;
-        }
+	if ( empty( $_POST['monsterinsights-license-key'] ) || empty( $_POST['monsterinsights-deactivate-submit'] ) ) {
+	    return;
+	}
 
-        if ( ! wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' ) ) {
-            return;
-        }
+	if ( ! wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' ) ) {
+	    return;
+	}
 
-        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-            return;
-        }
+	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	    return;
+	}
 
-        $this->deactivate_key();
+	$this->deactivate_key();
 
     }
 
@@ -240,24 +240,24 @@ 
      */
     public function deactivate_key() {
 
-        // Perform a request to deactivate the key.
-        $deactivate = $this->perform_remote_request( 'deactivate-key', array( 'tgm-updater-key' => $_POST['monsterinsights-license-key'] ) );
+	// Perform a request to deactivate the key.
+	$deactivate = $this->perform_remote_request( 'deactivate-key', array( 'tgm-updater-key' => $_POST['monsterinsights-license-key'] ) );
 
-        // If it returns false, send back a generic error message and return.
-        if ( ! $deactivate ) {
-            $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
-            return;
-        }
+	// If it returns false, send back a generic error message and return.
+	if ( ! $deactivate ) {
+	    $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+	    return;
+	}
 
-        // If an error is returned, set the error and return.
-        if ( ! empty( $deactivate->error ) && ! monsterinsights_is_debug_mode() ) {
-            $this->errors[] = $deactivate->error;
-            return;
-        }
+	// If an error is returned, set the error and return.
+	if ( ! empty( $deactivate->error ) && ! monsterinsights_is_debug_mode() ) {
+	    $this->errors[] = $deactivate->error;
+	    return;
+	}
 
-        // Otherwise, our request has been done successfully. Reset the option and set the success message.
-        $this->success[] = isset( $deactivate->success ) ? $deactivate->success : esc_html__( 'Congratulations! You have deactivated the key from this site successfully.', 'google-analytics-for-wordpress' );
-        is_network_admin() ? MonsterInsights()->license->delete_network_license() : MonsterInsights()->license->delete_site_license();
+	// Otherwise, our request has been done successfully. Reset the option and set the success message.
+	$this->success[] = isset( $deactivate->success ) ? $deactivate->success : esc_html__( 'Congratulations! You have deactivated the key from this site successfully.', 'google-analytics-for-wordpress' );
+	is_network_admin() ? MonsterInsights()->license->delete_network_license() : MonsterInsights()->license->delete_site_license();
 
     }
 
@@ -270,20 +270,20 @@ 
      */
     public function maybe_refresh_key() {
 
-        if ( empty( $_POST['monsterinsights-license-key'] ) || empty( $_POST['monsterinsights-refresh-submit'] ) ) {
-            return;
-        }
+	if ( empty( $_POST['monsterinsights-license-key'] ) || empty( $_POST['monsterinsights-refresh-submit'] ) ) {
+	    return;
+	}
 
-        if ( ! wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' ) ) {
-            return;
-        }
+	if ( ! wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' ) ) {
+	    return;
+	}
 
-        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-            return;
-        }
+	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	    return;
+	}
 
-        // Refreshing is simply a word alias for validating a key. Force true to set contextual messages.
-        $this->validate_key( true );
+	// Refreshing is simply a word alias for validating a key. Force true to set contextual messages.
+	$this->validate_key( true );
 
     }
 
@@ -293,16 +293,16 @@ 
      * @since 7.0.0
      */
     public function monsterinsights_notices() {
-        if ( ! monsterinsights_is_pro_version() ) {
-            return;
-        }
+	if ( ! monsterinsights_is_pro_version() ) {
+	    return;
+	}
 
-        $screen = get_current_screen();
-        if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-            return;
-        }
+	$screen = get_current_screen();
+	if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
+	    return;
+	}
 
-        if ( ! empty( $this->errors ) ) { ?>
+	if ( ! empty( $this->errors ) ) { ?>
             <div class="error">
                 <p><?php echo implode( '<br>', $this->errors ); ?></p>
             </div>
@@ -326,46 +326,46 @@ 
      */
     public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
 
-        // Build the body of the request.
-        $body = wp_parse_args(
-            $body,
-            array(
-                'tgm-updater-action'     => $action,
-                'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
-                'tgm-updater-referer'    => site_url(),
-                'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
-                'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
-            )
-        );
-        $body = http_build_query( $body, '', '&' );
-
-        // Build the headers of the request.
-        $headers = wp_parse_args(
-            $headers,
-            array(
-                'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
-            )
-        );
-
-        // Setup variable for wp_remote_post.
-        $post = array(
-            'headers' => $headers,
-            'body'    => $body
-        );
-
-        // Perform the query and retrieve the response.
-        $response      = wp_remote_post( monsterinsights_get_licensing_url(), $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
-
-        // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
-            return false;
-        }
-
-        // Return the json decoded content.
-        return json_decode( $response_body );
+	// Build the body of the request.
+	$body = wp_parse_args(
+	    $body,
+	    array(
+		'tgm-updater-action'     => $action,
+		'tgm-updater-key'        => $this->key,
+		'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+		'tgm-updater-referer'    => site_url(),
+		'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
+		'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
+	    )
+	);
+	$body = http_build_query( $body, '', '&' );
+
+	// Build the headers of the request.
+	$headers = wp_parse_args(
+	    $headers,
+	    array(
+		'Content-Type'   => 'application/x-www-form-urlencoded',
+		'Content-Length' => strlen( $body )
+	    )
+	);
+
+	// Setup variable for wp_remote_post.
+	$post = array(
+	    'headers' => $headers,
+	    'body'    => $body
+	);
+
+	// Perform the query and retrieve the response.
+	$response      = wp_remote_post( monsterinsights_get_licensing_url(), $post );
+	$response_code = wp_remote_retrieve_response_code( $response );
+	$response_body = wp_remote_retrieve_body( $response );
+
+	// Bail out early if there are any errors.
+	if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+	    return false;
+	}
+
+	// Return the json decoded content.
+	return json_decode( $response_body );
     }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -171,14 +171,14 @@
 
         // If a key or author error is returned, the license no longer exists or the user has been deleted, so reset license.
         if ( isset( $validate->key ) || isset( $validate->author ) ) {
-            $option['is_invalid']  = true;
+            $option['is_invalid'] = true;
             is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
             return;
         }
 
         // If the license has expired, set the transient and expired flag and return.
         if ( isset( $validate->expired ) ) {
-            $option['is_expired']  = true;
+            $option['is_expired'] = true;
             is_network_admin() ? MonsterInsights()->license->set_network_license( $option ) : MonsterInsights()->license->set_site_license( $option );
             return;
         }

includes/admin/settings/tab-tracking.php

Indentation +46 added lines, -46 removed lines

@@ -29,65 +29,65 @@ 
         <!-- Tabs -->
         <h1 id="monsterinsights-settings-page-sub-nav" class="monsterinsights-sub-nav-container monsterinsights-nav-container" data-container="#monsterinsights-settings-sub-pages">
             <?php 
-            $i      = 0;
-            $class  = '';
-            $is_pro = monsterinsights_is_pro_version();
-            foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
-                if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
-                    continue;
-                }
-                $class = ( 0 === $i ? 'monsterinsights-active' : '' );
-                ?>
+	    $i      = 0;
+	    $class  = '';
+	    $is_pro = monsterinsights_is_pro_version();
+	    foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
+		if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
+		    continue;
+		}
+		$class = ( 0 === $i ? 'monsterinsights-active' : '' );
+		?>
                 <a class="monsterinsights-sub-nav-item monsterinsights-nav-item monstericon-<?php echo esc_attr( $id ); ?> <?php echo esc_attr( $class ); ?>" href="#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" title="<?php echo esc_attr( $item['title'] ); ?>">
                     <?php echo esc_html( $item['title'] ); ?>
                 </a>
                 <?php 
-                $i++; 
-            }
-            ?>
+		$i++; 
+	    }
+	    ?>
         </h1>
 
         <h1 class="monsterinsights-hideme"></h1><!-- so wp notices are below the nav bar -->
 
         <?php 
-        // Output any notices now
-        /** 
-         * 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.
-         */
-        do_action( 'monsterinsights_settings_tracking_tab_notice' );
-        ?>
+	// Output any notices now
+	/** 
+	 * 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.
+	 */
+	do_action( 'monsterinsights_settings_tracking_tab_notice' );
+	?>
 
         <!-- Tab Panels -->
         <div id="monsterinsights-settings-sub-pages" class="monsterinsights-sub-nav-tabs monsterinsights-nav-tabs" data-navigation="#monsterinsights-settings-page-sub-nav">
             <?php 
-            $i = 0; 
-            foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
-                if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
-                    continue;
-                }
-                $class = ( 0 === $i ? ' monsterinsights-active' : '' ); 
-                $i++;
-                ?>
+	    $i = 0; 
+	    foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
+		if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
+		    continue;
+		}
+		$class = ( 0 === $i ? ' monsterinsights-active' : '' ); 
+		$i++;
+		?>
                  <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
                     <?php if ( $item['level'] === 'lite' ||  $is_pro ) { ?>
                     <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
                     <?php } ?>
                      <div class="monsterinsights-subtab-settings-notices">
                         <?php 
-                        // Output any notices now
-                        /** 
-                         * 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.
-                         */
-                        do_action( 'monsterinsights_tracking_' . $id . '_tab_notice' );
-                        ?>
+			// Output any notices now
+			/** 
+			 * 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.
+			 */
+			do_action( 'monsterinsights_tracking_' . $id . '_tab_notice' );
+			?>
                     </div>
                     <!-- Settings Form -->
                     <?php $class = ( $item['level'] !== 'lite' && ! $is_pro ) ? 'monsterinsights-no-settings-shown' : ''; ?>
@@ -95,10 +95,10 @@ 
                         <table class="form-table">
                             <tbody>
                                 <?php
-                                //do_action( 'monsterinsights_settings_tab_top_' . $id  );
-                                echo monsterinsights_get_section_settings( $id, 'tracking' );
-                                //do_action( 'monsterinsights_settings_tab_bottom_' . $id  );
-                                ?>
+				//do_action( 'monsterinsights_settings_tab_top_' . $id  );
+				echo monsterinsights_get_section_settings( $id, 'tracking' );
+				//do_action( 'monsterinsights_settings_tab_bottom_' . $id  );
+				?>
                             </tbody>
                         </table>
                         <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
@@ -111,8 +111,8 @@ 
                     </form>
                 </div>
                 <?php
-            }
-            ?>
+	    }
+	    ?>
         </div>
     </div>
     <?php

Spacing +3 added lines, -3 removed lines

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

includes/admin/settings/tab-general.php

Indentation +57 added lines, -57 removed lines

@@ -29,26 +29,26 @@ 
     <div id="monsterinsights-settings-general">
         <div class="monsterinsights-tab-settings-notices">
         <?php 
-        // Output any notices now
-        /** 
-         * 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.
-         */
-        do_action( 'monsterinsights_settings_general_tab_notice' );
-        ?>
+	// Output any notices now
+	/** 
+	 * 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.
+	 */
+	do_action( 'monsterinsights_settings_general_tab_notice' );
+	?>
         </div>
         <table class="form-table">
             <tbody>
                 <?php if ( monsterinsights_is_pro_version() ) {
-                    $license_key  = MonsterInsights()->license->get_site_license_key();
-                    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_network_license_key();
-                    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
+		    $license_key  = MonsterInsights()->license->get_site_license_key();
+		    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_network_license_key();
+		    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
 
-                    $license_type = MonsterInsights()->license->get_site_license_type();
-                    ?>
+		    $license_type = MonsterInsights()->license->get_site_license_type();
+		    ?>
                     <tr id="monsterinsights-settings-key-box">
                         <th scope="row">
                             <label for="monsterinsights-settings-key"><?php esc_html_e( 'License Key', 'google-analytics-for-wordpress' ); ?></label>
@@ -154,10 +154,10 @@ 
                     <?php } ?>
 
                     <?php 
-                    $manual_ua = MonsterInsights()->auth->get_manual_ua();
-                    $auth_ua   = MonsterInsights()->auth->get_ua();
+		    $manual_ua = MonsterInsights()->auth->get_manual_ua();
+		    $auth_ua   = MonsterInsights()->auth->get_ua();
 
-                    if ( empty( $manual_ua ) && empty( $auth_ua ) && monsterinsights_get_network_ua() ) { ?>
+		    if ( empty( $manual_ua ) && empty( $auth_ua ) && monsterinsights_get_network_ua() ) { ?>
                         <!-- If we don't have a manual or auth UA but we have a valid default set (from network), explain that -->
                         <tr id="monsterinsights-default-google-authenticate-box">
                             <th scope="row">
@@ -171,10 +171,10 @@ 
 
                     <!-- Disable Dashboard -->
                     <?php
-                    $title       = esc_html__( 'Disable Reports', 'google-analytics-for-wordpress' );
-                    $description = esc_html__( 'Hide the reports page.', 'google-analytics-for-wordpress' );
-                    echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
-                    ?>
+		    $title       = esc_html__( 'Disable Reports', 'google-analytics-for-wordpress' );
+		    $description = esc_html__( 'Hide the reports page.', 'google-analytics-for-wordpress' );
+		    echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
+		    ?>
 
                     <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ){  ?>
                     <?php $automatic_updates = $automatic_updates ? $automatic_updates : 'none'; ?>
@@ -192,23 +192,23 @@ 
 
                     <!-- Tracking -->
                     <?php
-                    $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
-                    $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
-                        echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
-                    }
-                    ?>
+		    $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
+		    $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
+		    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
+			echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
+		    }
+		    ?>
 
                     <?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.
-                     */
-                    do_action( 'monsterinsights_settings_general_box' ); 
-                    ?>
+		    /** 
+		     * 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.
+		     */
+		    do_action( 'monsterinsights_settings_general_box' ); 
+		    ?>
                 </tbody>
             </table>
             <input type="hidden" name="monsterinsights_settings_tab" value="general"/>
@@ -235,28 +235,28 @@ 
     $manual_ua_code_old = MonsterInsights()->auth->get_manual_ua();
     
     if ( $manual_ua_code && $manual_ua_code_old && $manual_ua_code_old === $manual_ua_code ) {
-        // Same code we had before
-            // Do nothing
+	// Same code we had before
+	    // Do nothing
     } else if ( $manual_ua_code && $manual_ua_code_old && $manual_ua_code_old !== $manual_ua_code ) {
-        // Different UA code
-        MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
+	// Different UA code
+	MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
     } else if ( $manual_ua_code && empty( $manual_ua_code_old ) ) {
-        // Move to manual
-        MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
+	// Move to manual
+	MonsterInsights()->auth->set_manual_ua( $manual_ua_code );
     } else if ( empty( $manual_ua_code ) && $manual_ua_code_old ) {
-        // Deleted manual
-        MonsterInsights()->auth->delete_manual_ua();
+	// Deleted manual
+	MonsterInsights()->auth->delete_manual_ua();
     } else if ( isset( $_POST['manual_ua_code'] ) && empty( $manual_ua_code ) ) {
-        $throw_notice = true;
+	$throw_notice = true;
     } else {
-        // Not UA before or after
-            // Do nothing
+	// Not UA before or after
+	    // Do nothing
     }
 
     $dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
     $dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
     if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
-        do_action( 'monsterinsights_reports_delete_aggregate_data' );
+	do_action( 'monsterinsights_reports_delete_aggregate_data' );
     }
     monsterinsights_update_option( 'dashboards_disabled', $dashboards_disabled );
 
@@ -264,16 +264,16 @@ 
 
     $automatic_updates = isset( $_POST['automatic_updates'] ) && in_array( $_POST['automatic_updates'], array( 'all', 'minor', 'none' ) ) ? $_POST['automatic_updates'] : false;
     if ( $automatic_updates ) {
-        monsterinsights_update_option( 'automatic_updates', $automatic_updates );
+	monsterinsights_update_option( 'automatic_updates', $automatic_updates );
     }
 
     $anonymous_data = isset( $_POST['anonymous_data'] ) ? 1 : 0;
     if ( $anonymous_data ) {
-        if ( monsterinsights_is_pro_version() ) {
-             monsterinsights_update_option( 'anonymous_data', 1 );
-        } else {
-            monsterinsights_update_option( 'anonymous_data', $anonymous_data );
-        }
+	if ( monsterinsights_is_pro_version() ) {
+	     monsterinsights_update_option( 'anonymous_data', 1 );
+	} else {
+	    monsterinsights_update_option( 'anonymous_data', $anonymous_data );
+	}
     }
 
     /** 
@@ -287,9 +287,9 @@ 
 
     // Output an admin notice so the user knows what happened
     if ( $throw_notice ) {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+	add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+	add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_updated_settings' );
     }
 }
 add_action( 'monsterinsights_settings_save_general', 'monsterinsights_settings_save_general', 11 );
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
                     <?php
                     $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
                     $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
+                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ) {
                         echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
                     }
                     ?>

Spacing +8 added lines, -8 removed lines

@@ -109,7 +109,7 @@ 
                         <form id="monsterinsights-google-authenticate" method="post">
                             <?php if ( MonsterInsights()->auth->get_viewname() && MonsterInsights()->auth->get_ua() ) { ?>
                                 <?php if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->is_site_licensed() ) { ?>
-                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.' , 'google-analytics-for-wordpress' ); ?></p>
+                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.', 'google-analytics-for-wordpress' ); ?></p>
                                 <?php } else { ?>
                                     <p><?php echo esc_html__( 'Profile Active: ', 'google-analytics-for-wordpress' ) . MonsterInsights()->auth->get_viewname(); ?></p>
                                     <p><?php wp_nonce_field( 'monsterinsights-google-authenticated-nonce', 'monsterinsights-google-authenticated-nonce' ); ?>
@@ -119,7 +119,7 @@ 
                                 <?php } ?>
                             <?php } else { ?>
                                 <?php if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->is_site_licensed() ) { ?>
-                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.' , 'google-analytics-for-wordpress' ); ?></p>
+                                    <p><?php echo esc_html__( 'Please activate MonsterInsights Pro with an active, valid license key in order to use MonsterInsights Pro.', 'google-analytics-for-wordpress' ); ?></p>
                                 <?php } else { ?>
                                     <?php wp_nonce_field( 'monsterinsights-google-authenticate-nonce', 'monsterinsights-google-authenticate-nonce' ); ?>
                                     <?php submit_button( esc_html__( 'Authenticate with your Google account', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-google-authenticate-submit', false ); ?>
@@ -142,7 +142,7 @@ 
                 <tbody>
                     <?php if ( ! MonsterInsights()->auth->get_viewname() ) { ?>
                     <!-- Manual UA -->
-                    <tr id="monsterinsights-google-ua-box" <?php echo ( ! MonsterInsights()->auth->get_manual_ua() ? 'class="monsterinsights-hideme"' : ''); ?> >
+                    <tr id="monsterinsights-google-ua-box" <?php echo ( ! MonsterInsights()->auth->get_manual_ua() ? 'class="monsterinsights-hideme"' : '' ); ?> >
                         <th scope="row">
                             <label for="monsterinsights-google-ua"><?php esc_html_e( 'Manually enter your UA code', 'google-analytics-for-wordpress' ); ?></label>
                         </th>
@@ -193,16 +193,16 @@ 
                     echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
                     ?>
 
-                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ){  ?>
+                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ) {  ?>
                     <?php $automatic_updates = $automatic_updates ? $automatic_updates : 'none'; ?>
                     <tr id="monsterinsights-automatic-updates-mode">
                         <th scope="row">
                             <label for="monsterinsights-automatic-updates-mode"><?php esc_html_e( 'Automatic Updates', 'google-analytics-for-wordpress' ); ?></label>
                         </th>
                         <td>
-                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e('Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e( 'Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress' ); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress' ); ?> </label>
                         </td>
                     </tr>
                     <?php } ?>
@@ -211,7 +211,7 @@ 
                     <?php
                     $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
                     $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ){
+                    if ( ( ! $anon_tracking || monsterinsights_is_debug_mode() ) && ! monsterinsights_is_pro_version() ) {
                         echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
                     }
                     ?>

includes/auth.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 
 final class MonsterInsights_Auth {
 
-	private $profile  = array();
+	private $profile = array();
 	private $network = array();
 
 	/**
@@ -67,17 +67,17 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
-		$this->profile      = $data;
+		$this->profile = $data;
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
-		$this->network      = $data;
+		$this->network = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -91,7 +91,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -124,7 +124,7 @@ 
 		
 		do_action( 'monsterinsights_reports_delete_aggregate_data' );
 
-		$this->profile      = $data;
+		$this->profile = $data;
 		$this->set_analytics_profile( $data );
 	}
 
@@ -181,55 +181,55 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() { // also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() { // also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

Braces +19 added lines, -17 removed lines

@@ -67,17 +67,17 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
 		$this->profile      = $data;
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
 		$this->network      = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -91,7 +91,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -181,55 +181,57 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() {
+// also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() {
+// also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

lite/includes/load.php

Braces +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/settings.php';
 
-if ( is_admin() ) {		
+if ( is_admin() ) {
 	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tools.php';
 
 	//require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tab-support.php';