insideout10 / wordlift-plugin

src/includes/class-wordlift.php

Indentation +765 added lines, -765 removed lines

@@ -29,829 +29,829 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since  3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	private $schema_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since  3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	private $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_List_Service $entity_list_service The Entity list service.
-	 */
-	private $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since  3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The WordLift Dashboard adapter.
-	 *
-	 * @since  3.4.0
-	 * @access private
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
-	 */
-	private $dashboard_service;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Post_Type_Service
-	 */
-	private $entity_post_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service
-	 */
-	private $entity_link_service;
-
-	/**
-	 * The page service instance which processes the page output in order to insert schema.org microdata to export the
-	 * correct page title to Google+.
-	 *
-	 * @since  3.5.3
-	 * @access private
-	 * @var \Wordlift_Page_Service
-	 */
-	private $page_service;
-
-	/**
-	 * A {@link Wordlift_Sparql_Service} instance.
-	 *
-	 * @var    3.6.0
-	 * @access private
-	 * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
-	 */
-	private $sparql_service;
-
-	/**
-	 * A {@link Wordlift_Import_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
-	 */
-	private $import_service;
-
-	/**
-	 * A {@link Wordlift_Rebuild_Service} instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
-	 */
-	private $rebuild_service;
-
-	/**
-	 * A {@link Wordlift_Jsonld_Service} instance.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
-	 */
-	private $jsonld_service;
-
-	/**
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var \Wordlift_Property_Factory $property_factory
-	 */
-	private $property_factory;
-
-	/**
-	 * The 'Download Your Data' page.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
-	 */
-	private $download_your_data_page;
-
-	/**
-	 * The install wizard page.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
-	 */
-	private $admin_setup;
-
-	/**
-	 * The Content Filter Service hooks up to the 'the_content' filter and provides
-	 * linking of entities to their pages.
-	 *
-	 * @since  3.8.0
-	 * @access private
-	 * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
-	 */
-	private $content_filter_service;
-
-	/**
-	 * A {@link Wordlift_Key_Validation_Service} instance.
-	 *
-	 * @since  3.9.0
-	 * @access private
-	 * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
-	 */
-	private $key_validation_service;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.10.0-dev';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * WordLift's supported languages.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
-
-		/**
-		 * The Redirect service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The configuration service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
-
-		/**
-		 * The entity post type service (this is the WordPress post type, not the entity schema type).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
-
-		/**
-		 * The entity type service (i.e. the schema type).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-
-		/**
-		 * The entity link service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The schema:url property service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-page-service.php';
-
-		/**
-		 * The SPARQL service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
-
-		/**
-		 * The WordLift import service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
-
-		/**
-		 * The WordLift URI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-listable.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
-
-		/**
-		 * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rebuild-service.php';
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
-
-		/**
-		 * Load the converters.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-to-jsonld-converter.php';
-
-		/**
-		 * Load the content filter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
-
-		/**
-		 * Load the JSON-LD service to publish entities using JSON-LD.s
-		 *
-		 * @since 3.8.0
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
-
-		/**
-		 * Load the WordLift key validation service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
-
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The admin 'Install wizard' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since  3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    private $schema_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since  3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    private $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_List_Service $entity_list_service The Entity list service.
+     */
+    private $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since  3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The WordLift Dashboard adapter.
+     *
+     * @since  3.4.0
+     * @access private
+     * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
+     */
+    private $dashboard_service;
+
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Post_Type_Service
+     */
+    private $entity_post_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service
+     */
+    private $entity_link_service;
+
+    /**
+     * The page service instance which processes the page output in order to insert schema.org microdata to export the
+     * correct page title to Google+.
+     *
+     * @since  3.5.3
+     * @access private
+     * @var \Wordlift_Page_Service
+     */
+    private $page_service;
+
+    /**
+     * A {@link Wordlift_Sparql_Service} instance.
+     *
+     * @var    3.6.0
+     * @access private
+     * @var \Wordlift_Sparql_Service $sparql_service A {@link Wordlift_Sparql_Service} instance.
+     */
+    private $sparql_service;
+
+    /**
+     * A {@link Wordlift_Import_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Import_Service $import_service A {@link Wordlift_Import_Service} instance.
+     */
+    private $import_service;
+
+    /**
+     * A {@link Wordlift_Rebuild_Service} instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Rebuild_Service $rebuild_service A {@link Wordlift_Rebuild_Service} instance.
+     */
+    private $rebuild_service;
+
+    /**
+     * A {@link Wordlift_Jsonld_Service} instance.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Jsonld_Service $jsonld_service A {@link Wordlift_Jsonld_Service} instance.
+     */
+    private $jsonld_service;
+
+    /**
+     *
+     * @since  3.7.0
+     * @access private
+     * @var \Wordlift_Property_Factory $property_factory
+     */
+    private $property_factory;
+
+    /**
+     * The 'Download Your Data' page.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var \Wordlift_Admin_Download_Your_Data_Page $download_your_data_page The 'Download Your Data' page.
+     */
+    private $download_your_data_page;
+
+    /**
+     * The install wizard page.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var \Wordlift_Admin_Setup $admin_setup The Install wizard.
+     */
+    private $admin_setup;
+
+    /**
+     * The Content Filter Service hooks up to the 'the_content' filter and provides
+     * linking of entities to their pages.
+     *
+     * @since  3.8.0
+     * @access private
+     * @var \Wordlift_Content_Filter_Service $content_filter_service A {@link Wordlift_Content_Filter_Service} instance.
+     */
+    private $content_filter_service;
+
+    /**
+     * A {@link Wordlift_Key_Validation_Service} instance.
+     *
+     * @since  3.9.0
+     * @access private
+     * @var Wordlift_Key_Validation_Service $key_validation_service A {@link Wordlift_Key_Validation_Service} instance.
+     */
+    private $key_validation_service;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.10.0-dev';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * WordLift's supported languages.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-languages.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+
+        /**
+         * The Redirect service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The configuration service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-configuration-service.php';
+
+        /**
+         * The entity post type service (this is the WordPress post type, not the entity schema type).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-type-service.php';
+
+        /**
+         * The entity type service (i.e. the schema type).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+
+        /**
+         * The entity link service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The schema:url property service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-service.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-url-property-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-page-service.php';
+
+        /**
+         * The SPARQL service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sparql-service.php';
+
+        /**
+         * The WordLift import service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-import-service.php';
+
+        /**
+         * The WordLift URI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-uri-service.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-listable.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-property-factory.php';
+
+        /**
+         * The WordLift rebuild service, used to rebuild the remote dataset using the local data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-rebuild-service.php';
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/properties/class-wordlift-property-getter-factory.php';
+
+        /**
+         * Load the converters.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-post-to-jsonld-converter.php';
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-uri-to-jsonld-converter.php';
+
+        /**
+         * Load the content filter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-content-filter-service.php';
+
+        /**
+         * Load the JSON-LD service to publish entities using JSON-LD.s
+         *
+         * @since 3.8.0
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-jsonld-service.php';
+
+        /**
+         * Load the WordLift key validation service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-key-validation-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The admin 'Install wizard' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-setup.php';
 
-		/**
-		 * The admin 'Download Your Data' page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
+        /**
+         * The admin 'Download Your Data' page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-download-your-data-page.php';
 
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
 
-		/**
-		 * The shortcode abstract class.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
+        /**
+         * The shortcode abstract class.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-shortcode.php';
 
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
 
-		/**
-		 * The Navigator shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
+        /**
+         * The Navigator shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-navigator-shortcode.php';
 
-		/**
-		 * The chord shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
+        /**
+         * The chord shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.php';
 
-		/**
-		 * The geomap shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
+        /**
+         * The geomap shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-geomap-shortcode.php';
 
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
 
-		$this->loader = new Wordlift_Loader();
+        $this->loader = new Wordlift_Loader();
 
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
 
-		// Create the configuration service.
-		$configuration_service = new Wordlift_Configuration_Service();
+        // Create the configuration service.
+        $configuration_service = new Wordlift_Configuration_Service();
 
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $configuration_service->get_entity_base_path() );
+        // Create an entity type service instance. It'll be later bound to the init action.
+        $this->entity_post_type_service = new Wordlift_Entity_Post_Type_Service( Wordlift_Entity_Service::TYPE_NAME, $configuration_service->get_entity_base_path() );
 
-		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $configuration_service->get_entity_base_path() );
+        // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+        $this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_post_type_service, $configuration_service->get_entity_base_path() );
 
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
 
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
-		$this->sparql_service = new Wordlift_Sparql_Service();
+        $this->sparql_service = new Wordlift_Sparql_Service();
 
-		// Create an instance of the Schema service.
-		$schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
-		$this->schema_service        = new Wordlift_Schema_Service();
+        // Create an instance of the Schema service.
+        $schema_url_property_service = new Wordlift_Schema_Url_Property_Service( $this->sparql_service );
+        $this->schema_service        = new Wordlift_Schema_Service();
 
-		// Create an instance of the Notice service.
-		$this->notice_service = new Wordlift_Notice_Service();
+        // Create an instance of the Notice service.
+        $this->notice_service = new Wordlift_Notice_Service();
 
-		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
+        // Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
+        $this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
 
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
 
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
 
-		// Initialize the shortcodes.
-		new Wordlift_Navigator_Shortcode();
-		new Wordlift_Chord_Shortcode();
-		new Wordlift_Geomap_Shortcode();
-		new Wordlift_Timeline_Shortcode();
+        // Initialize the shortcodes.
+        new Wordlift_Navigator_Shortcode();
+        new Wordlift_Chord_Shortcode();
+        new Wordlift_Geomap_Shortcode();
+        new Wordlift_Timeline_Shortcode();
 
-		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
+        // Create entity list customization (wp-admin/edit.php)
+        $this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
 
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
-		$this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
+        $this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
 
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
 
-		// Create an instance of the PrimaShop adapter.
-		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+        // Create an instance of the PrimaShop adapter.
+        $this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
-		$this->page_service = new Wordlift_Page_Service();
+        $this->page_service = new Wordlift_Page_Service();
 
-		// Create an import service instance to hook later to WP's import function.
-		$this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, wl_configuration_get_redlink_dataset_uri() );
+        // Create an import service instance to hook later to WP's import function.
+        $this->import_service = new Wordlift_Import_Service( $this->entity_post_type_service, $this->entity_service, $this->schema_service, $this->sparql_service, wl_configuration_get_redlink_dataset_uri() );
 
-		$uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
+        $uri_service = new Wordlift_Uri_Service( $GLOBALS['wpdb'] );
 
-		// Create a Rebuild Service instance, which we'll later bound to an ajax call.
-		$this->rebuild_service = new Wordlift_Rebuild_Service( $this->sparql_service, $uri_service );
+        // Create a Rebuild Service instance, which we'll later bound to an ajax call.
+        $this->rebuild_service = new Wordlift_Rebuild_Service( $this->sparql_service, $uri_service );
 
-		$entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
+        $entity_type_service = new Wordlift_Entity_Type_Service( $this->schema_service );
 
-		$this->property_factory = new Wordlift_Property_Factory( $schema_url_property_service );
-		$this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
+        $this->property_factory = new Wordlift_Property_Factory( $schema_url_property_service );
+        $this->property_factory->register( Wordlift_Schema_Url_Property_Service::META_KEY, $schema_url_property_service );
 
-		// Instantiate the JSON-LD service.
-		$property_getter                = Wordlift_Property_Getter_Factory::create( $this->entity_service );
-		$entity_uri_to_jsonld_converter = new Wordlift_Entity_Uri_To_Jsonld_Converter( $entity_type_service, $this->entity_service, $property_getter );
-		$this->jsonld_service           = new Wordlift_Jsonld_Service( $this->entity_service, $entity_uri_to_jsonld_converter );
+        // Instantiate the JSON-LD service.
+        $property_getter                = Wordlift_Property_Getter_Factory::create( $this->entity_service );
+        $entity_uri_to_jsonld_converter = new Wordlift_Entity_Uri_To_Jsonld_Converter( $entity_type_service, $this->entity_service, $property_getter );
+        $this->jsonld_service           = new Wordlift_Jsonld_Service( $this->entity_service, $entity_uri_to_jsonld_converter );
 
-		// Create an instance of the Key Validation service. This service is later hooked to provide an AJAX call (only for admins).
-		$this->key_validation_service = new Wordlift_Key_Validation_Service();
+        // Create an instance of the Key Validation service. This service is later hooked to provide an AJAX call (only for admins).
+        $this->key_validation_service = new Wordlift_Key_Validation_Service();
 
-		//** WordPress Admin */
-		$this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page();
+        //** WordPress Admin */
+        $this->download_your_data_page = new Wordlift_Admin_Download_Your_Data_Page();
 
