insideout10 / wordlift-plugin

src/wordlift/admin/class-key-validation-notice.php

Indentation +49 added lines, -49 removed lines

@@ -10,78 +10,78 @@
  */
 class Key_Validation_Notice {
 
-	const CACHE_KEY = 'is_key_valid';
+    const CACHE_KEY = 'is_key_valid';
 
-	/**
-	 * @var \Wordlift_Key_Validation_Service
-	 */
-	private $key_validation_service;
+    /**
+     * @var \Wordlift_Key_Validation_Service
+     */
+    private $key_validation_service;
 
-	/**
-	 * @var \Wordlift_Configuration_Service
-	 */
-	private $configuration_service;
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $ttl_cache_service;
+    /**
+     * @var \Wordlift_Configuration_Service
+     */
+    private $configuration_service;
+    /**
+     * @var Ttl_Cache
+     */
+    private $ttl_cache_service;
 
-	/**
-	 * Key_Validation_Notice constructor.
-	 *
-	 * @param \Wordlift_Key_Validation_Service $key_validation_service
-	 * @param \Wordlift_Configuration_Service $configuration_service
-	 */
-	public function __construct( $key_validation_service, $configuration_service ) {
+    /**
+     * Key_Validation_Notice constructor.
+     *
+     * @param \Wordlift_Key_Validation_Service $key_validation_service
+     * @param \Wordlift_Configuration_Service $configuration_service
+     */
+    public function __construct( $key_validation_service, $configuration_service ) {
 
-		$this->key_validation_service = $key_validation_service;
+        $this->key_validation_service = $key_validation_service;
 
-		$this->configuration_service = $configuration_service;
+        $this->configuration_service = $configuration_service;
 
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification', 60 * 60 * 8 );
+        $this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification', 60 * 60 * 8 );
 
-		add_action( 'admin_notices', function () {
+        add_action( 'admin_notices', function () {
 
-			$key = $this->configuration_service->get_key();
+            $key = $this->configuration_service->get_key();
 
-			if ( ! $key ) {
-				// Dont show warning or make API call, return early.
-				return;
-			}
+            if ( ! $key ) {
+                // Dont show warning or make API call, return early.
+                return;
+            }
 
-			if ( $this->is_key_valid() ) {
-				return;
-			}
+            if ( $this->is_key_valid() ) {
+                return;
+            }
 
-			echo $this->get_notification_template();
+            echo $this->get_notification_template();
 
-		} );
+        } );
 
-	}
+    }
 
 
-	public function get_notification_template() {
-		return <<<EOF
+    public function get_notification_template() {
+        return <<<EOF
 <p></p>
 EOF;
 
-	}
+    }
 
-	private function is_key_valid() {
+    private function is_key_valid() {
 
-		$key = $this->configuration_service->get_key();
+        $key = $this->configuration_service->get_key();
 
-		// Check cache if the result is present, if not get the results
-		// save it and return the data.
-		if ( $this->ttl_cache_service->get( self::CACHE_KEY ) !== null ) {
-			return $this->ttl_cache_service->get( self::CACHE_KEY );
-		}
+        // Check cache if the result is present, if not get the results
+        // save it and return the data.
+        if ( $this->ttl_cache_service->get( self::CACHE_KEY ) !== null ) {
+            return $this->ttl_cache_service->get( self::CACHE_KEY );
+        }
 
-		$is_valid = $this->key_validation_service->is_key_valid( $key );
-		$this->ttl_cache_service->put( self::CACHE_KEY, $is_valid );
+        $is_valid = $this->key_validation_service->is_key_valid( $key );
+        $this->ttl_cache_service->put( self::CACHE_KEY, $is_valid );
 
-		return $is_valid;
-	}
+        return $is_valid;
+    }
 
 }
 

Spacing +9 added lines, -9 removed lines

@@ -32,24 +32,24 @@ 
 	 * @param \Wordlift_Key_Validation_Service $key_validation_service
 	 * @param \Wordlift_Configuration_Service $configuration_service
 	 */
