awesomemotive / google-analytics-for-wordpress

includes/admin/licensing/license-actions.php

Indentation +196 added lines, -196 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,33 +102,33 @@ 
      */
     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'] );
-        // Make sure users can now update their plugins if they previously an expired 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'] );
+	// Make sure users can now update their plugins if they previously an expired key.
 	    wp_clean_plugins_cache( true );
     }
 
@@ -140,10 +140,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();
+	}
     }
 
     /**
@@ -155,58 +155,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 );
 
     }
 
@@ -219,19 +219,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();
 
     }
 
@@ -242,24 +242,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();
 
     }
 
@@ -272,20 +272,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 );
 
     }
 
@@ -295,16 +295,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>
@@ -328,46 +328,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

includes/admin/licensing/updater.php

Indentation +180 added lines, -180 removed lines

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

Spacing +12 added lines, -12 removed lines

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

includes/admin/pages/network-settings.php

Indentation +37 added lines, -37 removed lines

@@ -38,16 +38,16 @@ 
             <div id="monsterinsights-main-tab-general" class="monsterinsights-main-nav-tab monsterinsights-nav-tab monsterinsights-active">
                 <div id="monsterinsights-network-settings-general">
                     <?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_network_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_network_settings_general_tab_notice' );
+		    ?>
                     <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress'); ?></h1>
                     <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
                     <form id="monsterinsights-network-general-tab" method="post">
@@ -56,12 +56,12 @@ 
                         <tbody>
                             <?php if ( monsterinsights_is_pro_version() ) { 
 
-                                    $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_network_license_key();
+				    $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();
 
-                                    $license_type = MonsterInsights()->license->get_network_license_type();
+				    $license_type = MonsterInsights()->license->get_network_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>
@@ -136,8 +136,8 @@ 
                             </tr>
 
                             <?php if ( ! MonsterInsights()->auth->get_network_viewname() ) {
-                                $network_ua = MonsterInsights()->auth->get_network_manual_ua();
-                            ?>
+				$network_ua = MonsterInsights()->auth->get_network_manual_ua();
+			    ?>
                             <tr id="monsterinsights-google-ua-box" <?php echo (empty( $network_ua ) ? 'class="monsterinsights-hideme"' : ''); ?> >
                                 <th scope="row">
                                         <label for="monsterinsights-google-ua"><?php esc_html_e( 'Network UA code', 'google-analytics-for-wordpress' ); ?></label>
@@ -165,10 +165,10 @@ 
                             </tr>
                             <?php } ?>
                             <?php
-                            $title       = esc_html__( 'Hide Announcements', 'google-analytics-for-wordpress' );
-                            $description = esc_html__( 'Hides plugin announcements and update details. This includes critical notices we use to inform about deprecations and important required configuration changes.', 'google-analytics-for-wordpress' );
-                            echo monsterinsights_make_checkbox( 'network_hide_am_notices', $title, $description );
-                            ?>
+			    $title       = esc_html__( 'Hide Announcements', 'google-analytics-for-wordpress' );
+			    $description = esc_html__( 'Hides plugin announcements and update details. This includes critical notices we use to inform about deprecations and important required configuration changes.', 'google-analytics-for-wordpress' );
+			    echo monsterinsights_make_checkbox( 'network_hide_am_notices', $title, $description );
+			    ?>
                         </tbody>
                     </table>
                     <?php wp_nonce_field( 'monsterinsights-network-settings-nonce', 'monsterinsights-network-settings-nonce' ); ?>
@@ -193,15 +193,15 @@ 
 
     // Check if user pressed the 'Update' button and nonce is valid
     if ( ! isset( $_POST['monsterinsights-network-settings-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['monsterinsights-network-settings-nonce'], 'monsterinsights-network-settings-nonce' ) ) {
-        return;
+	return;
     }
 
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     $throw_notice       = false;
@@ -210,35 +210,35 @@ 
     $manual_ua_code_old = MonsterInsights()->auth->get_network_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_network_manual_ua( $manual_ua_code );
+	// Different UA code
+	MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
     } else if ( $manual_ua_code && empty( $manual_ua_code_old ) ) {
-        // Move to manual
-        MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
+	// Move to manual
+	MonsterInsights()->auth->set_network_manual_ua( $manual_ua_code );
     } else if ( empty( $manual_ua_code ) && $manual_ua_code_old ) {
-        // Deleted manual
-        MonsterInsights()->auth->delete_network_manual_ua();
+	// Deleted manual
+	MonsterInsights()->auth->delete_network_manual_ua();
     } else if ( isset( $_POST['network_manual_ua_code'] ) && empty( $manual_ua_code ) && ! empty( $_POST['network_manual_ua_code'] ) ) {
-        $throw_notice = true;
+	$throw_notice = true;
     } else {
-        // Not UA before or after
-            // Do nothing
+	// Not UA before or after
+	    // Do nothing
     }
 
     $network_hide_am_notices     = isset( $_POST['network_hide_am_notices'] ) ? 1 : 0;
     $network_hide_am_notices_old = monsterinsights_get_option( 'network_hide_am_notices', false );
     if ( $network_hide_am_notices != $network_hide_am_notices_old ) {
-        monsterinsights_update_option( 'network_hide_am_notices', $network_hide_am_notices );
+	monsterinsights_update_option( 'network_hide_am_notices', $network_hide_am_notices );
     }
 
     // Output an admin notice so the user knows what happened
     if ( $throw_notice ) {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+	add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
     } else {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+	add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
     }
 }
 add_action( 'admin_init', 'monsterinsights_network_settings_save_general', 11 );
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -48,8 +48,8 @@ 
                      */
                     do_action( 'monsterinsights_network_settings_general_tab_notice' );
                     ?>