-		// Create an instance of the install wizard.
-		$this->admin_setup = new Wordlift_Admin_Setup( $configuration_service, $this->key_validation_service, $this->entity_service );
+        // Create an instance of the install wizard.
+        $this->admin_setup = new Wordlift_Admin_Setup( $configuration_service, $this->key_validation_service, $this->entity_service );
 
-		// Create an instance of the content filter service.
-		$this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service );
+        // Create an instance of the content filter service.
+        $this->content_filter_service = new Wordlift_Content_Filter_Service( $this->entity_service );
 
-		// Load the debug service if WP is in debug mode.
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
-			new Wordlift_Debug_Service( $this->entity_service );
-		}
+        // Load the debug service if WP is in debug mode.
+        if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-debug-service.php';
+            new Wordlift_Debug_Service( $this->entity_service );
+        }
 
-	}
+    }
 
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
 
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 
-	}
+    }
 
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+        $plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
 
-		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+        // Hook the init action to the Topic Taxonomy service.
+        $this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
 
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
 
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the updated_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
 
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
 
-		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+        // Register custom allowed redirect hosts.
+        $this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
 
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
 
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
+        $this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+        $this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
 
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
-
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-
-		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
-		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
-
-		// Filter imported post meta.
-		$this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
-
-		// Notify the import service when an import starts and ends.
-		$this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
-		$this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
-
-		// Hook the AJAX wl_rebuild action to the Rebuild Service.
-		$this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
-
-		// Hook the menu to the Download Your Data page.
-		$this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
-
-		// Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
-		$this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
-
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
-
-		// Hook the AJAX wl_validate_key action to the Key Validation service.
-		$this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
-
-		// Hook the `admin_init` function to the Admin Setup.
-		$this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
-
-		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// Hook the content filter service to add entity links.
-		$this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-
-		$this->loader->add_action( 'wp_head', $this->page_service, 'wp_head', PHP_INT_MAX );
-		$this->loader->add_action( 'wp_footer', $this->page_service, 'wp_head', - PHP_INT_MAX );
-
-		// Hook the AJAX wl_jsonld action to the JSON-LD service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns
+        $this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+        $this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection
+        $this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+
+        // Filter imported post meta.
+        $this->loader->add_filter( 'wp_import_post_meta', $this->import_service, 'wp_import_post_meta', 10, 3 );
+
+        // Notify the import service when an import starts and ends.
+        $this->loader->add_action( 'import_start', $this->import_service, 'import_start', 10, 0 );
+        $this->loader->add_action( 'import_end', $this->import_service, 'import_end', 10, 0 );
+
+        // Hook the AJAX wl_rebuild action to the Rebuild Service.
+        $this->loader->add_action( 'wp_ajax_wl_rebuild', $this->rebuild_service, 'rebuild' );
+
+        // Hook the menu to the Download Your Data page.
+        $this->loader->add_action( 'admin_menu', $this->download_your_data_page, 'admin_menu', 100, 0 );
+
+        // Hook the admin-ajax.php?action=wl_download_your_data&out=xyz links.
+        $this->loader->add_action( 'wp_ajax_wl_download_your_data', $this->download_your_data_page, 'download_your_data', 10 );
+
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_wl_jsonld', $this->jsonld_service, 'get' );
+
+        // Hook the AJAX wl_validate_key action to the Key Validation service.
+        $this->loader->add_action( 'wp_ajax_wl_validate_key', $this->key_validation_service, 'validate_key' );
+
+        // Hook the `admin_init` function to the Admin Setup.
+        $this->loader->add_action( 'admin_init', $this->admin_setup, 'admin_init' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        // Register the entity post type.
+        $this->loader->add_action( 'init', $this->entity_post_type_service, 'register' );
+
+        // Bind the link generation and handling hooks to the entity link service.
+        $this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // Hook the content filter service to add entity links.
+        $this->loader->add_filter( 'the_content', $this->content_filter_service, 'the_content' );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+
+        $this->loader->add_action( 'wp_head', $this->page_service, 'wp_head', PHP_INT_MAX );
+        $this->loader->add_action( 'wp_footer', $this->page_service, 'wp_head', - PHP_INT_MAX );
+
+        // Hook the AJAX wl_jsonld action to the JSON-LD service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_jsonld', $this->jsonld_service, 'get' );
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

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

Indentation +38 added lines, -38 removed lines

@@ -16,34 +16,34 @@ 
 
 	<?php
 
-	// Enqueue wp.media functions.
-	wp_enqueue_media();
-
-	// Enqueue styles and scripts.
-	wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
-	wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
-		'common',
-		'wl-font-awesome',
-	) );
-	wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-admin-setup.js', array( 'jquery' ) );
-
-	// Set configuration settings.
-	wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
-		'ajaxUrl' => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
-		'action'  => 'wl_validate_key',
-		'media'   => array(
-			'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
-			'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-		),
-	) );
-
-	// Finally print styles and scripts.
-	wp_print_styles();
-	wp_print_scripts();
-	//	do_action( 'admin_print_styles' );
-	//	do_action( 'admin_print_scripts' );
-
-	?>
+    // Enqueue wp.media functions.
+    wp_enqueue_media();
+
+    // Enqueue styles and scripts.
+    wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
+    wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
+        'common',
+        'wl-font-awesome',
+    ) );
+    wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-admin-setup.js', array( 'jquery' ) );
+
+    // Set configuration settings.
+    wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
+        'ajaxUrl' => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
+        'action'  => 'wl_validate_key',
+        'media'   => array(
+            'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
+            'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+        ),
+    ) );
+
+    // Finally print styles and scripts.
+    wp_print_styles();
+    wp_print_scripts();
+    //	do_action( 'admin_print_styles' );
+    //	do_action( 'admin_print_scripts' );
+
+    ?>
 
 	<!-- Pane 1 content -->
 	<script type="text/html" id="page-0">
