insideout10 / wordlift-plugin

src/admin/class-wordlift-admin.php

Indentation +168 added lines, -168 removed lines

@@ -22,173 +22,173 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * 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;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @param string $plugin_name The name of this plugin.
-	 * @param string $version The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service $notice_service The notice service.
-	 * @param \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-
-			new Wordlift_Dashboard_Latest_News();
-		}
-
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                => 'entity_by_title',
-			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
-			'language'              => $this->configuration_service->get_language_code(),
-			'link_by_default'       => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
-			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
-
-	}
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * 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;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since  1.0.0
+     *
+     * @param string $plugin_name The name of this plugin.
+     * @param string $version The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service $notice_service The notice service.
+     * @param \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+        // Load additional code if we're in the admin UI.
+        if ( is_admin() ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+
+            new Wordlift_Dashboard_Latest_News();
+        }
+
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'              => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                => 'entity_by_title',
+            'datasetUri'            => $this->configuration_service->get_dataset_uri(),
+            'language'              => $this->configuration_service->get_language_code(),
+            'link_by_default'       => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
+            'l10n'                  => array(
+                'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+                'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
+                'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
+                'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+            ),
+            'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -69,7 +69,7 @@ 
 	 * @param \Wordlift_Notice_Service $notice_service The notice service.
 	 * @param \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -80,19 +80,19 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+		if (is_admin()) {
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-latest-news.php';
 
 			new Wordlift_Dashboard_Latest_News();
 		}
@@ -118,7 +118,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -142,16 +142,16 @@ 
 		 */
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
+			'ajax_url'              => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                => 'entity_by_title',
 			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
@@ -160,34 +160,34 @@ 
 			// Whether the current user is allowed to create new entities.
 			//
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => current_user_can( 'edit_wordlift_entities' ) ? 'yes' : 'no',
+			'can_create_entities'   => current_user_can('edit_wordlift_entities') ? 'yes' : 'no',
 			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+				'You already published an entity with the same name'                 => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                                              => array('text' => __('Choose Logo', 'wordlift')),
+				'Type at least 3 characters to search...'                            => _x('Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift'),
+				'No results found for your search.'                                  => _x('No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift'),
+				'Please wait while we look for entities in the linked data cloud...' => _x('Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift'),
 			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+			'wl_autocomplete_nonce' => wp_create_nonce('wordlift_autocomplete'),
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+			$params['itemId'] = $entity_service->get_uri($entity_being_edited->ID);
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+		wp_localize_script($this->plugin_name, 'wlSettings', $params);
 
 	}
 

src/admin/class-wordlift-admin-settings-page.php

Indentation +362 added lines, -362 removed lines