-                    <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress'); ?></h1>
-                    <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
+                    <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress' ); ?></h1>
+                    <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress' ); ?></p>
                     <form id="monsterinsights-network-general-tab" method="post">
 
                     <table class="form-table">
@@ -114,7 +114,7 @@ 
                                     <form id="monsterinsights-google-authenticate" method="post">
                                         <?php if ( MonsterInsights()->auth->get_network_viewname() && MonsterInsights()->auth->get_network_ua() ) { ?>
                                             <?php if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->is_network_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_network_viewname(); ?></p>
                                                 <p><?php wp_nonce_field( 'monsterinsights-google-authenticated-nonce', 'monsterinsights-google-authenticated-nonce' ); ?>
@@ -124,7 +124,7 @@ 
                                             <?php } ?>
                                         <?php } else { ?>
                                             <?php if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->is_network_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 ); ?>
@@ -138,7 +138,7 @@ 
                             <?php if ( ! MonsterInsights()->auth->get_network_viewname() ) {
                                 $network_ua = MonsterInsights()->auth->get_network_manual_ua();
                             ?>
-                            <tr id="monsterinsights-google-ua-box" <?php echo (empty( $network_ua ) ? 'class="monsterinsights-hideme"' : ''); ?> >
+                            <tr id="monsterinsights-google-ua-box" <?php echo ( empty( $network_ua ) ? 'class="monsterinsights-hideme"' : '' ); ?> >
                                 <th scope="row">
                                         <label for="monsterinsights-google-ua"><?php esc_html_e( 'Network UA code', 'google-analytics-for-wordpress' ); ?></label>
                                     </th>
@@ -156,10 +156,10 @@ 
                                 </th>
                                 <td>
                                     <p>
-                                        <?php echo sprintf( esc_html__( 'Already purchased an upgrade to MonsterInsights Pro? To unlock your Pro features and addons, %sfollow our upgrade guide%s to install MonsterInsights Pro.' ), '<a href="'. monsterinsights_get_url( 'network-settings-page', 'go-lite-pro-link', "https://www.monsterinsights.com/docs/go-lite-pro" ) .'">', '</a>' ); ?>
+                                        <?php echo sprintf( esc_html__( 'Already purchased an upgrade to MonsterInsights Pro? To unlock your Pro features and addons, %sfollow our upgrade guide%s to install MonsterInsights Pro.' ), '<a href="' . monsterinsights_get_url( 'network-settings-page', 'go-lite-pro-link', "https://www.monsterinsights.com/docs/go-lite-pro" ) . '">', '</a>' ); ?>
                                     </p>
                                     <p>
-                                        <?php echo sprintf( esc_html__( "Don't yet have a Pro license? %sVisit our website%s to upgrade and learn more about all the amazing features, expanded report and powerful addons you unlock when you go Pro." ), '<a href="'. monsterinsights_get_upgrade_link( 'network-settings-page', 'upgrade-to-pro-link' ) .'">', '</a>' ); ?>
+                                        <?php echo sprintf( esc_html__( "Don't yet have a Pro license? %sVisit our website%s to upgrade and learn more about all the amazing features, expanded report and powerful addons you unlock when you go Pro." ), '<a href="' . monsterinsights_get_upgrade_link( 'network-settings-page', 'upgrade-to-pro-link' ) . '">', '</a>' ); ?>
                                     </p>
                                 </td>
                             </tr>

Braces +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
                     <table class="form-table">
                         <tbody>
-                            <?php if ( monsterinsights_is_pro_version() ) { 
+                            <?php if ( monsterinsights_is_pro_version() ) {
 
                                     $license_key  = MonsterInsights()->license->get_network_license_key();
                                     $license_key  = $license_key ? $license_key : MonsterInsights()->license->get_default_license_key();

includes/api-request.php

Spacing +19 added lines, -19 removed lines

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