@@ -133,20 +133,20 @@ 
 		<select id="language" name="language" placeholder="<?php esc_attr_e( 'Choose your language', 'wordlift' ); ?>">
 			<?php
 
-			// Get WordLift's supported languages.
-			$languages = Wordlift_Languages::get_languages();
+            // Get WordLift's supported languages.
+            $languages = Wordlift_Languages::get_languages();
 
-			// Get WP's locale.
-			$locale = get_locale();
+            // Get WP's locale.
+            $locale = get_locale();
 
-			// Get the language locale part.
-			$parts = explode( '_', $locale );
+            // Get the language locale part.
+            $parts = explode( '_', $locale );
 
-			// If we support WP's configured language, then use that, otherwise use English by default.
-			$language = isset( $languages[ $parts[0] ] ) ? $parts[0] : 'en';
+            // If we support WP's configured language, then use that, otherwise use English by default.
+            $language = isset( $languages[ $parts[0] ] ) ? $parts[0] : 'en';
 
-			// Print all the supported language, preselecting the one configured in WP (or English if not supported).
-			foreach ( $languages as $code => $label ) { ?>
+            // Print all the supported language, preselecting the one configured in WP (or English if not supported).
+            foreach ( $languages as $code => $label ) { ?>
 				<option
 					value="<?php esc_attr_e( $code ) ?>" <?php echo selected( $code, $language, FALSE ) ?>><?php esc_html_e( $label ) ?></option>
 			<?php } ?>

Spacing +47 added lines, -47 removed lines

@@ -12,7 +12,7 @@ 
 	<!-- Defining responsive ambient. -->
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-	<title><?php esc_html_e( 'WordLift Setup', 'wordlift' ); ?></title>
+	<title><?php esc_html_e('WordLift Setup', 'wordlift'); ?></title>
 
 	<?php
 
@@ -20,22 +20,22 @@ 
 	wp_enqueue_media();
 
 	// Enqueue styles and scripts.
-	wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
-	wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
+	wp_enqueue_style('wl-font-awesome', plugin_dir_url(dirname(dirname(__FILE__))).'css/font-awesome.min.css');
+	wp_enqueue_style('wordlift-admin-setup', plugin_dir_url(dirname(__FILE__)).'css/wordlift-admin-setup.css', array(
 		'common',
 		'wl-font-awesome',
-	) );
-	wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-admin-setup.js', array( 'jquery' ) );
+	));
+	wp_enqueue_script('wordlift-admin-setup', plugin_dir_url(dirname(__FILE__)).'js/wordlift-admin-setup.js', array('jquery'));
 
 	// Set configuration settings.
-	wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
-		'ajaxUrl' => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
+	wp_localize_script('wordlift-admin-setup', '_wlAdminSetup', array(
+		'ajaxUrl' => parse_url(self_admin_url('admin-ajax.php'), PHP_URL_PATH),
 		'action'  => 'wl_validate_key',
 		'media'   => array(
-			'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
-			'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+			'title'  => __('WordLift Choose Logo', 'wordlift'),
+			'button' => array('text' => __('Choose Logo', 'wordlift')),
 		),
-	) );
+	));
 
 	// Finally print styles and scripts.
 	wp_print_styles();
@@ -47,90 +47,90 @@ 
 
 	<!-- Pane 1 content -->
 	<script type="text/html" id="page-0">