@@ -18,367 +18,367 @@
  */
 class Wordlift_Admin_Settings_Page extends Wordlift_Admin_Page {
 
-	/**
-	 * A singleton instance of the Notice service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
-	 */
-	private static $instance;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Input_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
-	 */
-	private $input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 *
-	 * @since  3.13.0
-	 * @access protected
-	 * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
-	 */
-	private $radio_input_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
-	 */
-	private $language_select_element;
-
-	/**
-	 * A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
-	 */
-	private $publisher_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Settings_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service         $configuration_service
-	 * @param \Wordlift_Entity_Service                $entity_service
-	 * @param \Wordlift_Admin_Input_Element           $input_element
-	 * @param \Wordlift_Admin_Language_Select_Element $language_select_element
-	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
-	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
-	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
-
-		$this->configuration_service = $configuration_service;
-		$this->entity_service        = $entity_service;
-
-		// Set a reference to the UI elements.
-		$this->input_element           = $input_element;
-		$this->radio_input_element     = $radio_input_element;
-		$this->language_select_element = $language_select_element;
-		$this->publisher_element       = $publisher_element;
-
-		self::$instance = $this;
-	}
-
-	/**
-	 * Get the singleton instance of the Notice service.
-	 *
-	 * @since 3.14.0
-	 * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_parent_slug() {
-
-		return 'wl_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_capability() {
-
-		return 'manage_options';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_page_title() {
-
-		return 'WorldLift Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_title() {
-
-		return 'Settings';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_menu_slug() {
-
-		return 'wl_configuration_admin_menu';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	function get_partial_name() {
-
-		return 'wordlift-admin-settings-page.php';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function enqueue_scripts() {
-
-		// Enqueue the media scripts to be used for the publisher's logo selection.
-		wp_enqueue_media();
-
-		// JavaScript required for the settings page.
-		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-		wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
-
-	}
-
-	/**
-	 * Configure all the configuration parameters.
-	 *
-	 * Called by the *admin_init* hook.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_init() {
-
-		// Register WordLift's general settings, providing our own sanitize callback
-		// which will also check whether the user filled the WL Publisher form.
-		register_setting(
-			'wl_general_settings',
-			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
-		);
-
-		// Add the general settings section.
-		add_settings_section(
-			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
-			'wl_general_settings'          // Page on which to add this section of options.
-		);
-
-		$key_args = array(
-			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
-			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
-		);
-
-		// Before we were used to validate the key beforehand, but this means
-		// an http call whenever a page is opened in the admin area. Therefore
-		// we now leave the input `untouched`, leaving to the client to update
-		// the `css_class`.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/669.
-		$key_args['css_class'] = 'untouched';
-
-		// Add the `key` field.
-		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			__( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
-			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
-			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
-		);
-
-		// Entity Base Path input.
-		$entity_base_path_args = array(
-			// The array of arguments to pass to the callback. In this case, just a description.
-			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
-			'value'       => $this->configuration_service->get_entity_base_path(),
-			/* translators: Placeholders: %s - a link to FAQ's page. */
-			'description' => sprintf( __( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
-		);
-
-		// The following call is very heavy on large web sites and is always run
-		// also when not needed:
-		//  $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
-		//
-		// It is now replaced by a filter to add the `readonly` flag to the
-		// input element when this is actually rendered.
-		add_filter( 'wl_admin_input_element_params', array(
-			$this,
-			'entity_path_input_element_params',
-		) );
-
-
-		// Add the `wl_entity_base_path` field.
-		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			__( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
-			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
-			$entity_base_path_args
-		);
-
-		// Add the `language_name` field.
-		add_settings_field(
-			'wl-site-language',
-			__( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				// The array of arguments to pass to the callback. In this case, just a description.
-				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
-				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
-			)
-		);
-
-		// Add the `publisher` field.
-		add_settings_field(
-			'wl-publisher-id',
-			__( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
-			)
-		);
-
-		// Add the `link by default` field.
-		add_settings_field(
-			'wl-link-by-default',
-			__( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
-				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => __( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
-			)
-		);
-
-		// Add the `diagnostic data` field.
-		add_settings_field(
-			'wl-send-diagnostic',
-			__( 'Send Diagnostic Data', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
-			'wl_general_settings',
-			'wl_general_settings_section',
-			array(
-				'id'          => 'wl-send-diagnostic',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::SEND_DIAGNOSTIC . ']',
-				'value'       => 'yes' === $this->configuration_service->get_diagnostic_preferences() ? 'yes' : 'no',
-				'description' => __( 'Whether to send diagnostic data or not.', 'wordlift' ),
-			)
-		);
-
-	}
-
-	/**
-	 * Filter the {@link Wordlift_Admin_Input_Element} in order to add the
-	 * `readonly` flag to the `wl-entity-base-path` input.
-	 *
-	 * @since 3.17.0
-	 *
-	 * @param array $args An array of {@link Wordlift_Admin_Input_Element} parameters.
-	 *
-	 * @return array The updated array.
-	 */
-	public function entity_path_input_element_params( $args ) {
-
-		// Bail out if it's not the `wl-entity-base-path`).
-		if ( 'wl-entity-base-path' !== $args['id'] ) {
-			return $args;
-		}
-
-		// Set the readonly flag according to the entities count.
-		$args['readonly'] = 0 < $this->entity_service->count();
-
-		// Return the updated args.
-		return $args;
-	}
-
-	/**
-	 * Sanitize the configuration settings to be stored.
-	 *
-	 * If a new entity is being created for the publisher, create it and set The
-	 * publisher setting.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $input The configuration settings array.
-	 *
-	 * @return array The sanitized input array.
-	 */
-	function sanitize_callback( $input ) {
-
-		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
-			$name         = $_POST['wl_publisher']['name'];
-			$type         = $_POST['wl_publisher']['type'];
-			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
-
-			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
-
-			// Create an entity for the publisher and assign it to the input
-			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
-		}
-
-		return $input;
-	}
+    /**
+     * A singleton instance of the Notice service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Notice_Service $instance A singleton instance of the Notice service.
+     */
+    private static $instance;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Admin_Input_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Input_Element $input_element An {@link Wordlift_Admin_Input_Element} element renderer.
+     */
+    private $input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     *
+     * @since  3.13.0
+     * @access protected
+     * @var \Wordlift_Admin_Radio_Input_Element $radio_input_element A {@link Wordlift_Admin_Radio_Input_Element} element renderer.
+     */
+    private $radio_input_element;
+
+    /**
+     * A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Language_Select_Element $language_select_element A {@link Wordlift_Admin_Language_Select_Element} element renderer.
+     */
+    private $language_select_element;
+
+    /**
+     * A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Admin_Publisher_Element $publisher_element A {@link Wordlift_Admin_Publisher_Element} element renderer.
+     */
+    private $publisher_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Settings_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service         $configuration_service
+     * @param \Wordlift_Entity_Service                $entity_service
+     * @param \Wordlift_Admin_Input_Element           $input_element
+     * @param \Wordlift_Admin_Language_Select_Element $language_select_element
+     * @param \Wordlift_Admin_Publisher_Element       $publisher_element
+     * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
+     */
+    function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+
+        $this->configuration_service = $configuration_service;
+        $this->entity_service        = $entity_service;
+
+        // Set a reference to the UI elements.
+        $this->input_element           = $input_element;
+        $this->radio_input_element     = $radio_input_element;
+        $this->language_select_element = $language_select_element;
+        $this->publisher_element       = $publisher_element;
+
+        self::$instance = $this;
+    }
+
+    /**
+     * Get the singleton instance of the Notice service.
+     *
+     * @since 3.14.0
+     * @return \Wordlift_Admin_Settings_Page The singleton instance of the settings page service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_parent_slug() {
+
+        return 'wl_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_capability() {
+
+        return 'manage_options';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_page_title() {
+
+        return 'WorldLift Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_title() {
+
+        return 'Settings';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_menu_slug() {
+
+        return 'wl_configuration_admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    function get_partial_name() {
+
+        return 'wordlift-admin-settings-page.php';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function enqueue_scripts() {
+
+        // Enqueue the media scripts to be used for the publisher's logo selection.
+        wp_enqueue_media();
+
+        // JavaScript required for the settings page.
+        // @todo: try to move to the `wordlift-admin.bundle.js`.
+        wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
+        wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
+
+    }
+
+    /**
+     * Configure all the configuration parameters.
+     *
+     * Called by the *admin_init* hook.
+     *
+     * @since 3.11.0
+     */
+    function admin_init() {
+
+        // Register WordLift's general settings, providing our own sanitize callback
+        // which will also check whether the user filled the WL Publisher form.
+        register_setting(
+            'wl_general_settings',
+            'wl_general_settings',
+            array( $this, 'sanitize_callback', )
+        );
+
+        // Add the general settings section.
+        add_settings_section(
+            'wl_general_settings_section', // ID used to identify this section and with which to register options.
+            '',                            // Section header.
+            '',                            // Callback used to render the description of the section.
+            'wl_general_settings'          // Page on which to add this section of options.
+        );
+
+        $key_args = array(
+            'id'          => 'wl-key',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+            'value'       => $this->configuration_service->get_key(),
+            'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+        );
+
+        // Before we were used to validate the key beforehand, but this means
+        // an http call whenever a page is opened in the admin area. Therefore
+        // we now leave the input `untouched`, leaving to the client to update
+        // the `css_class`.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/669.
+        $key_args['css_class'] = 'untouched';
+
+        // Add the `key` field.
+        add_settings_field(
+            'wl-key',                                       // Element id used to identify the field throughout the theme.
+            __( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+            // The name of the function responsible for rendering the option interface.
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                          // The page on which this option will be displayed.
+            'wl_general_settings_section',                  // The name of the section to which this field belongs.
+            $key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
+        );
+
+        // Entity Base Path input.
+        $entity_base_path_args = array(
+            // The array of arguments to pass to the callback. In this case, just a description.
+            'id'          => 'wl-entity-base-path',
+            'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+            'value'       => $this->configuration_service->get_entity_base_path(),
+            /* translators: Placeholders: %s - a link to FAQ's page. */
+            'description' => sprintf( __( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+        );
+
+        // The following call is very heavy on large web sites and is always run
+        // also when not needed:
+        //  $entity_base_path_args['readonly'] = 0 < $this->entity_service->count();
+        //
+        // It is now replaced by a filter to add the `readonly` flag to the
+        // input element when this is actually rendered.
+        add_filter( 'wl_admin_input_element_params', array(
+            $this,
+            'entity_path_input_element_params',
+        ) );
+
+
+        // Add the `wl_entity_base_path` field.
+        add_settings_field(
+            'wl-entity-base-path',                                // ID used to identify the field throughout the theme
+            __( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+            // The name of the function responsible for rendering the option interface
+            array( $this->input_element, 'render', ),
+            'wl_general_settings',                                // The page on which this option will be displayed
+            'wl_general_settings_section',                        // The name of the section to which this field belongs
+            $entity_base_path_args
+        );
+
+        // Add the `language_name` field.
+        add_settings_field(
+            'wl-site-language',
+            __( 'Site Language', 'wordlift' ),
+            array( $this->language_select_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                // The array of arguments to pass to the callback. In this case, just a description.
+                'id'          => 'wl-site-language',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+                'value'       => $this->configuration_service->get_language_code(),
+                'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+            )
+        );
+
+        // Add the `publisher` field.
+        add_settings_field(
+            'wl-publisher-id',
+            __( 'Publisher', 'wordlift' ),
+            array( $this->publisher_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'   => 'wl-publisher-id',
+                'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+            )
+        );
+
+        // Add the `link by default` field.
+        add_settings_field(
+            'wl-link-by-default',
+            __( 'Link by Default', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-link-by-default',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+                'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
+                'description' => __( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+            )
+        );
+
+        // Add the `diagnostic data` field.
+        add_settings_field(
+            'wl-send-diagnostic',
+            __( 'Send Diagnostic Data', 'wordlift' ),
+            array( $this->radio_input_element, 'render' ),
+            'wl_general_settings',
+            'wl_general_settings_section',
+            array(
+                'id'          => 'wl-send-diagnostic',
+                'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::SEND_DIAGNOSTIC . ']',
+                'value'       => 'yes' === $this->configuration_service->get_diagnostic_preferences() ? 'yes' : 'no',
+                'description' => __( 'Whether to send diagnostic data or not.', 'wordlift' ),
+            )
+        );
+
+    }
+
+    /**
+     * Filter the {@link Wordlift_Admin_Input_Element} in order to add the
+     * `readonly` flag to the `wl-entity-base-path` input.
+     *
+     * @since 3.17.0
+     *
+     * @param array $args An array of {@link Wordlift_Admin_Input_Element} parameters.
+     *
+     * @return array The updated array.
+     */
+    public function entity_path_input_element_params( $args ) {
+
+        // Bail out if it's not the `wl-entity-base-path`).
+        if ( 'wl-entity-base-path' !== $args['id'] ) {
+            return $args;
+        }
+
+        // Set the readonly flag according to the entities count.
+        $args['readonly'] = 0 < $this->entity_service->count();
+
+        // Return the updated args.
+        return $args;
+    }
+
+    /**
+     * Sanitize the configuration settings to be stored.
+     *
+     * If a new entity is being created for the publisher, create it and set The
+     * publisher setting.
+     *
+     * @since 3.11.0
+     *
+     * @param array $input The configuration settings array.
+     *
+     * @return array The sanitized input array.
+     */
+    function sanitize_callback( $input ) {
+
+        // Check whether a publisher name has been set.
+        if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+            $name         = $_POST['wl_publisher']['name'];
+            $type         = $_POST['wl_publisher']['type'];
+            $thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
+
+            // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+            $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+
+            // Create an entity for the publisher and assign it to the input
+            // parameter which WordPress automatically saves into the settings.
+            $input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+        }
+
+        return $input;
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -93,7 +93,7 @@ 
 	 * @param \Wordlift_Admin_Publisher_Element       $publisher_element
 	 * @param \Wordlift_Admin_Radio_Input_Element     $radio_input_element
 	 */
-	function __construct( $configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element ) {
+	function __construct($configuration_service, $entity_service, $input_element, $language_select_element, $publisher_element, $radio_input_element) {
 
 		$this->configuration_service = $configuration_service;
 		$this->entity_service        = $entity_service;
@@ -176,8 +176,8 @@ 
 
 		// JavaScript required for the settings page.
 		// @todo: try to move to the `wordlift-admin.bundle.js`.
-		wp_enqueue_script( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.js', array( 'wp-util' ) );
-		wp_enqueue_style( 'wordlift-admin-settings-page', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/1/settings.css' );
+		wp_enqueue_script('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.js', array('wp-util'));
+		wp_enqueue_style('wordlift-admin-settings-page', plugin_dir_url(dirname(__FILE__)).'admin/js/1/settings.css');
 
 	}
 
@@ -195,22 +195,22 @@ 
 		register_setting(
 			'wl_general_settings',
 			'wl_general_settings',
-			array( $this, 'sanitize_callback', )
+			array($this, 'sanitize_callback',)
 		);
 
 		// Add the general settings section.
 		add_settings_section(
 			'wl_general_settings_section', // ID used to identify this section and with which to register options.
-			'',                            // Section header.
-			'',                            // Callback used to render the description of the section.
+			'', // Section header.
+			'', // Callback used to render the description of the section.
 			'wl_general_settings'          // Page on which to add this section of options.
 		);
 
 		$key_args = array(
 			'id'          => 'wl-key',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::KEY.']',
 			'value'       => $this->configuration_service->get_key(),
-			'description' => __( 'Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift' ),
+			'description' => __('Insert the <a href="https://www.wordlift.io/blogger">WordLift Key</a> you received via email.', 'wordlift'),
 		);
 
 		// Before we were used to validate the key beforehand, but this means
@@ -223,12 +223,12 @@ 
 
 		// Add the `key` field.
 		add_settings_field(
-			'wl-key',                                       // Element id used to identify the field throughout the theme.
-			__( 'WordLift Key', 'wordlift' ),               // The label to the left of the option interface element.
+			'wl-key', // Element id used to identify the field throughout the theme.
+			__('WordLift Key', 'wordlift'), // The label to the left of the option interface element.
 			// The name of the function responsible for rendering the option interface.
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                          // The page on which this option will be displayed.
-			'wl_general_settings_section',                  // The name of the section to which this field belongs.
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed.
+			'wl_general_settings_section', // The name of the section to which this field belongs.
 			$key_args                                       // The array of arguments to pass to the callback. In this case, just a description.
 		);
 
@@ -236,10 +236,10 @@ 
 		$entity_base_path_args = array(
 			// The array of arguments to pass to the callback. In this case, just a description.
 			'id'          => 'wl-entity-base-path',
-			'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY . ']',
+			'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::ENTITY_BASE_PATH_KEY.']',
 			'value'       => $this->configuration_service->get_entity_base_path(),
 			/* translators: Placeholders: %s - a link to FAQ's page. */
-			'description' => sprintf( __( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift' ), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary' ),
+			'description' => sprintf(__('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field above. Check our <a href="%s">FAQs</a> if you need more info.', 'wordlift'), 'https://wordlift.io/wordlift-user-faqs/#10-why-and-how-should-i-customize-the-url-of-the-entity-pages-created-in-my-vocabulary'),
 		);
 
 		// The following call is very heavy on large web sites and is always run
@@ -248,79 +248,79 @@ 
 		//
 		// It is now replaced by a filter to add the `readonly` flag to the
 		// input element when this is actually rendered.
-		add_filter( 'wl_admin_input_element_params', array(
+		add_filter('wl_admin_input_element_params', array(
 			$this,
 			'entity_path_input_element_params',
-		) );
+		));
 
 
 		// Add the `wl_entity_base_path` field.
 		add_settings_field(
-			'wl-entity-base-path',                                // ID used to identify the field throughout the theme
-			__( 'Entity Base Path', 'wordlift' ),                 // The label to the left of the option interface element
+			'wl-entity-base-path', // ID used to identify the field throughout the theme
+			__('Entity Base Path', 'wordlift'), // The label to the left of the option interface element
 			// The name of the function responsible for rendering the option interface
-			array( $this->input_element, 'render', ),
-			'wl_general_settings',                                // The page on which this option will be displayed
-			'wl_general_settings_section',                        // The name of the section to which this field belongs
+			array($this->input_element, 'render',),
+			'wl_general_settings', // The page on which this option will be displayed
+			'wl_general_settings_section', // The name of the section to which this field belongs
 			$entity_base_path_args
 		);
 
 		// Add the `language_name` field.
 		add_settings_field(
 			'wl-site-language',
-			__( 'Site Language', 'wordlift' ),
-			array( $this->language_select_element, 'render' ),
+			__('Site Language', 'wordlift'),
+			array($this->language_select_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				// The array of arguments to pass to the callback. In this case, just a description.
 				'id'          => 'wl-site-language',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LANGUAGE . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LANGUAGE.']',
 				'value'       => $this->configuration_service->get_language_code(),
-				'description' => __( 'Each WordLift Key can be used only in one language. Pick yours.', 'wordlift' ),
+				'description' => __('Each WordLift Key can be used only in one language. Pick yours.', 'wordlift'),
 			)
 		);
 
 		// Add the `publisher` field.
 		add_settings_field(
 			'wl-publisher-id',
-			__( 'Publisher', 'wordlift' ),
-			array( $this->publisher_element, 'render' ),
+			__('Publisher', 'wordlift'),
+			array($this->publisher_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'   => 'wl-publisher-id',
-				'name' => 'wl_general_settings[' . Wordlift_Configuration_Service::PUBLISHER_ID . ']',
+				'name' => 'wl_general_settings['.Wordlift_Configuration_Service::PUBLISHER_ID.']',
 			)
 		);
 
 		// Add the `link by default` field.
 		add_settings_field(
 			'wl-link-by-default',
-			__( 'Link by Default', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			__('Link by Default', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-link-by-default',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::LINK_BY_DEFAULT . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::LINK_BY_DEFAULT.']',
 				'value'       => $this->configuration_service->is_link_by_default() ? 'yes' : 'no',
-				'description' => __( 'Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift' ),
+				'description' => __('Whether to link entities by default or not. This setting applies to all the entities.', 'wordlift'),
 			)
 		);
 
 		// Add the `diagnostic data` field.
 		add_settings_field(
 			'wl-send-diagnostic',
-			__( 'Send Diagnostic Data', 'wordlift' ),
-			array( $this->radio_input_element, 'render' ),
+			__('Send Diagnostic Data', 'wordlift'),
+			array($this->radio_input_element, 'render'),
 			'wl_general_settings',
 			'wl_general_settings_section',
 			array(
 				'id'          => 'wl-send-diagnostic',
-				'name'        => 'wl_general_settings[' . Wordlift_Configuration_Service::SEND_DIAGNOSTIC . ']',
+				'name'        => 'wl_general_settings['.Wordlift_Configuration_Service::SEND_DIAGNOSTIC.']',
 				'value'       => 'yes' === $this->configuration_service->get_diagnostic_preferences() ? 'yes' : 'no',
-				'description' => __( 'Whether to send diagnostic data or not.', 'wordlift' ),
+				'description' => __('Whether to send diagnostic data or not.', 'wordlift'),
 			)
 		);
 
@@ -336,10 +336,10 @@ 
 	 *
 	 * @return array The updated array.
 	 */
-	public function entity_path_input_element_params( $args ) {
+	public function entity_path_input_element_params($args) {
 
 		// Bail out if it's not the `wl-entity-base-path`).
-		if ( 'wl-entity-base-path' !== $args['id'] ) {
+		if ('wl-entity-base-path' !== $args['id']) {
 			return $args;
 		}
 
@@ -362,20 +362,20 @@ 
 	 *
 	 * @return array The sanitized input array.
 	 */
-	function sanitize_callback( $input ) {
+	function sanitize_callback($input) {
 
 		// Check whether a publisher name has been set.
-		if ( isset( $_POST['wl_publisher'] ) && ! empty( $_POST['wl_publisher']['name'] ) ) {
+		if (isset($_POST['wl_publisher']) && ! empty($_POST['wl_publisher']['name'])) {
 			$name         = $_POST['wl_publisher']['name'];
 			$type         = $_POST['wl_publisher']['type'];
 			$thumbnail_id = $_POST['wl_publisher']['thumbnail_id'] ?: null;
 
 			// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-			$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person' );
+			$type_uri = sprintf('http://schema.org/%s', 'organization' === $type ? 'Organization' : 'Person');
 
 			// Create an entity for the publisher and assign it to the input
 			// parameter which WordPress automatically saves into the settings.
-			$input['publisher_id'] = $this->entity_service->create( $name, $type_uri, $thumbnail_id, 'publish' );
+			$input['publisher_id'] = $this->entity_service->create($name, $type_uri, $thumbnail_id, 'publish');
 		}
 
 		return $input;

src/admin/class-wordlift-admin-dashboard-latest-news.php

Indentation +140 added lines, -140 removed lines

@@ -20,145 +20,145 @@
  */
 class Wordlift_Dashboard_Latest_News {
 
-	/**
-	 * Add needed hooks for the latest news widget.
-	 */
-	public function __construct() {
-		add_action( 'wp_ajax_wordlift_get_latest_news', array(
-			$this,
-			'ajax_get_latest_news',
-		) );
-		add_action( 'wp_dashboard_setup', array(
-			$this,
-			'add_dashboard_latest_news_widget',
-		) );
-
-		add_action( 'admin_enqueue_scripts', function () {
-			wp_enqueue_script( 'wl-admin-dashboard', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-dashboard.js', array( 'jquery' ) );
-		} );
-	}
-
-	/**
-	 * Return latest news html.
-	 *
-	 * @return string Articles html markup.
-	 */
-	public function render() {
-		include( plugin_dir_path( __FILE__ ) . 'partials/wordlift-admin-news-widget.php' );
-	}
-
-	/**
-	 * Returns latest news data filtered by $start_position.
-	 *
-	 * @param int $start_position (news array key start position).
-	 *
-	 * @return array Latest posts data.
-	 */
-	public function get_last_wordlift_articles( $start_position = 0 ) {
-		$feed_articles = $this->get_wordlift_articles_data();
-
-		// Filter articles by $start_position
-		if ( ! empty( $feed_articles ) ) {
-			return array(
-				'posts_data'     => array_slice( $feed_articles, $start_position, 3 ),
-				'count'          => count( $feed_articles ),
-				'start_position' => $start_position,
-			);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns latest news array data.
-	 *
-	 * @uses  https://codex.wordpress.org/Function_Reference/fetch_feed
-	 * @uses  https://codex.wordpress.org/Function_Reference/get_locale
-	 *
-	 * @param int $articles_number (articles total number).
-	 *
-	 * @return array Latest $articles_number feed posts.
-	 */
-	public function get_wordlift_articles_data( $articles_number = 10 ) {
-		// Init cache class
-		$cache_sistem_lib = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'articles/' );
-		$locale           = get_locale();
-		$cache_id         = 'news_' . date( 'Y_m_d' ) . '_' . $locale;
-		$posts_data       = array();
-
-		// Get latest articles from cache
-		$feed_articles = $cache_sistem_lib->get_cache( $cache_id );
-		if ( false === $feed_articles ) {
-			// Check wordpress installation language to define articles rss url
-			$feed_uri = ( 'it_IT' === $locale ) ? 'https://wordlift.io/blog/it/feed/' : 'https://wordlift.io/blog/en/feed/';
-
-			// Get rss feed data, the response is cached by default for 12 hours
-			$feed = fetch_feed( $feed_uri );
-			if ( ! is_wp_error( $feed ) ) {
-				// Build an array of requested $articles_number, starting with element 0
-				$feed_articles = $feed->get_items( 0, $articles_number );
-				foreach ( $feed_articles as $key => $item ) {
-					$data = array(
-						// fetch_feed will return the title html decoded.
-						'post_title'       => $item->get_title(),
-						'post_date'        => $item->get_date( 'j F Y | g:i a' ),
-						'post_url'         => self::add_utm_parameter( $item->get_permalink() ),
-						// fetch_feed will return the description html (not decoded).
-						'post_description' => $item->get_description(),
-					);
-					array_push( $posts_data, $data );
-				}
-				// Set articles in cache.
-				$cache_sistem_lib->set_cache( $cache_id, $posts_data );
-				$feed_articles = $posts_data;
-			}
-		}
-
-		return $feed_articles;
-	}
-
-	/**
-	 * Add the `utm` parameter for GA.
-	 *
-	 * @since 3.19.0
-	 *
-	 * @param string $url The URL.
-	 *
-	 * @return string The URL with the `utm` parameter prepended by `&` or by `?`.
-	 */
-	private static function add_utm_parameter( $url ) {
-
-		if ( false === strpos( $url, '?' ) ) {
-			return $url . '?utm=wl_dash';
-		}
-
-		return $url . '&utm=wl_dash';
-	}
-
-	/**
-	 * Ajax call for more latest news.
-	 *
-	 * @uses  https://codex.wordpress.org/Function_Reference/wp_send_json_success
-	 *
-	 * @return string JSON obj with articles data.
-	 */
-	public function ajax_get_latest_news() {
-		// Get wordlift articles
-		$start_position = explode( '_', $_POST['more_posts_link_id'] );
-		$data           = $this->get_last_wordlift_articles( $start_position[ count( $start_position ) - 1 ] );
-
-		// Return response as json object
-		wp_send_json_success( $data );
-	}
-
-	/**
-	 * Add latest news widget to the administration dashboard.
-	 */
-	public function add_dashboard_latest_news_widget() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-latest-news-widget', 'Latest WordLift News', array(
-			$this,
-			'render',
-		) );
-	}
+    /**
+     * Add needed hooks for the latest news widget.
+     */
+    public function __construct() {
+        add_action( 'wp_ajax_wordlift_get_latest_news', array(
+            $this,
+            'ajax_get_latest_news',
+        ) );
+        add_action( 'wp_dashboard_setup', array(
+            $this,
+            'add_dashboard_latest_news_widget',
+        ) );
+
+        add_action( 'admin_enqueue_scripts', function () {
+            wp_enqueue_script( 'wl-admin-dashboard', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-dashboard.js', array( 'jquery' ) );
+        } );
+    }
+
+    /**
+     * Return latest news html.
+     *
+     * @return string Articles html markup.
+     */
+    public function render() {
+        include( plugin_dir_path( __FILE__ ) . 'partials/wordlift-admin-news-widget.php' );
+    }
+
+    /**
+     * Returns latest news data filtered by $start_position.
+     *
+     * @param int $start_position (news array key start position).
+     *
+     * @return array Latest posts data.
+     */
+    public function get_last_wordlift_articles( $start_position = 0 ) {
+        $feed_articles = $this->get_wordlift_articles_data();
+
+        // Filter articles by $start_position
+        if ( ! empty( $feed_articles ) ) {
+            return array(
+                'posts_data'     => array_slice( $feed_articles, $start_position, 3 ),
+                'count'          => count( $feed_articles ),
+                'start_position' => $start_position,
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns latest news array data.
+     *
+     * @uses  https://codex.wordpress.org/Function_Reference/fetch_feed
+     * @uses  https://codex.wordpress.org/Function_Reference/get_locale
+     *
+     * @param int $articles_number (articles total number).
+     *
+     * @return array Latest $articles_number feed posts.
+     */
+    public function get_wordlift_articles_data( $articles_number = 10 ) {
+        // Init cache class
+        $cache_sistem_lib = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'articles/' );
+        $locale           = get_locale();
+        $cache_id         = 'news_' . date( 'Y_m_d' ) . '_' . $locale;
+        $posts_data       = array();
+
+        // Get latest articles from cache
+        $feed_articles = $cache_sistem_lib->get_cache( $cache_id );
+        if ( false === $feed_articles ) {
+            // Check wordpress installation language to define articles rss url
+            $feed_uri = ( 'it_IT' === $locale ) ? 'https://wordlift.io/blog/it/feed/' : 'https://wordlift.io/blog/en/feed/';
+
+            // Get rss feed data, the response is cached by default for 12 hours
+            $feed = fetch_feed( $feed_uri );
+            if ( ! is_wp_error( $feed ) ) {
+                // Build an array of requested $articles_number, starting with element 0
+                $feed_articles = $feed->get_items( 0, $articles_number );
+                foreach ( $feed_articles as $key => $item ) {
+                    $data = array(
+                        // fetch_feed will return the title html decoded.
+                        'post_title'       => $item->get_title(),
+                        'post_date'        => $item->get_date( 'j F Y | g:i a' ),
+                        'post_url'         => self::add_utm_parameter( $item->get_permalink() ),
+                        // fetch_feed will return the description html (not decoded).
+                        'post_description' => $item->get_description(),
+                    );
+                    array_push( $posts_data, $data );
+                }
+                // Set articles in cache.
+                $cache_sistem_lib->set_cache( $cache_id, $posts_data );
+                $feed_articles = $posts_data;
+            }
+        }
+
+        return $feed_articles;
+    }
+
+    /**
+     * Add the `utm` parameter for GA.
+     *
+     * @since 3.19.0
+     *
+     * @param string $url The URL.
+     *
+     * @return string The URL with the `utm` parameter prepended by `&` or by `?`.
+     */
+    private static function add_utm_parameter( $url ) {
+
+        if ( false === strpos( $url, '?' ) ) {
+            return $url . '?utm=wl_dash';
+        }
+
+        return $url . '&utm=wl_dash';
+    }
+
+    /**
+     * Ajax call for more latest news.
+     *
+     * @uses  https://codex.wordpress.org/Function_Reference/wp_send_json_success
+     *
+     * @return string JSON obj with articles data.
+     */
+    public function ajax_get_latest_news() {
+        // Get wordlift articles
+        $start_position = explode( '_', $_POST['more_posts_link_id'] );
+        $data           = $this->get_last_wordlift_articles( $start_position[ count( $start_position ) - 1 ] );
+
+        // Return response as json object
+        wp_send_json_success( $data );
+    }
+
+    /**
+     * Add latest news widget to the administration dashboard.
+     */
+    public function add_dashboard_latest_news_widget() {
+        wp_add_dashboard_widget( 'wordlift-dashboard-latest-news-widget', 'Latest WordLift News', array(
+            $this,
+            'render',
+        ) );
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -24,17 +24,17 @@ 
 	 * Add needed hooks for the latest news widget.
 	 */
 	public function __construct() {
-		add_action( 'wp_ajax_wordlift_get_latest_news', array(
+		add_action('wp_ajax_wordlift_get_latest_news', array(
 			$this,
 			'ajax_get_latest_news',
-		) );
-		add_action( 'wp_dashboard_setup', array(
+		));
+		add_action('wp_dashboard_setup', array(
 			$this,
 			'add_dashboard_latest_news_widget',
-		) );
+		));
 
-		add_action( 'admin_enqueue_scripts', function () {
-			wp_enqueue_script( 'wl-admin-dashboard', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-admin-dashboard.js', array( 'jquery' ) );
+		add_action('admin_enqueue_scripts', function() {
+			wp_enqueue_script('wl-admin-dashboard', plugin_dir_url(dirname(__FILE__)).'admin/js/wordlift-admin-dashboard.js', array('jquery'));
 		} );
 	}
 
@@ -44,7 +44,7 @@ 
 	 * @return string Articles html markup.
 	 */
 	public function render() {
-		include( plugin_dir_path( __FILE__ ) . 'partials/wordlift-admin-news-widget.php' );
+		include(plugin_dir_path(__FILE__).'partials/wordlift-admin-news-widget.php');
 	}
 
 	/**
@@ -54,14 +54,14 @@ 
 	 *
 	 * @return array Latest posts data.
 	 */
-	public function get_last_wordlift_articles( $start_position = 0 ) {
+	public function get_last_wordlift_articles($start_position = 0) {
 		$feed_articles = $this->get_wordlift_articles_data();
 
 		// Filter articles by $start_position
-		if ( ! empty( $feed_articles ) ) {
+		if ( ! empty($feed_articles)) {
 			return array(
-				'posts_data'     => array_slice( $feed_articles, $start_position, 3 ),
-				'count'          => count( $feed_articles ),
+				'posts_data'     => array_slice($feed_articles, $start_position, 3),
+				'count'          => count($feed_articles),
 				'start_position' => $start_position,
 			);
 		}
@@ -79,37 +79,37 @@ 
 	 *
 	 * @return array Latest $articles_number feed posts.
 	 */
-	public function get_wordlift_articles_data( $articles_number = 10 ) {
+	public function get_wordlift_articles_data($articles_number = 10) {
 		// Init cache class
-		$cache_sistem_lib = new Wordlift_File_Cache_Service( WL_TEMP_DIR . 'articles/' );
+		$cache_sistem_lib = new Wordlift_File_Cache_Service(WL_TEMP_DIR.'articles/');
 		$locale           = get_locale();
-		$cache_id         = 'news_' . date( 'Y_m_d' ) . '_' . $locale;
+		$cache_id         = 'news_'.date('Y_m_d').'_'.$locale;
 		$posts_data       = array();
 
 		// Get latest articles from cache
-		$feed_articles = $cache_sistem_lib->get_cache( $cache_id );
-		if ( false === $feed_articles ) {
+		$feed_articles = $cache_sistem_lib->get_cache($cache_id);
+		if (false === $feed_articles) {
 			// Check wordpress installation language to define articles rss url
-			$feed_uri = ( 'it_IT' === $locale ) ? 'https://wordlift.io/blog/it/feed/' : 'https://wordlift.io/blog/en/feed/';
+			$feed_uri = ('it_IT' === $locale) ? 'https://wordlift.io/blog/it/feed/' : 'https://wordlift.io/blog/en/feed/';
 
 			// Get rss feed data, the response is cached by default for 12 hours
-			$feed = fetch_feed( $feed_uri );
-			if ( ! is_wp_error( $feed ) ) {
+			$feed = fetch_feed($feed_uri);
+			if ( ! is_wp_error($feed)) {
 				// Build an array of requested $articles_number, starting with element 0
-				$feed_articles = $feed->get_items( 0, $articles_number );
-				foreach ( $feed_articles as $key => $item ) {
+				$feed_articles = $feed->get_items(0, $articles_number);
+				foreach ($feed_articles as $key => $item) {
 					$data = array(
 						// fetch_feed will return the title html decoded.
 						'post_title'       => $item->get_title(),
-						'post_date'        => $item->get_date( 'j F Y | g:i a' ),
-						'post_url'         => self::add_utm_parameter( $item->get_permalink() ),
+						'post_date'        => $item->get_date('j F Y | g:i a'),
+						'post_url'         => self::add_utm_parameter($item->get_permalink()),
 						// fetch_feed will return the description html (not decoded).
 						'post_description' => $item->get_description(),
 					);
-					array_push( $posts_data, $data );
+					array_push($posts_data, $data);
 				}
 				// Set articles in cache.
-				$cache_sistem_lib->set_cache( $cache_id, $posts_data );
+				$cache_sistem_lib->set_cache($cache_id, $posts_data);
 				$feed_articles = $posts_data;
 			}
 		}
@@ -126,13 +126,13 @@ 
 	 *
 	 * @return string The URL with the `utm` parameter prepended by `&` or by `?`.
 	 */
-	private static function add_utm_parameter( $url ) {
+	private static function add_utm_parameter($url) {
 
-		if ( false === strpos( $url, '?' ) ) {
-			return $url . '?utm=wl_dash';
+		if (false === strpos($url, '?')) {
+			return $url.'?utm=wl_dash';
 		}
 
-		return $url . '&utm=wl_dash';
+		return $url.'&utm=wl_dash';
 	}
 
 	/**
@@ -144,21 +144,21 @@ 
 	 */
 	public function ajax_get_latest_news() {
 		// Get wordlift articles
-		$start_position = explode( '_', $_POST['more_posts_link_id'] );
-		$data           = $this->get_last_wordlift_articles( $start_position[ count( $start_position ) - 1 ] );
+		$start_position = explode('_', $_POST['more_posts_link_id']);
+		$data           = $this->get_last_wordlift_articles($start_position[count($start_position) - 1]);
 
 		// Return response as json object
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 
 	/**
 	 * Add latest news widget to the administration dashboard.
 	 */
 	public function add_dashboard_latest_news_widget() {
-		wp_add_dashboard_widget( 'wordlift-dashboard-latest-news-widget', 'Latest WordLift News', array(
+		wp_add_dashboard_widget('wordlift-dashboard-latest-news-widget', 'Latest WordLift News', array(
 			$this,
 			'render',
-		) );
+		));
 	}
 
 }

src/admin/class-wordlift-admin-setup.php

Indentation +194 added lines, -194 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -28,106 +28,106 @@ 
  */
 class Wordlift_Admin_Setup {
 
-	/**
-	 * A {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Configuration_Service A {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * A {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Key_Validation_Service A {@link Wordlift_Key_Validation_Service} instance.
-	 */
-	private $key_validation_service;
-
-	/**
-	 * A {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since    3.9.0
-	 *
-	 * @param Wordlift_Configuration_Service  $configuration_service  A {@link Wordlift_Configuration_Service} instance.
-	 * @param Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
-	 * @param Wordlift_Entity_Service         $entity_service         A {@link Wordlift_Entity_Service} instance.
-	 */
-	public function __construct( $configuration_service, $key_validation_service, $entity_service ) {
-
-		// Set a reference to the configuration service.
-		$this->configuration_service = $configuration_service;
-
-		// Set a reference to the key validation service.
-		$this->key_validation_service = $key_validation_service;
-
-		// Set a reference to the entity service.
-		$this->entity_service = $entity_service;
-
-		// Hook to some WP's events:
-		// When WP is loaded check whether the user decided to skip the set-up, i.e. don't show us even if WL is not set up.
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
-
-		// Hook to `admin_menu` in order to add our own setup wizard page.
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-
-		// Triggered when the user accesses the admin area, we decide whether to show our own wizard.
-		add_action( 'admin_init', array( $this, 'show_page' ) );
-
-		// Hook to `admin_notices` to display our notices.
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
-
-	}
-
-	/**
-	 * Hook to `admin_init` and redirect to WordLift's setup page if the `_wl_activation_redirect` transient flag is set.
-	 *
-	 * @since 3.9.0
-	 */
-	public function admin_init() {
-
-		// If the `_wl_activation_redirect` is set, the redirect to the setup page.
-		if ( get_transient( '_wl_activation_redirect' ) ) {
-			delete_transient( '_wl_activation_redirect' );
-
-			// If the user asked to skip the wizard then comply.
-			if ( $this->configuration_service->is_skip_wizard() ) {
-				return;
-			}
-
-			// If we're already on the page or the user doesn't have permissions, return.
-			if ( ( ! empty( $_GET['page'] ) && 'wl-setup' === $_GET['page'] ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
-				return;
-			}
-
-			// Finally redirect to the setup page.
-			wp_safe_redirect( admin_url( 'index.php?page=wl-setup' ) );
-
-			exit;
-		}
-
-	}
-
-	/**
-	 * Generate an admin notice suggesting to start the wizard if there is no configuration.
-	 *
-	 * @since    3.9.0
-	 */
-	public function admin_notices() {
-
-		// Use `wl_configuration_get_key` to check whether WL's key is set and that the user didn't disable the wizard.
-		if ( '' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard() ) { ?>
+    /**
+     * A {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Configuration_Service A {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * A {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Key_Validation_Service A {@link Wordlift_Key_Validation_Service} instance.
+     */
+    private $key_validation_service;
+
+    /**
+     * A {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service A {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since    3.9.0
+     *
+     * @param Wordlift_Configuration_Service  $configuration_service  A {@link Wordlift_Configuration_Service} instance.
+     * @param Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
+     * @param Wordlift_Entity_Service         $entity_service         A {@link Wordlift_Entity_Service} instance.
+     */
+    public function __construct( $configuration_service, $key_validation_service, $entity_service ) {
+
+        // Set a reference to the configuration service.
+        $this->configuration_service = $configuration_service;
+
+        // Set a reference to the key validation service.
+        $this->key_validation_service = $key_validation_service;
+
+        // Set a reference to the entity service.
+        $this->entity_service = $entity_service;
+
+        // Hook to some WP's events:
+        // When WP is loaded check whether the user decided to skip the set-up, i.e. don't show us even if WL is not set up.
+        add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+
+        // Hook to `admin_menu` in order to add our own setup wizard page.
+        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+
+        // Triggered when the user accesses the admin area, we decide whether to show our own wizard.
+        add_action( 'admin_init', array( $this, 'show_page' ) );
+
+        // Hook to `admin_notices` to display our notices.
+        add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+
+    }
+
+    /**
+     * Hook to `admin_init` and redirect to WordLift's setup page if the `_wl_activation_redirect` transient flag is set.
+     *
+     * @since 3.9.0
+     */
+    public function admin_init() {
+
+        // If the `_wl_activation_redirect` is set, the redirect to the setup page.
+        if ( get_transient( '_wl_activation_redirect' ) ) {
+            delete_transient( '_wl_activation_redirect' );
+
+            // If the user asked to skip the wizard then comply.
+            if ( $this->configuration_service->is_skip_wizard() ) {
+                return;
+            }
+
+            // If we're already on the page or the user doesn't have permissions, return.
+            if ( ( ! empty( $_GET['page'] ) && 'wl-setup' === $_GET['page'] ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
+                return;
+            }
+
+            // Finally redirect to the setup page.
+            wp_safe_redirect( admin_url( 'index.php?page=wl-setup' ) );
+
+            exit;
+        }
+
+    }
+
+    /**
+     * Generate an admin notice suggesting to start the wizard if there is no configuration.
+     *
+     * @since    3.9.0
+     */
+    public function admin_notices() {
+
+        // Use `wl_configuration_get_key` to check whether WL's key is set and that the user didn't disable the wizard.
+        if ( '' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard() ) { ?>
 			<div id="wl-message" class="updated">
 				<p><?php esc_html_e( 'Welcome to WordLift &#8211; You&lsquo;re almost ready to start', 'wordlift' ); ?></p>
 				<p class="submit"><a href="<?php echo esc_url( admin_url( 'admin.php?page=wl-setup' ) ); ?>"
@@ -138,129 +138,129 @@ 
 			</div>
 		<?php }
 
-	}
+    }
 
-	/**
-	 * Handle hiding the wizard notices by user request
-	 *
-	 * @since    3.9.0
-	 */
-	public function hide_notices() {
+    /**
+     * Handle hiding the wizard notices by user request
+     *
+     * @since    3.9.0
+     */
+    public function hide_notices() {
 
-		// If it's not a `wl-hide-notice` or the nonce is not set, return.
-		if ( ! isset( $_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'] ) ) {
-			return;
-		}
+        // If it's not a `wl-hide-notice` or the nonce is not set, return.
+        if ( ! isset( $_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'] ) ) {
+            return;
+        }
 
-		// If the nonce is invalid, return an error.
-		if ( ! wp_verify_nonce( $_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce' ) ) {
-			wp_die( __( 'Action failed. Please refresh the page and retry.', 'wordlift' ) );
-		}
+        // If the nonce is invalid, return an error.
+        if ( ! wp_verify_nonce( $_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce' ) ) {
+            wp_die( __( 'Action failed. Please refresh the page and retry.', 'wordlift' ) );
+        }
 
-		// If the user doesn't have the right privileges, return an error.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'wordlift' ) );
-		}
+        // If the user doesn't have the right privileges, return an error.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die( __( 'Cheatin&#8217; huh?', 'wordlift' ) );
+        }
 
-		// Store a flag telling to skip the wizard.
-		$this->configuration_service->set_skip_wizard( TRUE );
+        // Store a flag telling to skip the wizard.
+        $this->configuration_service->set_skip_wizard( TRUE );
 
-	}
+    }
 
-	/**
-	 * Register the wizard page to be able to access it
-	 *
-	 * @since    3.9.0
-	 */
-	public function admin_menu() {
+    /**
+     * Register the wizard page to be able to access it
+     *
+     * @since    3.9.0
+     */
+    public function admin_menu() {
 
-		// @todo: find another way to do this, since this is adding an empty space in WP's dashboard menu.
-		add_dashboard_page( '', '', 'manage_options', 'wl-setup', '' );
+        // @todo: find another way to do this, since this is adding an empty space in WP's dashboard menu.
+        add_dashboard_page( '', '', 'manage_options', 'wl-setup', '' );
 
-	}
+    }
 
-	/**
-	 * Displays the wizard page
-	 *
-	 * @since    3.9.0
-	 */
-	public function show_page() {
+    /**
+     * Displays the wizard page
+     *
+     * @since    3.9.0
+     */
+    public function show_page() {
 
-		// First check if we are in the wizard page at all, if not do nothing.
-		if ( empty( $_GET['page'] ) || 'wl-setup' !== $_GET['page'] ) {
-			return;
-		}
+        // First check if we are in the wizard page at all, if not do nothing.
+        if ( empty( $_GET['page'] ) || 'wl-setup' !== $_GET['page'] ) {
+            return;
+        }
 
-		// If it's a POST and the `wl-save-configuration` action is set, save the configuration.
-		if ( isset( $_POST['action'] ) && 'wl-save-configuration' === $_POST['action'] ) {
+        // If it's a POST and the `wl-save-configuration` action is set, save the configuration.
+        if ( isset( $_POST['action'] ) && 'wl-save-configuration' === $_POST['action'] ) {
 
-			// Check the nonce and the user capabilities.
-			check_admin_referer( 'wl-save-configuration' );
+            // Check the nonce and the user capabilities.
+            check_admin_referer( 'wl-save-configuration' );
 
-			// Check if the user has the right privileges.
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'Sorry, you do not have a permission to save the settings', 'wordlift' ) );
-			}
+            // Check if the user has the right privileges.
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'Sorry, you do not have a permission to save the settings', 'wordlift' ) );
+            }
 
-			// Save the configuration.
-			$this->save_configuration( $_POST );
+            // Save the configuration.
+            $this->save_configuration( $_POST );
 
-			// Redirect to the admin's page.
-			wp_redirect( admin_url() );
+            // Redirect to the admin's page.
+            wp_redirect( admin_url() );
 
-			exit;
-		}
+            exit;
+        }
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-setup.php';
+        include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-setup.php';
 
-		exit;
-	}
+        exit;
+    }
 
-	/**
-	 * Save WordLift's configuration using the provided parameters.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param array $params An array of configuration parameters.
-	 */
-	private function save_configuration( $params ) {
+    /**
+     * Save WordLift's configuration using the provided parameters.
+     *
+     * @since 3.9.0
+     *
+     * @param array $params An array of configuration parameters.
+     */
+    private function save_configuration( $params ) {
 
-		// We have the following parameters:
-		// `key`, holding WL's key,
-		// `vocabulary`, holding the vocabulary path,
-		// `language`, with the language code (e.g. `en`),
-		// `send_diagnostic`, the user preferences about sharing data with us.
-		// `user_type`, the user type either `personal` or `company`,
-		// `name`, with the `personal` or `company`'s name,
-		// `logo`, the attachment id for the `personal` or `company` entity.
+        // We have the following parameters:
+        // `key`, holding WL's key,
+        // `vocabulary`, holding the vocabulary path,
+        // `language`, with the language code (e.g. `en`),
+        // `send_diagnostic`, the user preferences about sharing data with us.
+        // `user_type`, the user type either `personal` or `company`,
+        // `name`, with the `personal` or `company`'s name,
+        // `logo`, the attachment id for the `personal` or `company` entity.
 
-		// Store the key:
-		$this->configuration_service->set_key( $params['key'] );
+        // Store the key:
+        $this->configuration_service->set_key( $params['key'] );
 
-		// Store the vocabulary path:
-		$this->configuration_service->set_entity_base_path( $params['vocabulary'] );
+        // Store the vocabulary path:
+        $this->configuration_service->set_entity_base_path( $params['vocabulary'] );
 
-		// Store the site's language:
-		$this->configuration_service->set_language_code( $params['language'] );
+        // Store the site's language:
+        $this->configuration_service->set_language_code( $params['language'] );
 
-		// Store the preferences in variable, because if the checkbox is not checked
-		// the `share-diagnostic` will not exists in `$params` array.
-		$share_diagnostic_preferences = empty( $params['share-diagnostic'] ) ? 'no' : 'yes' ;
+        // Store the preferences in variable, because if the checkbox is not checked
+        // the `share-diagnostic` will not exists in `$params` array.
+        $share_diagnostic_preferences = empty( $params['share-diagnostic'] ) ? 'no' : 'yes' ;
 
-		// Store the diagnostic preferences:
-		$this->configuration_service->set_diagnostic_preferences( $share_diagnostic_preferences );
+        // Store the diagnostic preferences:
+        $this->configuration_service->set_diagnostic_preferences( $share_diagnostic_preferences );
 
-		// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-		$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person' );
+        // Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
+        $type_uri = sprintf( 'http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person' );
 
-		// Create an entity for the publisher.
-		$publisher_post_id = $this->entity_service->create( $params['name'], $type_uri, $params['logo'], 'publish' );
+        // Create an entity for the publisher.
+        $publisher_post_id = $this->entity_service->create( $params['name'], $type_uri, $params['logo'], 'publish' );
 
-		// Store the publisher entity post id in the configuration.
-		$this->configuration_service->set_publisher_id( $publisher_post_id );
+        // Store the publisher entity post id in the configuration.
+        $this->configuration_service->set_publisher_id( $publisher_post_id );
 
-		flush_rewrite_rules(); // Needed because of possible change to the entity base path.
+        flush_rewrite_rules(); // Needed because of possible change to the entity base path.
 
-	}
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -12,7 +12,7 @@ 
  * @since      3.9.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -64,7 +64,7 @@ 
 	 * @param Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
 	 * @param Wordlift_Entity_Service         $entity_service         A {@link Wordlift_Entity_Service} instance.
 	 */
-	public function __construct( $configuration_service, $key_validation_service, $entity_service ) {
+	public function __construct($configuration_service, $key_validation_service, $entity_service) {
 
 		// Set a reference to the configuration service.
 		$this->configuration_service = $configuration_service;
@@ -77,16 +77,16 @@ 
 
 		// Hook to some WP's events:
 		// When WP is loaded check whether the user decided to skip the set-up, i.e. don't show us even if WL is not set up.
-		add_action( 'wp_loaded', array( $this, 'hide_notices' ) );
+		add_action('wp_loaded', array($this, 'hide_notices'));
 
 		// Hook to `admin_menu` in order to add our own setup wizard page.
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
 
 		// Triggered when the user accesses the admin area, we decide whether to show our own wizard.
-		add_action( 'admin_init', array( $this, 'show_page' ) );
+		add_action('admin_init', array($this, 'show_page'));
 
 		// Hook to `admin_notices` to display our notices.
-		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action('admin_notices', array($this, 'admin_notices'));
 
 	}
 
@@ -98,21 +98,21 @@ 
 	public function admin_init() {
 
 		// If the `_wl_activation_redirect` is set, the redirect to the setup page.
-		if ( get_transient( '_wl_activation_redirect' ) ) {
-			delete_transient( '_wl_activation_redirect' );
+		if (get_transient('_wl_activation_redirect')) {
+			delete_transient('_wl_activation_redirect');
 
 			// If the user asked to skip the wizard then comply.
-			if ( $this->configuration_service->is_skip_wizard() ) {
+			if ($this->configuration_service->is_skip_wizard()) {
 				return;
 			}
 
 			// If we're already on the page or the user doesn't have permissions, return.
-			if ( ( ! empty( $_GET['page'] ) && 'wl-setup' === $_GET['page'] ) || is_network_admin() || isset( $_GET['activate-multi'] ) || ! current_user_can( 'manage_options' ) ) {
+			if (( ! empty($_GET['page']) && 'wl-setup' === $_GET['page']) || is_network_admin() || isset($_GET['activate-multi']) || ! current_user_can('manage_options')) {
 				return;
 			}
 
 			// Finally redirect to the setup page.
-			wp_safe_redirect( admin_url( 'index.php?page=wl-setup' ) );
+			wp_safe_redirect(admin_url('index.php?page=wl-setup'));
 
 			exit;
 		}
@@ -127,13 +127,13 @@ 
 	public function admin_notices() {
 
 		// Use `wl_configuration_get_key` to check whether WL's key is set and that the user didn't disable the wizard.
-		if ( '' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard() ) { ?>
+		if ('' === $this->configuration_service->get_key() && ! $this->configuration_service->is_skip_wizard()) { ?>
 			<div id="wl-message" class="updated">
-				<p><?php esc_html_e( 'Welcome to WordLift &#8211; You&lsquo;re almost ready to start', 'wordlift' ); ?></p>
-				<p class="submit"><a href="<?php echo esc_url( admin_url( 'admin.php?page=wl-setup' ) ); ?>"
-				                     class="button-primary"><?php esc_html_e( 'Run the Setup Wizard', 'wordlift' ); ?></a>
+				<p><?php esc_html_e('Welcome to WordLift &#8211; You&lsquo;re almost ready to start', 'wordlift'); ?></p>
+				<p class="submit"><a href="<?php echo esc_url(admin_url('admin.php?page=wl-setup')); ?>"
+				                     class="button-primary"><?php esc_html_e('Run the Setup Wizard', 'wordlift'); ?></a>
 					<a class="button-secondary skip"
-					   href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wl-hide-notice', 'install' ), 'wordlift_hide_notices_nonce', '_wl_notice_nonce' ) ); ?>"><?php esc_html_e( 'Skip Setup', 'wordlift' ); ?></a>
+					   href="<?php echo esc_url(wp_nonce_url(add_query_arg('wl-hide-notice', 'install'), 'wordlift_hide_notices_nonce', '_wl_notice_nonce')); ?>"><?php esc_html_e('Skip Setup', 'wordlift'); ?></a>
 				</p>
 			</div>
 		<?php }
@@ -148,22 +148,22 @@ 
 	public function hide_notices() {
 
 		// If it's not a `wl-hide-notice` or the nonce is not set, return.
-		if ( ! isset( $_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'] ) ) {
+		if ( ! isset($_GET['wl-hide-notice'], $_GET['_wl_notice_nonce'])) {
 			return;
 		}
 
 		// If the nonce is invalid, return an error.
-		if ( ! wp_verify_nonce( $_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce' ) ) {
-			wp_die( __( 'Action failed. Please refresh the page and retry.', 'wordlift' ) );
+		if ( ! wp_verify_nonce($_GET['_wl_notice_nonce'], 'wordlift_hide_notices_nonce')) {
+			wp_die(__('Action failed. Please refresh the page and retry.', 'wordlift'));
 		}
 
 		// If the user doesn't have the right privileges, return an error.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die( __( 'Cheatin&#8217; huh?', 'wordlift' ) );
+		if ( ! current_user_can('manage_options')) {
+			wp_die(__('Cheatin&#8217; huh?', 'wordlift'));
 		}
 
 		// Store a flag telling to skip the wizard.
-		$this->configuration_service->set_skip_wizard( TRUE );
+		$this->configuration_service->set_skip_wizard(TRUE);
 
 	}
 
@@ -175,7 +175,7 @@ 
 	public function admin_menu() {
 
 		// @todo: find another way to do this, since this is adding an empty space in WP's dashboard menu.
-		add_dashboard_page( '', '', 'manage_options', 'wl-setup', '' );
+		add_dashboard_page('', '', 'manage_options', 'wl-setup', '');
 
 	}
 
@@ -187,31 +187,31 @@ 
 	public function show_page() {
 
 		// First check if we are in the wizard page at all, if not do nothing.
-		if ( empty( $_GET['page'] ) || 'wl-setup' !== $_GET['page'] ) {
+		if (empty($_GET['page']) || 'wl-setup' !== $_GET['page']) {
 			return;
 		}
 
 		// If it's a POST and the `wl-save-configuration` action is set, save the configuration.
-		if ( isset( $_POST['action'] ) && 'wl-save-configuration' === $_POST['action'] ) {
+		if (isset($_POST['action']) && 'wl-save-configuration' === $_POST['action']) {
 
 			// Check the nonce and the user capabilities.
-			check_admin_referer( 'wl-save-configuration' );
+			check_admin_referer('wl-save-configuration');
 
 			// Check if the user has the right privileges.
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'Sorry, you do not have a permission to save the settings', 'wordlift' ) );
+			if ( ! current_user_can('manage_options')) {
+				wp_die(__('Sorry, you do not have a permission to save the settings', 'wordlift'));
 			}
 
 			// Save the configuration.
-			$this->save_configuration( $_POST );
+			$this->save_configuration($_POST);
 
 			// Redirect to the admin's page.
-			wp_redirect( admin_url() );
+			wp_redirect(admin_url());
 
 			exit;
 		}
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-setup.php';
+		include plugin_dir_path(dirname(__FILE__)).'admin/partials/wordlift-admin-setup.php';
 
 		exit;
 	}
@@ -223,7 +223,7 @@ 
 	 *
 	 * @param array $params An array of configuration parameters.
 	 */
-	private function save_configuration( $params ) {
+	private function save_configuration($params) {
 
 		// We have the following parameters:
 		// `key`, holding WL's key,
@@ -235,29 +235,29 @@ 
 		// `logo`, the attachment id for the `personal` or `company` entity.
 
 		// Store the key:
-		$this->configuration_service->set_key( $params['key'] );
+		$this->configuration_service->set_key($params['key']);
 
 		// Store the vocabulary path:
-		$this->configuration_service->set_entity_base_path( $params['vocabulary'] );
+		$this->configuration_service->set_entity_base_path($params['vocabulary']);
 
 		// Store the site's language:
-		$this->configuration_service->set_language_code( $params['language'] );
+		$this->configuration_service->set_language_code($params['language']);
 
 		// Store the preferences in variable, because if the checkbox is not checked
 		// the `share-diagnostic` will not exists in `$params` array.
-		$share_diagnostic_preferences = empty( $params['share-diagnostic'] ) ? 'no' : 'yes' ;
+		$share_diagnostic_preferences = empty($params['share-diagnostic']) ? 'no' : 'yes';
 
 		// Store the diagnostic preferences:
-		$this->configuration_service->set_diagnostic_preferences( $share_diagnostic_preferences );
+		$this->configuration_service->set_diagnostic_preferences($share_diagnostic_preferences);
 
 		// Set the type URI, either http://schema.org/Person or http://schema.org/Organization.
-		$type_uri = sprintf( 'http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person' );
+		$type_uri = sprintf('http://schema.org/%s', 'organization' === $params['user_type'] ? 'Organization' : 'Person');
 
 		// Create an entity for the publisher.
-		$publisher_post_id = $this->entity_service->create( $params['name'], $type_uri, $params['logo'], 'publish' );
+		$publisher_post_id = $this->entity_service->create($params['name'], $type_uri, $params['logo'], 'publish');
 
 		// Store the publisher entity post id in the configuration.
-		$this->configuration_service->set_publisher_id( $publisher_post_id );
+		$this->configuration_service->set_publisher_id($publisher_post_id);
 
 		flush_rewrite_rules(); // Needed because of possible change to the entity base path.
 

src/admin/partials/wordlift-admin-news-widget.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <?php $articles = $this->get_last_wordlift_articles(); ?>
 <div id='news_container'>
-	<?php if ( ! empty( $articles['posts_data'] ) ) { ?>
-		<?php foreach ( $articles['posts_data'] as $key => $item ) { ?>
+	<?php if ( ! empty($articles['posts_data'])) { ?>
+		<?php foreach ($articles['posts_data'] as $key => $item) { ?>
             <div>
                 <a target="_blank"
-                   href="<?php echo esc_url( $item['post_url'] ); ?>"><?php echo esc_html( $item['post_title'] ); ?></a>
+                   href="<?php echo esc_url($item['post_url']); ?>"><?php echo esc_html($item['post_title']); ?></a>
                 <p><?php echo $item['post_description']; ?></p>
             </div>
 		<?php } ?>
 	<?php } ?>
     <div>
         <a href="#" id="max_posts_count_3"
-           class="wl_more_posts"><?php echo esc_html__( 'More posts', 'wordlift' ); ?></a>
+           class="wl_more_posts"><?php echo esc_html__('More posts', 'wordlift'); ?></a>
     </div>
 </div>

src/admin/partials/admin-setup/step-1.php

Spacing +10 added lines, -10 removed lines

@@ -1,42 +1,42 @@ 
 <!-- Pane 1 content -->
 <script type="text/html" id="page-0">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Welcome', 'wordlift' ); ?>
+		<?php esc_html_e('Welcome', 'wordlift'); ?>
 	</h2>
 
 	<p class="page-txt">
-		   <?php esc_html_e( 'Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift' ); ?>
+		   <?php esc_html_e('Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift'); ?>
 	</p>
 
 	<ul class="page-list">
 		<li>
 			<span class="fa fa-university"></span>
-			<?php esc_html_e( 'Trustworthiness', 'wordlift' ); ?>
+			<?php esc_html_e('Trustworthiness', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-map-marker"></span>
-			<?php esc_html_e( 'Enrichment', 'wordlift' ); ?>
+			<?php esc_html_e('Enrichment', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-heart"></span>
-			<?php esc_html_e( 'Engagement', 'wordlift' ); ?>
+			<?php esc_html_e('Engagement', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-hand-o-right"></span>
-			<?php esc_html_e( 'Smart Navigation', 'wordlift' ); ?>
+			<?php esc_html_e('Smart Navigation', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-google"></span>
-			<?php esc_html_e( 'SEO Optimization', 'wordlift' ); ?>
+			<?php esc_html_e('SEO Optimization', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-group"></span>
-			<?php esc_html_e( 'Content Marketing', 'wordlift' ); ?>
+			<?php esc_html_e('Content Marketing', 'wordlift'); ?>
 		</li>
 	</ul>
 
@@ -46,13 +46,13 @@ 
 				target="_tab"
 				class="button"
 			>
-				<?php esc_html_e( 'Learn More', 'wordlift' ); ?>
+				<?php esc_html_e('Learn More', 'wordlift'); ?>
 			</a>
 			<input
 				type="button"
 				data-wl-next="wl-next"
 				class="wl-default-action"
-				value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+				value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 			>
 	</div>
 </script>
\ No newline at end of file

src/admin/partials/admin-setup/step-4.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@ 
 <!-- Pane 4 content -->
 <script type="text/html" id="page-3">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Vocabulary', 'wordlift' ); ?>	
+		<?php esc_html_e('Vocabulary', 'wordlift'); ?>	
 	</h2>
 
 	<p class="page-txt">
-		<?php esc_html_e( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift' ); ?>
+		<?php esc_html_e('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift'); ?>
 	</p>
 
 	<input
@@ -19,7 +19,7 @@ 
 	>
 	
 	<p class="page-det">
-		<?php esc_html_e( 'Leave it empty to place your entities in the root folder of your website', 'wordlift' ); ?>
+		<?php esc_html_e('Leave it empty to place your entities in the root folder of your website', 'wordlift'); ?>
 	</p>
 	
 	<div class="btn-wrapper">
@@ -27,7 +27,7 @@ 
 			type="button"
 			data-wl-next="wl-next"
 			class="wl-default-action"
-			value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/admin-setup/step-2.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	<br>
 	<p class="page-txt">
 		<?php
-			esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' ); 
-		?>
+            esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' ); 
+        ?>
 	</p>
 	<input
 		type="checkbox"

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@ 
 <!-- Pane 2 content -->
 <script type="text/html" id="page-1">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Diagnostic', 'wordlift' ); ?>
+		<?php esc_html_e('Diagnostic', 'wordlift'); ?>
 	</h2>
 	<br>
 	<p class="page-txt">
 		<?php
-			esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' ); 
+			esc_html_e('Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift'); 
 		?>
 	</p>
 	<input
@@ -17,12 +17,12 @@ 
 		checked
 	>
 	<label for="share-diagnostic">
-		<?php esc_html_e( 'Share diagnostic data', 'wordlift' ); ?>
+		<?php esc_html_e('Share diagnostic data', 'wordlift'); ?>
 	</label>
 	
 	<p class="privacy-policy-details">
 		<a href="https://wordlift.io/privacy-policy/" target="_blank">
-			<?php esc_html_e( 'About our privacy policy...', 'wordlift' ); ?>	
+			<?php esc_html_e('About our privacy policy...', 'wordlift'); ?>	
 		</a>
 	</p>
 
@@ -31,7 +31,7 @@ 
 			type="button"
 			data-wl-next="wl-next"
 			class="wl-default-action"
-			value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/admin-setup/step-6.php

Spacing +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <!-- Pane 6 content -->
 <script type="text/html" id="page-5">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Publisher', 'wordlift' ); ?>	
+		<?php esc_html_e('Publisher', 'wordlift'); ?>	
 	</h2>
 
 	<p class="page-txt">
-		<?php esc_html_e( 'Are you going to publish as an individual or as a company?', 'wordlift' ); ?>
+		<?php esc_html_e('Are you going to publish as an individual or as a company?', 'wordlift'); ?>
 	</p>
 
 	<div class="radio-wrapper">
@@ -20,7 +20,7 @@ 
 			<span class="radio"><span class="check"></span></span>
 
 			<span class="label">
-				<?php esc_html_e( 'Personal', 'wordlift' ); ?>	
+				<?php esc_html_e('Personal', 'wordlift'); ?>	
 			</span>
 		</label>
 
@@ -35,7 +35,7 @@ 
 			<span class="radio"><span class="check"></span></span>
 
 			<span class="label">
-				<?php esc_html_e( 'Company', 'wordlift' ); ?>
+				<?php esc_html_e('Company', 'wordlift'); ?>
 			</span>
 		</label>
 	</div>
@@ -47,7 +47,7 @@ 
 		value=""
 		autocomplete="off"
 		class="untouched invalid"
-		placeholder="<?php esc_attr_e( "What's your name?", 'wordlift' ); ?>"
+		placeholder="<?php esc_attr_e("What's your name?", 'wordlift'); ?>"
 	>
 
 	<div data-wl-logo="wl-logo">
@@ -65,7 +65,7 @@ 
 			class="add-logo"
 			href="javascript:void(0);"
 		>
-			<?php esc_html_e( 'Add your logo', 'wordlift' ); ?>
+			<?php esc_html_e('Add your logo', 'wordlift'); ?>
 		</a>
 	</div>
 
@@ -74,7 +74,7 @@ 
 			type="submit"
 			id="btn-finish"
 			class="wl-default-action"
-			value="<?php esc_attr_e( 'Finish', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Finish', 'wordlift'); ?>"
 		>
 	</div>
 </script>