-	public function __construct( $key_validation_service, $configuration_service ) {
+	public function __construct($key_validation_service, $configuration_service) {
 
 		$this->key_validation_service = $key_validation_service;
 
 		$this->configuration_service = $configuration_service;
 
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification', 60 * 60 * 8 );
+		$this->ttl_cache_service = new Ttl_Cache('key-validation-notification', 60 * 60 * 8);
 
-		add_action( 'admin_notices', function () {
+		add_action('admin_notices', function() {
 
 			$key = $this->configuration_service->get_key();
 
-			if ( ! $key ) {
+			if ( ! $key) {
 				// Dont show warning or make API call, return early.
 				return;
 			}
 
-			if ( $this->is_key_valid() ) {
+			if ($this->is_key_valid()) {
 				return;
 			}
 
@@ -73,12 +73,12 @@ 
 
 		// Check cache if the result is present, if not get the results
 		// save it and return the data.
-		if ( $this->ttl_cache_service->get( self::CACHE_KEY ) !== null ) {
-			return $this->ttl_cache_service->get( self::CACHE_KEY );
+		if ($this->ttl_cache_service->get(self::CACHE_KEY) !== null) {
+			return $this->ttl_cache_service->get(self::CACHE_KEY);
 		}
 
-		$is_valid = $this->key_validation_service->is_key_valid( $key );
-		$this->ttl_cache_service->put( self::CACHE_KEY, $is_valid );
+		$is_valid = $this->key_validation_service->is_key_valid($key);
+		$this->ttl_cache_service->put(self::CACHE_KEY, $is_valid);
 
 		return $is_valid;
 	}

src/includes/class-wordlift-key-validation-service.php

Indentation +155 added lines, -155 removed lines

@@ -19,171 +19,171 @@
  */
 class Wordlift_Key_Validation_Service {
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * Create a {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since 3.14.0
-	 */
-	public function __construct( $configuration_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
-
-		$this->configuration_service = $configuration_service;
-
-		add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
-		/**
-		 * Filter: wl_feature__enable__notices.
-		 *
-		 * @param bool whether the notices needs to be enabled or not.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
-		}
-
-	}
-
-	/**
-	 * Validate the provided key.
-	 *
-	 * @param string $key WordLift's key to validate.
-	 *
-	 * @return WP_Error|array The response or WP_Error on failure.
-	 * @since 3.9.0
-	 *
-	 */
-	public function get_account_info( $key ) {
-
-		$this->log->debug( 'Validating key...' );
-
-		return Default_Api_Service::get_instance()->get( '/accounts/info', array(
-			'Authorization' => "Key $key",
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * Create a {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since 3.14.0
+     */
+    public function __construct( $configuration_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
+
+        $this->configuration_service = $configuration_service;
+
+        add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
+        /**
+         * Filter: wl_feature__enable__notices.
+         *
+         * @param bool whether the notices needs to be enabled or not.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+            add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
+        }
+
+    }
+
+    /**
+     * Validate the provided key.
+     *
+     * @param string $key WordLift's key to validate.
+     *
+     * @return WP_Error|array The response or WP_Error on failure.
+     * @since 3.9.0
+     *
+     */
+    public function get_account_info( $key ) {
+
+        $this->log->debug( 'Validating key...' );
+
+        return Default_Api_Service::get_instance()->get( '/accounts/info', array(
+            'Authorization' => "Key $key",
         ) )->get_response();
-	}
+    }
 
-	/**
+    /**
      * Check if key is valid
-	 * @param $key string
-	 *
-	 * @return bool
-	 */
-	public function is_key_valid( $key ) {
+     * @param $key string
+     *
+     * @return bool
+     */
+    public function is_key_valid( $key ) {
 
-		$response = $this->get_account_info( $key );
+        $response = $this->get_account_info( $key );
 
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			return false;
-		}
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+        if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+            return false;
+        }
+        $res_body = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		$url = $res_body['url'];
+        $url = $res_body['url'];
 
-		if ( is_null( $url ) || $url === get_option( 'home' ) ) {
-			return true;
-		}
+        if ( is_null( $url ) || $url === get_option( 'home' ) ) {
+            return true;
+        }
         return false;
-	}
-
-	/**
-	 * This function is hooked to the `wl_validate_key` AJAX call.
-	 *
-	 * @since 3.9.0
-	 */
-	public function validate_key() {
-
-		// Ensure we don't have garbage before us.
-		ob_clean();
-
-		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {
-			wp_send_json_error( 'The key parameter is required.' );
-		}
-
-		$response = $this->get_account_info( $_POST['key'] );
-
-		// If we got an error, return invalid.
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			wp_send_json_success( array( 'valid' => false, 'message' => '' ) );
-		}
-
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
-
-		// The URL stored in WLS. If this is the initial install the URL may be null.
-		$url = $res_body['url'];
-
-		// If the URL isn't set or matches, then it's valid.
-		if ( is_null( $url ) || $url === get_option( 'home' ) ) {
-			wp_send_json_success( array( 'valid' => true, 'message' => '' ) );
-		}
-
-		// If the URL doesn't match it means that this key has been configured elsewhere already.
-		if ( $url !== get_option( 'home' ) ) {
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			wp_send_json_success( array(
-				'valid'   => false,
-				'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
-			) );
-		}
-
-		// Set a response with valid set to true or false according to the key validity with message.
-		wp_send_json_success( array(
-			'valid'   => false,
-			'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
-		) );
-	}
-
-	/**
-	 * This function is hooked `admin_init` to check _wl_blog_url.
-	 *
-	 */
-	public function wl_load_plugin() {
-
-		$wl_blog_url = get_option( '_wl_blog_url' );
-		$home_url    = defined( 'WP_HOME' ) ? WP_HOME : get_option( 'home' );
-
-		if ( ! $wl_blog_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-		} else if ( $wl_blog_url !== $home_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
-		}
-
-	}
-
-	/**
-	 * This function is hooked to the `admin_notices` to show admin notification.
-	 *
-	 */
-	public function wl_key_update_notice() {
-		if ( get_transient( 'wl-key-error-msg' ) ) {
-			?>
+    }
+
+    /**
+     * This function is hooked to the `wl_validate_key` AJAX call.
+     *
+     * @since 3.9.0
+     */
+    public function validate_key() {
+
+        // Ensure we don't have garbage before us.
+        ob_clean();
+
+        // Check if we have a key.
+        if ( ! isset( $_POST['key'] ) ) {
+            wp_send_json_error( 'The key parameter is required.' );
+        }
+
+        $response = $this->get_account_info( $_POST['key'] );
+
+        // If we got an error, return invalid.
+        if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+            wp_send_json_success( array( 'valid' => false, 'message' => '' ) );
+        }
+
+        $res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+
+        // The URL stored in WLS. If this is the initial install the URL may be null.
+        $url = $res_body['url'];
+
+        // If the URL isn't set or matches, then it's valid.
+        if ( is_null( $url ) || $url === get_option( 'home' ) ) {
+            wp_send_json_success( array( 'valid' => true, 'message' => '' ) );
+        }
+
+        // If the URL doesn't match it means that this key has been configured elsewhere already.
+        if ( $url !== get_option( 'home' ) ) {
+            Wordlift_Configuration_Service::get_instance()->set_key( '' );
+            wp_send_json_success( array(
+                'valid'   => false,
+                'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
+            ) );
+        }
+
+        // Set a response with valid set to true or false according to the key validity with message.
+        wp_send_json_success( array(
+            'valid'   => false,
+            'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
+        ) );
+    }
+
+    /**
+     * This function is hooked `admin_init` to check _wl_blog_url.
+     *
+     */
+    public function wl_load_plugin() {
+
+        $wl_blog_url = get_option( '_wl_blog_url' );
+        $home_url    = defined( 'WP_HOME' ) ? WP_HOME : get_option( 'home' );
+
+        if ( ! $wl_blog_url ) {
+            update_option( '_wl_blog_url', $home_url, true );
+        } else if ( $wl_blog_url !== $home_url ) {
+            update_option( '_wl_blog_url', $home_url, true );
+            Wordlift_Configuration_Service::get_instance()->set_key( '' );
+            set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
+        }
+
+    }
+
+    /**
+     * This function is hooked to the `admin_notices` to show admin notification.
+     *
+     */
+    public function wl_key_update_notice() {
+        if ( get_transient( 'wl-key-error-msg' ) ) {
+            ?>
             <div class="updated notice is-dismissible error">
                 <p><?php _e( get_transient( 'wl-key-error-msg' ), 'wordlift' ); ?></p>
             </div>
 			<?php
-		}
-	}
+        }
+    }
 }

Spacing +40 added lines, -40 removed lines

@@ -44,13 +44,13 @@ 
 	 *
 	 * @since 3.14.0
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Key_Validation_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Key_Validation_Service');
 
 		$this->configuration_service = $configuration_service;
 
-		add_action( 'admin_init', array( $this, 'wl_load_plugin' ) );
+		add_action('admin_init', array($this, 'wl_load_plugin'));
 		/**
 		 * Filter: wl_feature__enable__notices.
 		 *
@@ -59,8 +59,8 @@ 
 		 * @return bool
 		 * @since 3.27.6
 		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'wl_key_update_notice' ) );
+		if (apply_filters('wl_feature__enable__notices', true)) {
+			add_action('admin_notices', array($this, 'wl_key_update_notice'));
 		}
 
 	}
@@ -74,13 +74,13 @@ 
 	 * @since 3.9.0
 	 *
 	 */
-	public function get_account_info( $key ) {
+	public function get_account_info($key) {
 
-		$this->log->debug( 'Validating key...' );
+		$this->log->debug('Validating key...');
 
-		return Default_Api_Service::get_instance()->get( '/accounts/info', array(
+		return Default_Api_Service::get_instance()->get('/accounts/info', array(
 			'Authorization' => "Key $key",
-        ) )->get_response();
+        ))->get_response();
 	}
 
 	/**
@@ -89,18 +89,18 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_key_valid( $key ) {
+	public function is_key_valid($key) {
 
-		$response = $this->get_account_info( $key );
+		$response = $this->get_account_info($key);
 
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
+		if (is_wp_error($response) || 2 !== (int) $response['response']['code'] / 100) {
 			return false;
 		}
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+		$res_body = json_decode(wp_remote_retrieve_body($response), true);
 
 		$url = $res_body['url'];
 
-		if ( is_null( $url ) || $url === get_option( 'home' ) ) {
+		if (is_null($url) || $url === get_option('home')) {
 			return true;
 		}
         return false;
@@ -117,41 +117,41 @@ 
 		ob_clean();
 
 		// Check if we have a key.
-		if ( ! isset( $_POST['key'] ) ) {
-			wp_send_json_error( 'The key parameter is required.' );
+		if ( ! isset($_POST['key'])) {
+			wp_send_json_error('The key parameter is required.');
 		}
 
-		$response = $this->get_account_info( $_POST['key'] );
+		$response = $this->get_account_info($_POST['key']);
 
 		// If we got an error, return invalid.
-		if ( is_wp_error( $response ) || 2 !== (int) $response['response']['code'] / 100 ) {
-			wp_send_json_success( array( 'valid' => false, 'message' => '' ) );
+		if (is_wp_error($response) || 2 !== (int) $response['response']['code'] / 100) {
+			wp_send_json_success(array('valid' => false, 'message' => ''));
 		}
 
-		$res_body = json_decode( wp_remote_retrieve_body( $response ), true );
+		$res_body = json_decode(wp_remote_retrieve_body($response), true);
 
 		// The URL stored in WLS. If this is the initial install the URL may be null.
 		$url = $res_body['url'];
 
 		// If the URL isn't set or matches, then it's valid.
-		if ( is_null( $url ) || $url === get_option( 'home' ) ) {
-			wp_send_json_success( array( 'valid' => true, 'message' => '' ) );
+		if (is_null($url) || $url === get_option('home')) {
+			wp_send_json_success(array('valid' => true, 'message' => ''));
 		}
 
 		// If the URL doesn't match it means that this key has been configured elsewhere already.
-		if ( $url !== get_option( 'home' ) ) {
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			wp_send_json_success( array(
+		if ($url !== get_option('home')) {
+			Wordlift_Configuration_Service::get_instance()->set_key('');
+			wp_send_json_success(array(
 				'valid'   => false,
-				'message' => __( 'The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift' ),
-			) );
+				'message' => __('The key is already used on another site, please contact us at hello@wordlift.io to move the key to another site.', 'wordlift'),
+			));
 		}
 
 		// Set a response with valid set to true or false according to the key validity with message.
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'valid'   => false,
-			'message' => __( 'An error occurred, please contact us at hello@wordlift.io', 'wordlift' ),
-		) );
+			'message' => __('An error occurred, please contact us at hello@wordlift.io', 'wordlift'),
+		));
 	}
 
 	/**
@@ -160,15 +160,15 @@ 
 	 */
 	public function wl_load_plugin() {
 
-		$wl_blog_url = get_option( '_wl_blog_url' );
-		$home_url    = defined( 'WP_HOME' ) ? WP_HOME : get_option( 'home' );
+		$wl_blog_url = get_option('_wl_blog_url');
+		$home_url    = defined('WP_HOME') ? WP_HOME : get_option('home');
 
-		if ( ! $wl_blog_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-		} else if ( $wl_blog_url !== $home_url ) {
-			update_option( '_wl_blog_url', $home_url, true );
-			Wordlift_Configuration_Service::get_instance()->set_key( '' );
-			set_transient( 'wl-key-error-msg', __( "Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift' ), 10 );
+		if ( ! $wl_blog_url) {
+			update_option('_wl_blog_url', $home_url, true);
+		} else if ($wl_blog_url !== $home_url) {
+			update_option('_wl_blog_url', $home_url, true);
+			Wordlift_Configuration_Service::get_instance()->set_key('');
+			set_transient('wl-key-error-msg', __("Your web site URL has changed. To avoid data corruption, WordLift's key has been removed. Please provide a new key in WordLift Settings. If you believe this to be an error, please contact us at hello@wordlift.io", 'wordlift'), 10);
 		}
 
 	}
@@ -178,10 +178,10 @@ 
 	 *
 	 */
 	public function wl_key_update_notice() {
-		if ( get_transient( 'wl-key-error-msg' ) ) {
+		if (get_transient('wl-key-error-msg')) {
 			?>
             <div class="updated notice is-dismissible error">
-                <p><?php _e( get_transient( 'wl-key-error-msg' ), 'wordlift' ); ?></p>
+                <p><?php _e(get_transient('wl-key-error-msg'), 'wordlift'); ?></p>
             </div>
 			<?php
 		}