-		<h2 class="page-title"><?php esc_html_e( 'Welcome', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?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>
 		<div class="btn-wrapper">
 			<a href="https://wordlift.io/blogger/?utm_campaign=wl_activation_learn_more" target="_tab"
-			   class="button"><?php esc_html_e( 'Learn More', 'wordlift' ); ?></a>
+			   class="button"><?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>
 
 	<!-- Pane 2 content -->
 	<script type="text/html" id="page-1">
-		<h2 class="page-title"><?php esc_html_e( 'License Key', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('License Key', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'If you already puchased a plan, check your email, get the activation key from your inbox and insert it in the field below. Otherwise ....', 'wordlift' ); ?>
+			<?php esc_html_e('If you already puchased a plan, check your email, get the activation key from your inbox and insert it in the field below. Otherwise ....', 'wordlift'); ?>
 		</p>
 		<input type="text" data-wl-key="wl-key" class="invalid untouched" id="key" name="key" value=""
 		       autocomplete="off" placeholder="Activation Key">
 		<div class="btn-wrapper">
 			<a
 				href="https://wordlift.io/?utm_campaign=wl_activation_grab_the_key#plan-and-price" target="_tab"
-				class="button"><?php esc_html_e( 'Grab a Key!', 'wordlift' ); ?></a><input
+				class="button"><?php esc_html_e('Grab a Key!', '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>
 
 	<!-- Pane 3 content -->
 	<script type="text/html" id="page-2">
-		<h2 class="page-title"><?php esc_html_e( 'Vocabulary', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?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 type="text" id="vocabulary" name="vocabulary" autocomplete="off" value="vocabulary"
 		       class="valid untouched" data-wl-vocabulary="wl-vocabulary">
 		<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">
 			<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>
 
 	<!-- Pane 4 content -->
 	<script type="text/html" id="page-3">
-		<h2 class="page-title"><?php esc_html_e( 'Language', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('Language', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'Each WordLift key can be used only in one language. Pick yours.', 'wordlift' ); ?>
+			<?php esc_html_e('Each WordLift key can be used only in one language. Pick yours.', 'wordlift'); ?>
 		</p>
-		<select id="language" name="language" placeholder="<?php esc_attr_e( 'Choose your language', 'wordlift' ); ?>">
+		<select id="language" name="language" placeholder="<?php esc_attr_e('Choose your language', 'wordlift'); ?>">
 			<?php
 
 			// Get WordLift's supported languages.
@@ -140,45 +140,45 @@ 
 			$locale = get_locale();
 
 			// Get the language locale part.
-			$parts = explode( '_', $locale );
+			$parts = explode('_', $locale);
 
 			// If we support WP's configured language, then use that, otherwise use English by default.
-			$language = isset( $languages[ $parts[0] ] ) ? $parts[0] : 'en';
+			$language = isset($languages[$parts[0]]) ? $parts[0] : 'en';
 
 			// Print all the supported language, preselecting the one configured in WP (or English if not supported).
-			foreach ( $languages as $code => $label ) { ?>
+			foreach ($languages as $code => $label) { ?>
 				<option
-					value="<?php esc_attr_e( $code ) ?>" <?php echo selected( $code, $language, FALSE ) ?>><?php esc_html_e( $label ) ?></option>
+					value="<?php esc_attr_e($code) ?>" <?php echo selected($code, $language, FALSE) ?>><?php esc_html_e($label) ?></option>
 			<?php } ?>
 		</select>
 
 		<div class="btn-wrapper">
 			<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>
 
 	<!-- Pane 5 content -->
 	<script type="text/html" id="page-4">
-		<h2 class="page-title"><?php esc_html_e( 'Publisher', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?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">
 			<label for="personal">
 				<input id="personal" type="radio" name="user_type" value="person" checked>
 				<span class="radio"><span class="check"></span></span>
-				<span class="label"><?php esc_html_e( 'Personal', 'wordlift' ); ?></span>
+				<span class="label"><?php esc_html_e('Personal', 'wordlift'); ?></span>
 			</label>
 			<label for="company">
 				<input id="company" type="radio" name="user_type" value="organization">
 				<span class="radio"><span class="check"></span></span>
-				<span class="label"><?php esc_html_e( 'Company', 'wordlift' ); ?></span>
+				<span class="label"><?php esc_html_e('Company', 'wordlift'); ?></span>
 			</label>
 		</div>
 		<input type="text" id="name" name="name" data-wl-name="wl-name" 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">
 			<input type="hidden" name="logo"/>
@@ -186,12 +186,12 @@ 
 				<a data-wl-remove-logo="wl-remove-logo" href="javascript:void(0);" class="fa fa-times"></a>
 			</div>
 			<a data-wl-add-logo="wl-add-logo" 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>
 		<div class="btn-wrapper">
 			<input 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>
 
@@ -200,23 +200,23 @@ 
 
 <div class="wl-container">
 
-	<a href="<?php echo esc_url( admin_url() ); ?> " class="fa fa-times wl-close"></a>
+	<a href="<?php echo esc_url(admin_url()); ?> " class="fa fa-times wl-close"></a>
 
 	<header>
 		<h1><strong>Word</strong>Lift</h1>
-		<img src="<?php echo plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'images/shapes.png'; ?>"/>
+		<img src="<?php echo plugin_dir_url(dirname(dirname(__FILE__))).'images/shapes.png'; ?>"/>
 	</header>
 
 
 	<form method="post">
-		<?php wp_nonce_field( 'wl-save-configuration' ); ?>
+		<?php wp_nonce_field('wl-save-configuration'); ?>
 		<input type="hidden" name="action" value="wl-save-configuration"/>
 		<div class="viewport"></div>
 	</form>
 
 </div>
 
-<?php do_action( 'admin_footer' ); ?>
+<?php do_action('admin_footer'); ?>
 
 </body>
 </html>
\ No newline at end of file

src/admin/class-wordlift-admin-entity-list.php

Indentation +198 added lines, -198 removed lines

@@ -13,203 +13,203 @@
  */
 class Wordlift_Entity_List_Service {
 
-	/**
-	 * Size of the entity thumbnail in pixels
-	 *
-	 * @since  3.3.0
-	 */
-	const THUMB_SIZE = 50;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.3.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_List_Service' );
-
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * Register custom columns for entity listing in backend.
-	 *
-	 * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_posts_custom_column
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param array $columns the default columns.
-	 *
-	 * @return array Enhanced columns array.
-	 */
-	public function register_custom_columns( $columns ) {
-
-		// Take away first column and keep a reference,
-		// so we can later insert the thumbnail between the first and the rest of columns.
-		$columns_cb = $columns['cb'];
-		unset( $columns['cb'] );
-
-		// Thumbnails column is inserted in second place, while the related posts on the end.
-		$columns = array_merge(
-			array( 'cb' => $columns_cb ),                      // re-add first column
-			array( 'wl_column_thumbnail' => __( 'Image', 'wordlift' ) ),        // thumb
-			$columns,                                                               // default columns (without the first)
-			array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
-			array( 'wl_column_rating' => __( 'Rating', 'wordlift' ) ) // related posts
-		);
-
-		return $columns;
-	}
-
-	/**
-	 * Render custom columns.
-	 *
-	 * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_$post_type_posts_custom_column
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param string $column    the current column.
-	 * @param int    $entity_id An entity post id.
-	 */
-	public function render_custom_columns( $column, $entity_id ) {
-
-		switch ( $column ) {
-
-			case 'wl_column_related_posts':
-				echo count( wl_core_get_related_post_ids( $entity_id ) );
-				break;
-
-			case 'wl_column_thumbnail':
-
-				$edit_link = get_edit_post_link( $entity_id );
-				$thumb     = get_the_post_thumbnail( $entity_id, array( self::THUMB_SIZE, self::THUMB_SIZE ) );
-
-				if ( ! $thumb ) {
-					$thumb = "<img src='" . WL_DEFAULT_THUMBNAIL_PATH . "' width='" . self::THUMB_SIZE . "' />";
-				}
-				echo "<a href='" . esc_url( $edit_link ) . "'>$thumb</a>";
-				break;
-
-			case 'wl_column_rating':
-
-				$rating = $this->entity_service->get_rating_for( $entity_id );
-				echo '<i class="wl-traffic-light wl-tl-' . $rating['traffic_light_score'] . '">' . $rating['percentage_score'] . '%</i>';
-				break;
-		}
-
-	}
-
-	/**
-	 * Add wl-classification-scope select box before the 'Filter' button.
-	 *
-	 * @since 3.3.0
-	 */
-	public function restrict_manage_posts_classification_scope() {
-
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
-
-		$screen = get_current_screen();
-		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
-			return;
-		}
-
-		if ( $screen->post_type !== Wordlift_Entity_Service::TYPE_NAME ) {
-			return;
-		}
-
-		// Was a W already selected?
-		$selected = isset( $_GET['wl-classification-scope'] ) ?
-			$_GET['wl-classification-scope'] : '';
-
-		// Print select box with the 4W
-		$all_w = array(
-			__( "All 'W'" ),
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHEN_RELATION,
-		);
-		echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
-		foreach ( $all_w as $w ) {
-			$default = ( $selected === $w ) ? 'selected' : '';
-			echo sprintf( '<option value="%s" %s >%s</option>', $w, $default, __( $w ) );
-		}
-		echo '</select>';
-	}
-
-	/**
-	 * Server side response operations for the classification filter set in *restrict_manage_posts_classification_scope_filter*
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param array $clauses WP main query clauses.
-	 *
-	 * @return array Modified clauses.
-	 */
-	public function posts_clauses_classification_scope( $clauses ) {
-
-		// Run only on admin page.
-		if ( ! is_admin() ) {
-			return $clauses;
-		}
-
-		// Return safely if get_current_screen() is not defined (yet).
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
-			return $clauses;
-		}
-
-		// Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set.
-		$screen = get_current_screen();
-
-		// If there is any valid screen nothing to do.
-		if ( NULL === $screen ) {
-			return $clauses;
-		}
-
-		if ( ! ( $screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) {
-			return $clauses;
-		}
-
-		// Check a valid W was requested.
-		$requested_w = $_GET['wl-classification-scope'];
-
-		$all_w = array(
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHEN_RELATION,
-		);
-
-		if ( ! in_array( $requested_w, $all_w ) ) {
-			return $clauses;
-		}
-
-		global $wpdb;
-		$wl_relation_table = wl_core_get_relation_instances_table_name();
-
-		// Change WP main query clauses.
-		$clauses['join'] .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
-		$clauses['where'] .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
-		$clauses['distinct'] .= "DISTINCT";
-
-		return $clauses;
-	}
+    /**
+     * Size of the entity thumbnail in pixels
+     *
+     * @since  3.3.0
+     */
+    const THUMB_SIZE = 50;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.3.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.3.0
+     *
+     * @param \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    public function __construct( $entity_service ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_List_Service' );
+
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * Register custom columns for entity listing in backend.
+     *
+     * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_posts_custom_column
+     *
+     * @since 3.3.0
+     *
+     * @param array $columns the default columns.
+     *
+     * @return array Enhanced columns array.
+     */
+    public function register_custom_columns( $columns ) {
+
+        // Take away first column and keep a reference,
+        // so we can later insert the thumbnail between the first and the rest of columns.
+        $columns_cb = $columns['cb'];
+        unset( $columns['cb'] );
+
+        // Thumbnails column is inserted in second place, while the related posts on the end.
+        $columns = array_merge(
+            array( 'cb' => $columns_cb ),                      // re-add first column
+            array( 'wl_column_thumbnail' => __( 'Image', 'wordlift' ) ),        // thumb
+            $columns,                                                               // default columns (without the first)
+            array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
+            array( 'wl_column_rating' => __( 'Rating', 'wordlift' ) ) // related posts
+        );
+
+        return $columns;
+    }
+
+    /**
+     * Render custom columns.
+     *
+     * @see   https://codex.wordpress.org/Plugin_API/Action_Reference/manage_$post_type_posts_custom_column
+     *
+     * @since 3.3.0
+     *
+     * @param string $column    the current column.
+     * @param int    $entity_id An entity post id.
+     */
+    public function render_custom_columns( $column, $entity_id ) {
+
+        switch ( $column ) {
+
+            case 'wl_column_related_posts':
+                echo count( wl_core_get_related_post_ids( $entity_id ) );
+                break;
+
+            case 'wl_column_thumbnail':
+
+                $edit_link = get_edit_post_link( $entity_id );
+                $thumb     = get_the_post_thumbnail( $entity_id, array( self::THUMB_SIZE, self::THUMB_SIZE ) );
+
+                if ( ! $thumb ) {
+                    $thumb = "<img src='" . WL_DEFAULT_THUMBNAIL_PATH . "' width='" . self::THUMB_SIZE . "' />";
+                }
+                echo "<a href='" . esc_url( $edit_link ) . "'>$thumb</a>";
+                break;
+
+            case 'wl_column_rating':
+
+                $rating = $this->entity_service->get_rating_for( $entity_id );
+                echo '<i class="wl-traffic-light wl-tl-' . $rating['traffic_light_score'] . '">' . $rating['percentage_score'] . '%</i>';
+                break;
+        }
+
+    }
+
+    /**
+     * Add wl-classification-scope select box before the 'Filter' button.
+     *
+     * @since 3.3.0
+     */
+    public function restrict_manage_posts_classification_scope() {
+
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( FALSE === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
+
+        $screen = get_current_screen();
+        // If there is any valid screen nothing to do
+        if ( NULL === $screen ) {
+            return;
+        }
+
+        if ( $screen->post_type !== Wordlift_Entity_Service::TYPE_NAME ) {
+            return;
+        }
+
+        // Was a W already selected?
+        $selected = isset( $_GET['wl-classification-scope'] ) ?
+            $_GET['wl-classification-scope'] : '';
+
+        // Print select box with the 4W
+        $all_w = array(
+            __( "All 'W'" ),
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHEN_RELATION,
+        );
+        echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
+        foreach ( $all_w as $w ) {
+            $default = ( $selected === $w ) ? 'selected' : '';
+            echo sprintf( '<option value="%s" %s >%s</option>', $w, $default, __( $w ) );
+        }
+        echo '</select>';
+    }
+
+    /**
+     * Server side response operations for the classification filter set in *restrict_manage_posts_classification_scope_filter*
+     *
+     * @since 3.3.0
+     *
+     * @param array $clauses WP main query clauses.
+     *
+     * @return array Modified clauses.
+     */
+    public function posts_clauses_classification_scope( $clauses ) {
+
+        // Run only on admin page.
+        if ( ! is_admin() ) {
+            return $clauses;
+        }
+
+        // Return safely if get_current_screen() is not defined (yet).
+        if ( FALSE === function_exists( 'get_current_screen' ) ) {
+            return $clauses;
+        }
+
+        // Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set.
+        $screen = get_current_screen();
+
+        // If there is any valid screen nothing to do.
+        if ( NULL === $screen ) {
+            return $clauses;
+        }
+
+        if ( ! ( $screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) {
+            return $clauses;
+        }
+
+        // Check a valid W was requested.
+        $requested_w = $_GET['wl-classification-scope'];
+
+        $all_w = array(
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHEN_RELATION,
+        );
+
+        if ( ! in_array( $requested_w, $all_w ) ) {
+            return $clauses;
+        }
+
+        global $wpdb;
+        $wl_relation_table = wl_core_get_relation_instances_table_name();
+
+        // Change WP main query clauses.
+        $clauses['join'] .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
+        $clauses['where'] .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
+        $clauses['distinct'] .= "DISTINCT";
+
+        return $clauses;
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -36,9 +36,9 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_List_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_List_Service');
 
 		$this->entity_service = $entity_service;
 
@@ -55,20 +55,20 @@ 
 	 *
 	 * @return array Enhanced columns array.
 	 */
-	public function register_custom_columns( $columns ) {
+	public function register_custom_columns($columns) {
 
 		// Take away first column and keep a reference,
 		// so we can later insert the thumbnail between the first and the rest of columns.
 		$columns_cb = $columns['cb'];
-		unset( $columns['cb'] );
+		unset($columns['cb']);
 
 		// Thumbnails column is inserted in second place, while the related posts on the end.
 		$columns = array_merge(
-			array( 'cb' => $columns_cb ),                      // re-add first column
-			array( 'wl_column_thumbnail' => __( 'Image', 'wordlift' ) ),        // thumb
-			$columns,                                                               // default columns (without the first)
-			array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
-			array( 'wl_column_rating' => __( 'Rating', 'wordlift' ) ) // related posts
+			array('cb' => $columns_cb), // re-add first column
+			array('wl_column_thumbnail' => __('Image', 'wordlift')), // thumb
+			$columns, // default columns (without the first)
+			array('wl_column_related_posts' => __('Related Posts', 'wordlift')), // related posts
+			array('wl_column_rating' => __('Rating', 'wordlift')) // related posts
 		);
 
 		return $columns;
@@ -84,29 +84,29 @@ 
 	 * @param string $column    the current column.
 	 * @param int    $entity_id An entity post id.
 	 */
-	public function render_custom_columns( $column, $entity_id ) {
+	public function render_custom_columns($column, $entity_id) {
 
-		switch ( $column ) {
+		switch ($column) {
 
 			case 'wl_column_related_posts':
-				echo count( wl_core_get_related_post_ids( $entity_id ) );
+				echo count(wl_core_get_related_post_ids($entity_id));
 				break;
 
 			case 'wl_column_thumbnail':
 
-				$edit_link = get_edit_post_link( $entity_id );
-				$thumb     = get_the_post_thumbnail( $entity_id, array( self::THUMB_SIZE, self::THUMB_SIZE ) );
+				$edit_link = get_edit_post_link($entity_id);
+				$thumb     = get_the_post_thumbnail($entity_id, array(self::THUMB_SIZE, self::THUMB_SIZE));
 
-				if ( ! $thumb ) {
-					$thumb = "<img src='" . WL_DEFAULT_THUMBNAIL_PATH . "' width='" . self::THUMB_SIZE . "' />";
+				if ( ! $thumb) {
+					$thumb = "<img src='".WL_DEFAULT_THUMBNAIL_PATH."' width='".self::THUMB_SIZE."' />";
 				}
-				echo "<a href='" . esc_url( $edit_link ) . "'>$thumb</a>";
+				echo "<a href='".esc_url($edit_link)."'>$thumb</a>";
 				break;
 
 			case 'wl_column_rating':
 
-				$rating = $this->entity_service->get_rating_for( $entity_id );
-				echo '<i class="wl-traffic-light wl-tl-' . $rating['traffic_light_score'] . '">' . $rating['percentage_score'] . '%</i>';
+				$rating = $this->entity_service->get_rating_for($entity_id);
+				echo '<i class="wl-traffic-light wl-tl-'.$rating['traffic_light_score'].'">'.$rating['percentage_score'].'%</i>';
 				break;
 		}
 
@@ -120,36 +120,36 @@ 
 	public function restrict_manage_posts_classification_scope() {
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return;
 		}
 
 		$screen = get_current_screen();
 		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
+		if (NULL === $screen) {
 			return;
 		}
 
-		if ( $screen->post_type !== Wordlift_Entity_Service::TYPE_NAME ) {
+		if ($screen->post_type !== Wordlift_Entity_Service::TYPE_NAME) {
 			return;
 		}
 
 		// Was a W already selected?
-		$selected = isset( $_GET['wl-classification-scope'] ) ?
+		$selected = isset($_GET['wl-classification-scope']) ?
 			$_GET['wl-classification-scope'] : '';
 
 		// Print select box with the 4W
 		$all_w = array(
-			__( "All 'W'" ),
+			__("All 'W'"),
 			WL_WHAT_RELATION,
 			WL_WHO_RELATION,
 			WL_WHERE_RELATION,
 			WL_WHEN_RELATION,
 		);
 		echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
-		foreach ( $all_w as $w ) {
-			$default = ( $selected === $w ) ? 'selected' : '';
-			echo sprintf( '<option value="%s" %s >%s</option>', $w, $default, __( $w ) );
+		foreach ($all_w as $w) {
+			$default = ($selected === $w) ? 'selected' : '';
+			echo sprintf('<option value="%s" %s >%s</option>', $w, $default, __($w));
 		}
 		echo '</select>';
 	}
@@ -163,15 +163,15 @@ 
 	 *
 	 * @return array Modified clauses.
 	 */
-	public function posts_clauses_classification_scope( $clauses ) {
+	public function posts_clauses_classification_scope($clauses) {
 
 		// Run only on admin page.
-		if ( ! is_admin() ) {
+		if ( ! is_admin()) {
 			return $clauses;
 		}
 
 		// Return safely if get_current_screen() is not defined (yet).
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return $clauses;
 		}
 
@@ -179,11 +179,11 @@ 
 		$screen = get_current_screen();
 
 		// If there is any valid screen nothing to do.
-		if ( NULL === $screen ) {
+		if (NULL === $screen) {
 			return $clauses;
 		}
 
-		if ( ! ( $screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) {
+		if ( ! ($screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset($_GET['wl-classification-scope']))) {
 			return $clauses;
 		}
 
@@ -197,7 +197,7 @@ 
 			WL_WHEN_RELATION,
 		);
 
-		if ( ! in_array( $requested_w, $all_w ) ) {
+		if ( ! in_array($requested_w, $all_w)) {
 			return $clauses;
 		}
 
@@ -206,7 +206,7 @@ 
 
 		// Change WP main query clauses.
 		$clauses['join'] .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
-		$clauses['where'] .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
+		$clauses['where'] .= $wpdb->prepare("AND {$wl_relation_table}.predicate = %s", $requested_w);
 		$clauses['distinct'] .= "DISTINCT";
 
 		return $clauses;

src/admin/WL_Metabox/WL_Metabox.php

Indentation +216 added lines, -216 removed lines

@@ -14,269 +14,269 @@
  */
 class WL_Metabox {
 
-	public $fields;
-
-	/**
-	 * WL_Metabox constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array(
-			&$this,
-			'save_form_data',
-		) );
-
-		// Enqueue js and css.
-		$this->enqueue_scripts_and_styles();
-
-	}
-
-	/**
-	 * Add a callback to print the metabox in page.
-	 * Wordpress will fire the $this->html() callback at the right time.
-	 */
-	public function add_main_metabox() {
-
-		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-		add_meta_box( $id, $title, array(
-			$this,
-			'html',
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
-
-		// Add filter to change the metabox CSS class.
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
-	}
-
-	/**
-	 * Called from WP to print the metabox content in page.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param WP_Post $post The post.
-	 */
-	public function html( $post ) {
-
-		// Build the fields we need to print.
-		$this->instantiate_fields( $post->ID );
-
-		// Loop over the fields.
-		foreach ( $this->fields as $field ) {
-
-			// load data from DB (values will be available in $field->data).
-			$field->get_data();
-
-			// print field HTML (nonce included).
-			echo $field->html();
-		}
-
-	}
-
-	/**
-	 * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
-	 *
-	 * Note: the first function that calls this method will instantiate the fields.
-	 * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id The post id.
-	 */
-	public function instantiate_fields( $post_id ) {
-
-		// This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering.
-		if ( isset( $this->fields ) ) {
-			return;
-		}
-
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
-
-		if ( isset( $entity_type ) ) {
-
-			/**
-			 * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
-			 * We must divide fields in two groups:
-			 * - simple: accept values for one property
-			 * - grouped: accept values for more properties, or for one property that needs a specific metabox.
-			 */
-			$metaboxes         = $this->group_properties_by_input_field( $entity_type );
-			$simple_metaboxes  = $metaboxes[0];
-			$grouped_metaboxes = $metaboxes[1];
+    public $fields;
+
+    /**
+     * WL_Metabox constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        // Add hooks to print metaboxes and save submitted data.
+        add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
+        add_action( 'wl_linked_data_save_post', array(
+            &$this,
+            'save_form_data',
+        ) );
+
+        // Enqueue js and css.
+        $this->enqueue_scripts_and_styles();
+
+    }
+
+    /**
+     * Add a callback to print the metabox in page.
+     * Wordpress will fire the $this->html() callback at the right time.
+     */
+    public function add_main_metabox() {
+
+        // Add main metabox (will print also the inner fields).
+        $id    = uniqid( 'wl-metabox-' );
+        $title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+        add_meta_box( $id, $title, array(
+            $this,
+            'html',
+        ), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+
+        // Add filter to change the metabox CSS class.
+        add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+    }
+
+    /**
+     * Called from WP to print the metabox content in page.
+     *
+     * @since 3.1.0
+     *
+     * @param WP_Post $post The post.
+     */
+    public function html( $post ) {
+
+        // Build the fields we need to print.
+        $this->instantiate_fields( $post->ID );
+
+        // Loop over the fields.
+        foreach ( $this->fields as $field ) {
+
+            // load data from DB (values will be available in $field->data).
+            $field->get_data();
+
+            // print field HTML (nonce included).
+            echo $field->html();
+        }
+
+    }
+
+    /**
+     * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
+     *
+     * Note: the first function that calls this method will instantiate the fields.
+     * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id The post id.
+     */
+    public function instantiate_fields( $post_id ) {
+
+        // This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering.
+        if ( isset( $this->fields ) ) {
+            return;
+        }
+
+        $entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+
+        if ( isset( $entity_type ) ) {
+
+            /**
+             * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
+             * We must divide fields in two groups:
+             * - simple: accept values for one property
+             * - grouped: accept values for more properties, or for one property that needs a specific metabox.
+             */
+            $metaboxes         = $this->group_properties_by_input_field( $entity_type );
+            $simple_metaboxes  = $metaboxes[0];
+            $grouped_metaboxes = $metaboxes[1];
 
-			// Loop over simple entity properties.
-			foreach ( $simple_metaboxes as $key => $property ) {
+            // Loop over simple entity properties.
+            foreach ( $simple_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-				// Build the requested field as WL_Metabox_Field_ object.
-				$this->add_field( $info );
-			}
+                // Build the requested field as WL_Metabox_Field_ object.
+                $this->add_field( $info );
+            }
 
-			// Loop over grouped properties.
-			foreach ( $grouped_metaboxes as $key => $property ) {
+            // Loop over grouped properties.
+            foreach ( $grouped_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-				// Build the requested field group as WL_Metabox_Field_ object.
-				$this->add_field( $info, TRUE );
-			}
+                // Build the requested field group as WL_Metabox_Field_ object.
+                $this->add_field( $info, TRUE );
+            }
 
-		}
-	}
+        }
+    }
 
-	/**
-	 * Separes metaboxes in simple and grouped.
-	 *
-	 * @param array $custom_fields Information on the entity type.
-	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+    /**
+     * Separes metaboxes in simple and grouped.
+     *
+     * @param array $custom_fields Information on the entity type.
+     */
+    public function group_properties_by_input_field( $custom_fields ) {
 
-		$simple_properties  = array();
-		$grouped_properties = array();
+        $simple_properties  = array();
+        $grouped_properties = array();
 
-		// Loop over possible entity properties.
-		foreach ( $custom_fields as $key => $property ) {
+        // Loop over possible entity properties.
+        foreach ( $custom_fields as $key => $property ) {
 
-			// Check presence of predicate and type.
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+            // Check presence of predicate and type.
+            if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
 
-				// Check if input_field is defined.
-				if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
+                // Check if input_field is defined.
+                if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
 
-					$grouped_key = $property['input_field'];
+                    $grouped_key = $property['input_field'];
 
-					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+                    // Update list of grouped properties.
+                    $grouped_properties[ $grouped_key ][ $key ] = $property;
 
-				} else {
+                } else {
 
-					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
-				}
-			}
-		}
+                    // input_field not defined, add simple metabox.
+                    $simple_properties[ $key ] = $property;
+                }
+            }
+        }
 
-		return array( $simple_properties, $grouped_properties );
-	}
+        return array( $simple_properties, $grouped_properties );
+    }
 
-	/**
-	 * Add a Field to the current Metabox, based on the description of the Field.
-	 * This method is a rude factory for Field objects.
-	 *
-	 * @param array $args
-	 * @param bool  $grouped Flag to distinguish between simple and grouped Fields
-	 */
-	public function add_field( $args, $grouped = FALSE ) {
+    /**
+     * Add a Field to the current Metabox, based on the description of the Field.
+     * This method is a rude factory for Field objects.
+     *
+     * @param array $args
+     * @param bool  $grouped Flag to distinguish between simple and grouped Fields
+     */
+    public function add_field( $args, $grouped = FALSE ) {
 
-		if ( $grouped ) {
-			// Special fields (sameas, coordinates, etc.).
+        if ( $grouped ) {
+            // Special fields (sameas, coordinates, etc.).
 
-			// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-			$field_class = 'WL_Metabox_Field_' . key( $args );
+            // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+            $field_class = 'WL_Metabox_Field_' . key( $args );
 
-		} else {
-			// Simple fields (string, uri, boolean, etc.).
+        } else {
+            // Simple fields (string, uri, boolean, etc.).
 
-			// Which field? We want to use the class that is specific for the field.
-			$meta      = key( $args );
-			$this_meta = $args[ $meta ];
+            // Which field? We want to use the class that is specific for the field.
+            $meta      = key( $args );
+            $this_meta = $args[ $meta ];
 
-			// If the field declares what metabox it wants, use that one.
-			if ( isset( $this_meta['metabox']['class'] ) ) {
+            // If the field declares what metabox it wants, use that one.
+            if ( isset( $this_meta['metabox']['class'] ) ) {
 
-				$field_class = $this_meta['metabox']['class'];
+                $field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || ( $this_meta['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
+            } elseif ( ! isset( $this_meta['type'] ) || ( $this_meta['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
 
-				// Use default WL_Metabox_Field (manages strings).
-				$field_class = 'WL_Metabox_Field';
+                // Use default WL_Metabox_Field (manages strings).
+                $field_class = 'WL_Metabox_Field';
 
-			} else {
+            } else {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
 
-				// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-				$field_class = 'WL_Metabox_Field_' . $this_meta['type'];
+                // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+                $field_class = 'WL_Metabox_Field_' . $this_meta['type'];
 
-			}
-		}
+            }
+        }
 
-		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
-	}
+        // Call apropriate constructor (e.g. WL_Metabox_Field_... ).
+        $this->fields[] = new $field_class( $args );
+    }
 
-	public function save_form_data( $entity_id ) {
+    public function save_form_data( $entity_id ) {
 
-		// Build Field objects.
-		$this->instantiate_fields( $entity_id );
+        // Build Field objects.
+        $this->instantiate_fields( $entity_id );
 
-		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			return;
-		}
+        // Check if WL metabox form was posted.
+        if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+            return;
+        }
 
-		foreach ( $this->fields as $field ) {
+        foreach ( $this->fields as $field ) {
 
-			// Verify nonce.
-			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+            // Verify nonce.
+            $valid_nonce = $field->verify_nonce();
+            if ( $valid_nonce ) {
 
-				$posted_data = $_POST['wl_metaboxes'];
-				$field_name  = $field->meta_name;
+                $posted_data = $_POST['wl_metaboxes'];
+                $field_name  = $field->meta_name;
 
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+                // Each Filed only deals with its values.
+                if ( isset( $posted_data[ $field_name ] ) ) {
 
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
-					}
+                    $values = $posted_data[ $field_name ];
+                    if ( ! is_array( $values ) ) {
+                        $values = array( $values );
+                    }
 
-					// Save data permanently
-					$field->save_data( $values );
-				}
-			}
-		}
+                    // Save data permanently
+                    $field->save_data( $values );
+                }
+            }
+        }
 
-		wl_linked_data_push_to_redlink( $entity_id );
-	}
+        wl_linked_data_push_to_redlink( $entity_id );
+    }
 
-	// print on page all the js and css the fields will need.
-	public function enqueue_scripts_and_styles() {
+    // print on page all the js and css the fields will need.
+    public function enqueue_scripts_and_styles() {
 
-		// dateTimePicker
-		wp_enqueue_style( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/css/jquery.datetimepicker.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.full.min.js', array( 'jquery' ) );
+        // dateTimePicker
+        wp_enqueue_style( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/css/jquery.datetimepicker.css' );
+        wp_enqueue_script( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.full.min.js', array( 'jquery' ) );
 
-		// We rename the xdsoft datetimepicker function name to avoid conflicts to the jQuery UI derived datetimepicker library.
-		// see https://github.com/insideout10/wordlift-plugin/issues/340 .
-		wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array( 'jquery-ui-timepicker' ) );
+        // We rename the xdsoft datetimepicker function name to avoid conflicts to the jQuery UI derived datetimepicker library.
+        // see https://github.com/insideout10/wordlift-plugin/issues/340 .
+        wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array( 'jquery-ui-timepicker' ) );
 
-		// Leaflet.
-		wp_enqueue_style( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
-		wp_enqueue_script( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js', __FILE__ );
+        // Leaflet.
+        wp_enqueue_style( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
+        wp_enqueue_script( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js', __FILE__ );
 
-		// Add AJAX autocomplete to facilitate metabox editing.
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
-		wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'action'   => 'entity_by_title',
-			)
-		);
+        // Add AJAX autocomplete to facilitate metabox editing.
+        wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
+        wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
+                'ajax_url' => admin_url( 'admin-ajax.php' ),
+                'action'   => 'entity_by_title',
+            )
+        );
 
-	}
+    }
 
 }

src/admin/WL_Metabox/WL_Metabox_Field.php

Indentation +245 added lines, -245 removed lines

@@ -7,258 +7,258 @@
  */
 class WL_Metabox_Field {
 
-	public $meta_name;
-	public $raw_custom_field;
-	public $predicate;
-	public $label;
-	public $expected_wl_type;
-	public $expected_uri_type;
-	public $cardinality;
-	public $data;
-
-	/**
-	 * @param array $args
-	 */
-	public function __construct( $args ) {
-
-		if ( empty( $args ) ) {
-			return;
-		}
-
-		// Save a copy of the custom field's params.
-		$this->raw_custom_field = reset( $args );
-
-		// Extract meta name (post_meta key for the DB).
-		$this->meta_name = key( $args );
-
-		// Extract linked data predicate.
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
-			$this->predicate = $this->raw_custom_field['predicate'];
-		} else {
-			return;
-		}
-
-		// Extract human readable label.
-		$exploded_predicate = explode( '/', $this->predicate );
-
-		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? __( $this->raw_custom_field['metabox']['label'] ) : end( $exploded_predicate );
-
-		// Extract field constraints (numerosity, expected type).
-		// Default constaints: accept one string..
-		if ( isset( $this->raw_custom_field['type'] ) ) {
-			$this->expected_wl_type = $this->raw_custom_field['type'];
-		} else {
-			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
-		}
-
-		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
-
-			$constraints = $this->raw_custom_field['constraints'];
-
-			// Extract cardinality.
-			if ( isset( $constraints['cardinality'] ) ) {
-				$this->cardinality = $constraints['cardinality'];
-			}
-
-			// Which type of entity can we accept (e.g. Place, Event, ecc.)? .
-			if ( $this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] ) ? $constraints['uri_type'] : array( $constraints['uri_type'] );
-			}
-
-		}
-	}
-
-	/**
-	 * Return nonce HTML.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_nonce() {
-
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', TRUE, FALSE );
-	}
-
-	/**
-	 * Verify nonce.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @return boolean Nonce verification
-	 */
-	public function verify_nonce() {
-
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
-
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
-			return FALSE;
-		}
-
-		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
-	}
-
-	/**
-	 * Load data from DB and store the resulting array in $this->data.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function get_data() {
-
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
-
-		// Values are always contained in an array (makes it easier to manage cardinality).
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
-		}
-
-		$this->data = $data;
-	}
-
-	/**
-	 * Sanitizes data before saving to DB. Default sanitization trashes empty values.
-	 * Stores the sanitized values into $this->data so they can be later processed.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param array $values Array of values to be sanitized and then stored into $this->data
-	 *
-	 */
-	public function sanitize_data( $values ) {
-
-		$sanitized_data = array();
-
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
-		}
-
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
-				$sanitized_data[] = $sanitized_value;
-			}
-		}
-
-		$this->data = $sanitized_data;
-	}
-
-	/**
-	 * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @return mixed Returns sanitized value, or null.
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		// TODO: all fields should provide their own sanitize which shouldn't be part of a UI class.
-		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $value );
-		}
-
-		if ( ! is_null( $value ) && $value !== '' ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
-			return $value;
-		}
-
-		return NULL;
-	}
-
-	/**
-	 * Save data to DB.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function save_data( $values ) {
-
-		// Will sanitize data and store them in $field->data.
-		$this->sanitize_data( $values );
-
-		$entity_id = get_the_ID();
-
-		// Take away old values.
-		delete_post_meta( $entity_id, $this->meta_name );
-
-		// insert new values, respecting cardinality.
-		$single = ( $this->cardinality == 1 );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
-		}
-	}
-
-	/**
-	 * Returns the HTML tag that will contain the Field. By default the we return a <div> with data- attributes on cardinality and expected types.
-	 * It is useful to provide data- attributes for the JS scripts.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_wrapper_open() {
-
-		return "<div class='wl-field' data-cardinality='$this->cardinality'>";
-	}
-
-	/**
-	 * Returns Field HTML (nonce included).
-	 * Overwrite this method (or methods called from this method) in a child class to obtain custom behaviour.
-	 */
-	public function html() {
-
-		// Open main <div> for the Field.
-		$html = $this->html_wrapper_open();
-
-		// Label.
-		$html .= "<h3>$this->label</h3>";
-
-		// print nonce.
-		$html .= $this->html_nonce();
-
-		// print data loaded from DB.
-		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
-				}
-				$count ++;
-			}
-		}
-
-		// Print the empty <input> to add new values.
-		if ( $count === 0 ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$html .= $this->html_input( '' );    // Will print an empty <input>
-			$count ++;
-		}
-
-		// If cardiality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
-			$html .= '<button class="button wl-add-input wl-button" type="button">Add</button>';
-		}
-
-		// Close the HTML wrapper.
-		$html .= $this->html_wrapper_close();
-
-		return $html;
-	}
-
-	/**
-	 * Return a single <input> tag for the Field.
-	 *
-	 * @param mixed $value Input value
-	 *
-	 * @return string
-	 */
-	public function html_input( $value ) {
-		$html = <<<EOF
+    public $meta_name;
+    public $raw_custom_field;
+    public $predicate;
+    public $label;
+    public $expected_wl_type;
+    public $expected_uri_type;
+    public $cardinality;
+    public $data;
+
+    /**
+     * @param array $args
+     */
+    public function __construct( $args ) {
+
+        if ( empty( $args ) ) {
+            return;
+        }
+
+        // Save a copy of the custom field's params.
+        $this->raw_custom_field = reset( $args );
+
+        // Extract meta name (post_meta key for the DB).
+        $this->meta_name = key( $args );
+
+        // Extract linked data predicate.
+        if ( isset( $this->raw_custom_field['predicate'] ) ) {
+            $this->predicate = $this->raw_custom_field['predicate'];
+        } else {
+            return;
+        }
+
+        // Extract human readable label.
+        $exploded_predicate = explode( '/', $this->predicate );
+
+        // Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
+        $this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? __( $this->raw_custom_field['metabox']['label'] ) : end( $exploded_predicate );
+
+        // Extract field constraints (numerosity, expected type).
+        // Default constaints: accept one string..
+        if ( isset( $this->raw_custom_field['type'] ) ) {
+            $this->expected_wl_type = $this->raw_custom_field['type'];
+        } else {
+            $this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
+        }
+
+        $this->cardinality = 1;
+        if ( isset( $this->raw_custom_field['constraints'] ) ) {
+
+            $constraints = $this->raw_custom_field['constraints'];
+
+            // Extract cardinality.
+            if ( isset( $constraints['cardinality'] ) ) {
+                $this->cardinality = $constraints['cardinality'];
+            }
+
+            // Which type of entity can we accept (e.g. Place, Event, ecc.)? .
+            if ( $this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset( $constraints['uri_type'] ) ) {
+                $this->expected_uri_type = is_array( $constraints['uri_type'] ) ? $constraints['uri_type'] : array( $constraints['uri_type'] );
+            }
+
+        }
+    }
+
+    /**
+     * Return nonce HTML.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_nonce() {
+
+        return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', TRUE, FALSE );
+    }
+
+    /**
+     * Verify nonce.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @return boolean Nonce verification
+     */
+    public function verify_nonce() {
+
+        $nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
+        $nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+
+        if ( ! isset( $_POST[ $nonce_name ] ) ) {
+            return FALSE;
+        }
+
+        // Verify that the nonce is valid.
+        return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+    }
+
+    /**
+     * Load data from DB and store the resulting array in $this->data.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function get_data() {
+
+        $data = get_post_meta( get_the_ID(), $this->meta_name );
+
+        // Values are always contained in an array (makes it easier to manage cardinality).
+        if ( ! is_array( $data ) ) {
+            $data = array( $data );
+        }
+
+        $this->data = $data;
+    }
+
+    /**
+     * Sanitizes data before saving to DB. Default sanitization trashes empty values.
+     * Stores the sanitized values into $this->data so they can be later processed.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param array $values Array of values to be sanitized and then stored into $this->data
+     *
+     */
+    public function sanitize_data( $values ) {
+
+        $sanitized_data = array();
+
+        if ( ! is_array( $values ) ) {
+            $values = array( $values );
+        }
+
+        foreach ( $values as $value ) {
+            $sanitized_value = $this->sanitize_data_filter( $value );
+            if ( ! is_null( $sanitized_value ) ) {
+                $sanitized_data[] = $sanitized_value;
+            }
+        }
+
+        $this->data = $sanitized_data;
+    }
+
+    /**
+     * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @return mixed Returns sanitized value, or null.
+     */
+    public function sanitize_data_filter( $value ) {
+
+        // TODO: all fields should provide their own sanitize which shouldn't be part of a UI class.
+        // If the field provides its own validation, use it.
+        if ( isset( $this->raw_custom_field['sanitize'] ) ) {
+            return call_user_func( $this->raw_custom_field['sanitize'], $value );
+        }
+
+        if ( ! is_null( $value ) && $value !== '' ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+            return $value;
+        }
+
+        return NULL;
+    }
+
+    /**
+     * Save data to DB.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function save_data( $values ) {
+
+        // Will sanitize data and store them in $field->data.
+        $this->sanitize_data( $values );
+
+        $entity_id = get_the_ID();
+
+        // Take away old values.
+        delete_post_meta( $entity_id, $this->meta_name );
+
+        // insert new values, respecting cardinality.
+        $single = ( $this->cardinality == 1 );
+        foreach ( $this->data as $value ) {
+            add_post_meta( $entity_id, $this->meta_name, $value, $single );
+        }
+    }
+
+    /**
+     * Returns the HTML tag that will contain the Field. By default the we return a <div> with data- attributes on cardinality and expected types.
+     * It is useful to provide data- attributes for the JS scripts.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_wrapper_open() {
+
+        return "<div class='wl-field' data-cardinality='$this->cardinality'>";
+    }
+
+    /**
+     * Returns Field HTML (nonce included).
+     * Overwrite this method (or methods called from this method) in a child class to obtain custom behaviour.
+     */
+    public function html() {
+
+        // Open main <div> for the Field.
+        $html = $this->html_wrapper_open();
+
+        // Label.
+        $html .= "<h3>$this->label</h3>";
+
+        // print nonce.
+        $html .= $this->html_nonce();
+
+        // print data loaded from DB.
+        $count = 0;
+        if ( $this->data ) {
+            foreach ( $this->data as $value ) {
+                if ( $count < $this->cardinality ) {
+                    $html .= $this->html_input( $value );
+                }
+                $count ++;
+            }
+        }
+
+        // Print the empty <input> to add new values.
+        if ( $count === 0 ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+            $html .= $this->html_input( '' );    // Will print an empty <input>
+            $count ++;
+        }
+
+        // If cardiality allows it, print button to add new values.
+        if ( $count < $this->cardinality ) {
+            $html .= '<button class="button wl-add-input wl-button" type="button">Add</button>';
+        }
+
+        // Close the HTML wrapper.
+        $html .= $this->html_wrapper_close();
+
+        return $html;
+    }
+
+    /**
+     * Return a single <input> tag for the Field.
+     *
+     * @param mixed $value Input value
+     *
+     * @return string
+     */
+    public function html_input( $value ) {
+        $html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />
 				<button class="button wl-remove-input wl-button" type="button" style="width:10 % ">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Returns closing for the wrapper HTML tag.
-	 */
-	public function html_wrapper_close() {
+    /**
+     * Returns closing for the wrapper HTML tag.
+     */
+    public function html_wrapper_close() {
 
-		return '</div><hr>';
-	}
+        return '</div><hr>';
+    }
 
 }

Spacing +46 added lines, -46 removed lines

@@ -19,52 +19,52 @@ 
 	/**
 	 * @param array $args
 	 */
-	public function __construct( $args ) {
+	public function __construct($args) {
 
-		if ( empty( $args ) ) {
+		if (empty($args)) {
 			return;
 		}
 
 		// Save a copy of the custom field's params.
-		$this->raw_custom_field = reset( $args );
+		$this->raw_custom_field = reset($args);
 
 		// Extract meta name (post_meta key for the DB).
-		$this->meta_name = key( $args );
+		$this->meta_name = key($args);
 
 		// Extract linked data predicate.
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
+		if (isset($this->raw_custom_field['predicate'])) {
 			$this->predicate = $this->raw_custom_field['predicate'];
 		} else {
 			return;
 		}
 
 		// Extract human readable label.
-		$exploded_predicate = explode( '/', $this->predicate );
+		$exploded_predicate = explode('/', $this->predicate);
 
 		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? __( $this->raw_custom_field['metabox']['label'] ) : end( $exploded_predicate );
+		$this->label = isset($this->raw_custom_field['metabox']['label']) ? __($this->raw_custom_field['metabox']['label']) : end($exploded_predicate);
 
 		// Extract field constraints (numerosity, expected type).
 		// Default constaints: accept one string..
-		if ( isset( $this->raw_custom_field['type'] ) ) {
+		if (isset($this->raw_custom_field['type'])) {
 			$this->expected_wl_type = $this->raw_custom_field['type'];
 		} else {
 			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
 		}
 
 		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
+		if (isset($this->raw_custom_field['constraints'])) {
 
 			$constraints = $this->raw_custom_field['constraints'];
 
 			// Extract cardinality.
-			if ( isset( $constraints['cardinality'] ) ) {
+			if (isset($constraints['cardinality'])) {
 				$this->cardinality = $constraints['cardinality'];
 			}
 
 			// Which type of entity can we accept (e.g. Place, Event, ecc.)? .
-			if ( $this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] ) ? $constraints['uri_type'] : array( $constraints['uri_type'] );
+			if ($this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset($constraints['uri_type'])) {
+				$this->expected_uri_type = is_array($constraints['uri_type']) ? $constraints['uri_type'] : array($constraints['uri_type']);
 			}
 
 		}
@@ -76,7 +76,7 @@ 
 	 */
 	public function html_nonce() {
 
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', TRUE, FALSE );
+		return wp_nonce_field('wordlift_'.$this->meta_name.'_entity_box', 'wordlift_'.$this->meta_name.'_entity_box_nonce', TRUE, FALSE);
 	}
 
 	/**
@@ -87,15 +87,15 @@ 
 	 */
 	public function verify_nonce() {
 
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+		$nonce_name   = 'wordlift_'.$this->meta_name.'_entity_box_nonce';
+		$nonce_verify = 'wordlift_'.$this->meta_name.'_entity_box';
 
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
+		if ( ! isset($_POST[$nonce_name])) {
 			return FALSE;
 		}
 
 		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+		return wp_verify_nonce($_POST[$nonce_name], $nonce_verify);
 	}
 
 	/**
@@ -104,11 +104,11 @@ 
 	 */
 	public function get_data() {
 
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
+		$data = get_post_meta(get_the_ID(), $this->meta_name);
 
 		// Values are always contained in an array (makes it easier to manage cardinality).
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
+		if ( ! is_array($data)) {
+			$data = array($data);
 		}
 
 		$this->data = $data;
@@ -122,17 +122,17 @@ 
 	 * @param array $values Array of values to be sanitized and then stored into $this->data
 	 *
 	 */
-	public function sanitize_data( $values ) {
+	public function sanitize_data($values) {
 
 		$sanitized_data = array();
 
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
+		if ( ! is_array($values)) {
+			$values = array($values);
 		}
 
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
+		foreach ($values as $value) {
+			$sanitized_value = $this->sanitize_data_filter($value);
+			if ( ! is_null($sanitized_value)) {
 				$sanitized_data[] = $sanitized_value;
 			}
 		}
@@ -146,15 +146,15 @@ 
 	 *
 	 * @return mixed Returns sanitized value, or null.
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// TODO: all fields should provide their own sanitize which shouldn't be part of a UI class.
 		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $value );
+		if (isset($this->raw_custom_field['sanitize'])) {
+			return call_user_func($this->raw_custom_field['sanitize'], $value);
 		}
 
-		if ( ! is_null( $value ) && $value !== '' ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+		if ( ! is_null($value) && $value !== '') {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
 			return $value;
 		}
 
@@ -165,20 +165,20 @@ 
 	 * Save data to DB.
 	 * Overwrite this method in a child class to obtain custom behaviour.
 	 */
-	public function save_data( $values ) {
+	public function save_data($values) {
 
 		// Will sanitize data and store them in $field->data.
-		$this->sanitize_data( $values );
+		$this->sanitize_data($values);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values.
-		delete_post_meta( $entity_id, $this->meta_name );
+		delete_post_meta($entity_id, $this->meta_name);
 
 		// insert new values, respecting cardinality.
-		$single = ( $this->cardinality == 1 );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
+		$single = ($this->cardinality == 1);
+		foreach ($this->data as $value) {
+			add_post_meta($entity_id, $this->meta_name, $value, $single);
 		}
 	}
 
@@ -209,23 +209,23 @@ 
 
 		// print data loaded from DB.
 		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
+		if ($this->data) {
+			foreach ($this->data as $value) {
+				if ($count < $this->cardinality) {
+					$html .= $this->html_input($value);
 				}
-				$count ++;
+				$count++;
 			}
 		}
 
 		// Print the empty <input> to add new values.
-		if ( $count === 0 ) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$html .= $this->html_input( '' );    // Will print an empty <input>
-			$count ++;
+		if ($count === 0) { // } || $count < $this->cardinality ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+			$html .= $this->html_input(''); // Will print an empty <input>
+			$count++;
 		}
 
 		// If cardiality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
+		if ($count < $this->cardinality) {
 			$html .= '<button class="button wl-add-input wl-button" type="button">Add</button>';
 		}
 
@@ -242,7 +242,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function html_input( $value ) {
+	public function html_input($value) {
 		$html = <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" id="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" style="width:88%" />

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

Indentation +188 added lines, -188 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,121 +138,121 @@ 
 			</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`),
-		// `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`),
+        // `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'] );
 
-		// 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 +38 added lines, -38 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,
@@ -234,22 +234,22 @@ 
 		// `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']);
 
 		// 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.