insideout10 / wordlift-plugin

src/includes/class-wordlift.php

Indentation +517 added lines, -517 removed lines

@@ -29,545 +29,545 @@
  */
 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;
-
-	/**
-	 * @var
-	 */
-	private $page_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.5.4';
-		$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';
-
-		/**
-		 * 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 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 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 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 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 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 chord shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-chord-shortcode.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;
+
+    /**
+     * @var
+     */
+    private $page_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.5.4';
+        $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';
+
+        /**
+         * 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 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 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 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 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 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 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 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();
 
-		// Create an instance of the Schema service.
-		$this->schema_service = new Wordlift_Schema_Service();
+        // Create an instance of the Schema 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 );
-
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
-
-		$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 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->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 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();
+    }
 
-	/**
-	 * 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() {
-
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+    /**
+     * 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() );
 
-		$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 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 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 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' );
-
-		// 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' );
-
-		// 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 );
-	}
-
-	/**
-	 * 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() );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// 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 );
-
-	}
-
-	/**
-	 * 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;
-	}
+        $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 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 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 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' );
+
+        // 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' );
+
+        // 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 );
+    }
+
+    /**
+     * 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() );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // 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 );
+
+    }
+
+    /**
+     * 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;
+    }
 
 }

Spacing +67 added lines, -67 removed lines

@@ -230,148 +230,148 @@ 
 		 * 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';
+		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';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * Provide support functions to sanitize data.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+		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';
+		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';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		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';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		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';
+		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';
+		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';
+		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';
+		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';
+		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-topic-taxonomy-service.php';
 
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-page-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-page-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';
+		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';
+		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';
+		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';
+		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';
+		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';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard.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';
+		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';
+		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';
+		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';
+		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';
+		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';
+		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';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -386,19 +386,19 @@ 
 		$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 );
+		$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 a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$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 );
+		$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 );
+		$this->dashboard_service = new Wordlift_Dashboard_Service($this->entity_service);
 
 		// Initialize the shortcodes.
 		new Wordlift_Navigator_Shortcode();
@@ -407,7 +407,7 @@ 
 		new Wordlift_Timeline_Shortcode();
 
 		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
+		$this->entity_list_service = new Wordlift_Entity_List_Service($this->entity_service);
 
 		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
@@ -434,9 +434,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$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');
 
 	}
 
@@ -449,59 +449,59 @@ 
 	 */
 	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 );
+		$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 );
+		$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 );
+		$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 );
+		$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 );
+		$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' );
+		$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' );
+		$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' );
+		$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' );
+		$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' );
+		$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 );
+		$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 );
+		$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_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' );
+		$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 );
+		$this->loader->add_filter('prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2);
 	}
 
 	/**
@@ -513,20 +513,20 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$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_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 );
+		$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);
 
 	}
 

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +83 added lines, -83 removed lines

@@ -8,89 +8,89 @@
 
 function wl_shortcode_navigator_ajax( $http_raw_data = NULL ) {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
-
-	// Post ID has to match an existing item
-	if ( NULL === $current_post ) {
-		wp_die( 'No valid post_id given' );
-
-		return;
-	}
-
-	// prepare structures to memorize other related posts
-	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
-	$related_entities = array();
-
-	// Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN 
-	// TODO Replace with a single query if it is possible
-	// We select in inverse order to give priority to less used entities 
-	foreach (
-		array(
-			WL_WHEN_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION
-		) as $predicate
-	) {
-
-		$related_entities = array_merge( $related_entities, wl_core_get_related_entities( $current_post_id, array(
-			'predicate' => $predicate,
-			'status'    => 'publish'
-		) ) );
-
-	}
-
-	foreach ( $related_entities as $related_entity ) {
-
-		// take the id of posts referencing the entity
-		$referencing_posts = wl_core_get_related_posts( $related_entity->ID, array(
-			'status' => 'publish'
-		) );
-
-		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
-
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
-
-				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
-				$thumbnail         = wp_get_attachment_url( get_post_thumbnail_id( $referencing_post->ID, 'thumbnail' ) );
-
-				if ( $thumbnail ) {
-
-					$results[] = array(
-						'post'   => array(
-							'permalink' => get_post_permalink( $referencing_post->ID ),
-							'title'     => $referencing_post->post_title,
-							'thumbnail' => $thumbnail
-						),
-						'entity' => array(
-							'label'     => $serialized_entity['label'],
-							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_post_permalink( $related_entity->ID )
-						)
-					);
-
-					// Be sure no more than 1 post for entity is returned
-					break;
-				}
-			}
-		}
-	}
-
-	// Return first 4 results in json accordingly to 4 columns layout
-	wl_core_send_json(
-		array_slice( array_reverse( $results ), 0, 4 )
-	);
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
+
+    // Post ID has to match an existing item
+    if ( NULL === $current_post ) {
+        wp_die( 'No valid post_id given' );
+
+        return;
+    }
+
+    // prepare structures to memorize other related posts
+    $results          = array();
+    $blacklist_ids    = array( $current_post_id );
+    $related_entities = array();
+
+    // Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN 
+    // TODO Replace with a single query if it is possible
+    // We select in inverse order to give priority to less used entities 
+    foreach (
+        array(
+            WL_WHEN_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION
+        ) as $predicate
+    ) {
+
+        $related_entities = array_merge( $related_entities, wl_core_get_related_entities( $current_post_id, array(
+            'predicate' => $predicate,
+            'status'    => 'publish'
+        ) ) );
+
+    }
+
+    foreach ( $related_entities as $related_entity ) {
+
+        // take the id of posts referencing the entity
+        $referencing_posts = wl_core_get_related_posts( $related_entity->ID, array(
+            'status' => 'publish'
+        ) );
+
+        // loop over them and take the first one which is not already in the $related_posts
+        foreach ( $referencing_posts as $referencing_post ) {
+
+            if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+
+                $blacklist_ids[]   = $referencing_post->ID;
+                $serialized_entity = wl_serialize_entity( $related_entity );
+                $thumbnail         = wp_get_attachment_url( get_post_thumbnail_id( $referencing_post->ID, 'thumbnail' ) );
+
+                if ( $thumbnail ) {
+
+                    $results[] = array(
+                        'post'   => array(
+                            'permalink' => get_post_permalink( $referencing_post->ID ),
+                            'title'     => $referencing_post->post_title,
+                            'thumbnail' => $thumbnail
+                        ),
+                        'entity' => array(
+                            'label'     => $serialized_entity['label'],
+                            'mainType'  => $serialized_entity['mainType'],
+                            'permalink' => get_post_permalink( $related_entity->ID )
+                        )
+                    );
+
+                    // Be sure no more than 1 post for entity is returned
+                    break;
+                }
+            }
+        }
+    }
+
+    // Return first 4 results in json accordingly to 4 columns layout
+    wl_core_send_json(
+        array_slice( array_reverse( $results ), 0, 4 )
+    );
 }
 
 ///**

Spacing +22 added lines, -22 removed lines

@@ -6,28 +6,28 @@ 
 //	add_shortcode( 'wl_navigator', 'wordlift_shortcode_navigator' );
 //}
 
-function wl_shortcode_navigator_ajax( $http_raw_data = NULL ) {
+function wl_shortcode_navigator_ajax($http_raw_data = NULL) {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// Post ID has to match an existing item
-	if ( NULL === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (NULL === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
 
 	// prepare structures to memorize other related posts
 	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
+	$blacklist_ids    = array($current_post_id);
 	$related_entities = array();
 
 	// Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN 
@@ -42,41 +42,41 @@ 
 		) as $predicate
 	) {
 
-		$related_entities = array_merge( $related_entities, wl_core_get_related_entities( $current_post_id, array(
+		$related_entities = array_merge($related_entities, wl_core_get_related_entities($current_post_id, array(
 			'predicate' => $predicate,
 			'status'    => 'publish'
-		) ) );
+		)));
 
 	}
 
-	foreach ( $related_entities as $related_entity ) {
+	foreach ($related_entities as $related_entity) {
 
 		// take the id of posts referencing the entity
-		$referencing_posts = wl_core_get_related_posts( $related_entity->ID, array(
+		$referencing_posts = wl_core_get_related_posts($related_entity->ID, array(
 			'status' => 'publish'
-		) );
+		));
 
 		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
+		foreach ($referencing_posts as $referencing_post) {
 
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+			if ( ! in_array($referencing_post->ID, $blacklist_ids)) {
 
 				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
-				$thumbnail         = wp_get_attachment_url( get_post_thumbnail_id( $referencing_post->ID, 'thumbnail' ) );
+				$serialized_entity = wl_serialize_entity($related_entity);
+				$thumbnail         = wp_get_attachment_url(get_post_thumbnail_id($referencing_post->ID, 'thumbnail'));
 
-				if ( $thumbnail ) {
+				if ($thumbnail) {
 
 					$results[] = array(
 						'post'   => array(
-							'permalink' => get_post_permalink( $referencing_post->ID ),
+							'permalink' => get_post_permalink($referencing_post->ID),
 							'title'     => $referencing_post->post_title,
 							'thumbnail' => $thumbnail
 						),
 						'entity' => array(
 							'label'     => $serialized_entity['label'],
 							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_post_permalink( $related_entity->ID )
+							'permalink' => get_post_permalink($related_entity->ID)
 						)
 					);
 
@@ -89,7 +89,7 @@ 
 
 	// Return first 4 results in json accordingly to 4 columns layout
 	wl_core_send_json(
-		array_slice( array_reverse( $results ), 0, 4 )
+		array_slice(array_reverse($results), 0, 4)
 	);
 }
 
@@ -145,6 +145,6 @@ 
 //}
 
 //add_action( 'init', 'wordlift_register_shortcode_navigator' );
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 

src/shortcodes/wordlift_shortcode_chord.php

Indentation +124 added lines, -124 removed lines

@@ -8,33 +8,33 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 posts by post date.
-	// For each post get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => 'post',
-		'fields'      => 'ids', //only get post IDs
-		'post_status' => 'published',
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return NULL;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 posts by post date.
+    // For each post get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => 'post',
+        'fields'      => 'ids', //only get post IDs
+        'post_status' => 'published',
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return NULL;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -52,60 +52,60 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = NULL, $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
 
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array()
-		);
-	}
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array()
+        );
+    }
 
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish'
-	) );
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish'
+    ) );
 
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish'
-		) ) :
-		array();
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()
+                                                    ->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish'
+        ) ) :
+        array();
 
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -119,56 +119,56 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = wl_entity_type_taxonomy_get_type( $item );
-
-		wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, TRUE ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = NULL;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( FALSE !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' )
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] )
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = wl_entity_type_taxonomy_get_type( $item );
+
+        wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, TRUE ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = NULL;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( FALSE !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' )
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] )
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -179,13 +179,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id = $_REQUEST['post_id'];
-	$depth   = $_REQUEST['depth'];
+    $post_id = $_REQUEST['post_id'];
+    $depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );

Spacing +52 added lines, -53 removed lines

@@ -10,28 +10,28 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 posts by post date.
 	// For each post get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => 'post',
 		'fields'      => 'ids', //only get post IDs
 		'post_status' => 'published',
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return NULL;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -50,57 +50,56 @@ 
  *
  * @return array
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = NULL, $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = NULL, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array()
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish'
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()
+	                                             ->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish'
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -117,51 +116,51 @@ 
  *
  * @return mixed|string|void
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = wl_entity_type_taxonomy_get_type( $item );
+		$term = wl_entity_type_taxonomy_get_type($item);
 
-		wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, TRUE ) . " ]" );
+		wl_write_log("wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: ".var_export($term, TRUE)." ]");
 
 		// TODO: get all images
 		$thumbnail    = NULL;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( FALSE !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (FALSE !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' )
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : '')
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] )
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1])
 		);
 
 		$item = $relation;
@@ -182,14 +181,14 @@ 
 	$post_id = $_REQUEST['post_id'];
 	$depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');
 
 //
 ///**

src/shortcodes/wordlift_shortcode_geomap.php

Indentation +119 added lines, -119 removed lines

@@ -14,56 +14,56 @@ 
  */
 function wl_shortcode_geomap_get_places( $post_id = null ) {
 
-	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+    // If $post_id is null or is not numeric it means this is a global geomap
+    $is_global = is_null( $post_id ) || ! is_numeric( $post_id );
 
-	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
-		$related_ids = array();
-	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
-			'status' => 'publish'
-		) );
+    // If the current one is not a global geomap, retrieve related entities ids
+    if ( $is_global ) {
+        $related_ids = array();
+    } else {
+        $related_ids = wl_core_get_related_entity_ids( $post_id, array(
+            'status' => 'publish'
+        ) );
 		
-		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			$related_ids[] = $post_id;
-		}
-	}
+        // Also include current entity
+        if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            $related_ids[] = $post_id;
+        }
+    }
 
-	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
-	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
-		return array();
-	}
+    // If is not a global geomap, an empty $related_ids means that no entities are related to the post
+    // An empty array can be returned in this case
+    if ( ! $is_global && empty( $related_ids ) ) {
+        return array();
+    }
 
-	// Retrieve all 'published' places with geo coordinates defined
-	// If $related_ids is not empty, it's used to limit query results to the current post related places
-	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
-		'post__in'    => $related_ids,
-		'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
-		'nopaging'    => true,
-		'post_status' => 'publish',
-		'meta_query'  => array(
-			'relation' => 'AND',
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			),
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			)
-		),
-		'tax_query'      => array(
-			'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-			'field'    => 'slug',
-			'terms'    => 'place'
-		)
-	) );
+    // Retrieve all 'published' places with geo coordinates defined
+    // If $related_ids is not empty, it's used to limit query results to the current post related places
+    // Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
+    return get_posts( array(
+        'post__in'    => $related_ids,
+        'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
+        'nopaging'    => true,
+        'post_status' => 'publish',
+        'meta_query'  => array(
+            'relation' => 'AND',
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            ),
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            )
+        ),
+        'tax_query'      => array(
+            'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+            'field'    => 'slug',
+            'terms'    => 'place'
+        )
+    ) );
 }
 
 /**
@@ -78,88 +78,88 @@ 
  */
 function wl_shortcode_geomap_prepare_map( $places ) {
 
-	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
-	$min_latitude  = PHP_INT_MAX;
-	$min_longitude = PHP_INT_MAX;
-	$max_latitude  = ~PHP_INT_MAX;
-	$max_longitude = ~PHP_INT_MAX;
+    // Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
+    $min_latitude  = PHP_INT_MAX;
+    $min_longitude = PHP_INT_MAX;
+    $max_latitude  = ~PHP_INT_MAX;
+    $max_longitude = ~PHP_INT_MAX;
 
-	// Prepare an empty array of POIs in geoJSON format.
-	$pois = array();
-	// And store list of points to allow Leaflet compute the optimal bounding box.
-	// The main reason for this is that geoJSON has swapped coordinates (lon. lat)
-	$boundaries = array();
+    // Prepare an empty array of POIs in geoJSON format.
+    $pois = array();
+    // And store list of points to allow Leaflet compute the optimal bounding box.
+    // The main reason for this is that geoJSON has swapped coordinates (lon. lat)
+    $boundaries = array();
 
-	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+    // Add a POI for each entity that has coordinates.
+    foreach ( $places as $entity ) {
 
-		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+        // Get the coordinates.
+        $coordinates = wl_get_coordinates( $entity->ID );
 
-		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
-			continue;
-		}
+        // Don't show the widget if the coordinates aren't set.
+        if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+            continue;
+        }
 
-		// TODO Map html rendering should be delegated to the wordlift js ui layer
-		// This function should be focused on returning pure data instead
+        // TODO Map html rendering should be delegated to the wordlift js ui layer
+        // This function should be focused on returning pure data instead
 
-		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
-		) {
-			$img_src = esc_attr( $attachment[0] );
-		}
+        // Get the title, URL and thumb of the entity.
+        $title = esc_attr( $entity->post_title );
+        $link  = esc_attr( get_permalink( $entity->ID ) );
+        if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
+             false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+        ) {
+            $img_src = esc_attr( $attachment[0] );
+        }
 
-		// Build HTML popup. TODO: move thumb width in css
-		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
-		}
-		$content = $content . "</a><ul>";
-		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
-			'status' => 'publish'
-		) );
-		foreach ( $related_posts as $rp_id ) {
+        // Build HTML popup. TODO: move thumb width in css
+        $content = "<a href=$link><h6>$title</h6>";
+        if ( isset( $img_src ) ) {
+            $content = $content . "<img src=$img_src style='width:100%'/>";
+        }
+        $content = $content . "</a><ul>";
+        // Get the related posts (published) and print them in the popup.
+        $related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+            'status' => 'publish'
+        ) );
+        foreach ( $related_posts as $rp_id ) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
-		}
-		$content = $content . "</ul>";
+            $rp      = get_post( $rp_id );
+            $title   = esc_attr( $rp->post_title );
+            $link    = esc_attr( get_permalink( $rp->ID ) );
+            $content = $content . "<li><a href=$link>$title</a></li>";
+        }
+        $content = $content . "</ul>";
 
-		// Formatting POI in geoJSON.
-		// http://leafletjs.com/examples/geojson.html
-		$poi = array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
-			'geometry'   => array(
-				'type'        => 'Point',
-				'coordinates' => array(
-					// Leaflet geoJSON wants them swapped
-					$coordinates['longitude'],
-					$coordinates['latitude']
-				)
-			)
-		);
+        // Formatting POI in geoJSON.
+        // http://leafletjs.com/examples/geojson.html
+        $poi = array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $content ),
+            'geometry'   => array(
+                'type'        => 'Point',
+                'coordinates' => array(
+                    // Leaflet geoJSON wants them swapped
+                    $coordinates['longitude'],
+                    $coordinates['latitude']
+                )
+            )
+        );
 
-		$pois[] = $poi;
+        $pois[] = $poi;
 
-		// Formatting boundaries in a Leaflet-like format (see LatLngBounds).
-		// http://leafletjs.com/reference.html#latlngbounds
-		$boundaries[] = array( $coordinates['latitude'], $coordinates['longitude'] );
+        // Formatting boundaries in a Leaflet-like format (see LatLngBounds).
+        // http://leafletjs.com/reference.html#latlngbounds
+        $boundaries[] = array( $coordinates['latitude'], $coordinates['longitude'] );
 
-	}
+    }
 
-	$map_data               = array();
-	$map_data['features']   = $pois;
-	$map_data['boundaries'] = $boundaries;
+    $map_data               = array();
+    $map_data['features']   = $pois;
+    $map_data['boundaries'] = $boundaries;
 
-	return $map_data;
+    return $map_data;
 }
 
 /**
@@ -173,13 +173,13 @@ 
  * @return array An array of place posts.
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+    $places   = wl_shortcode_geomap_get_places( $post_id );
+    $map_data = wl_shortcode_geomap_prepare_map( $places );
 
-	wl_core_send_json( $map_data );
+    wl_core_send_json( $map_data );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );

Spacing +37 added lines, -37 removed lines

@@ -12,35 +12,35 @@ 
  *
  * @return array An array of place posts.
  */
-function wl_shortcode_geomap_get_places( $post_id = null ) {
+function wl_shortcode_geomap_get_places($post_id = null) {
 
 	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+	$is_global = is_null($post_id) || ! is_numeric($post_id);
 
 	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
+	if ($is_global) {
 		$related_ids = array();
 	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
+		$related_ids = wl_core_get_related_entity_ids($post_id, array(
 			'status' => 'publish'
-		) );
+		));
 		
 		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if (Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			$related_ids[] = $post_id;
 		}
 	}
 
 	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
 	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
+	if ( ! $is_global && empty($related_ids)) {
 		return array();
 	}
 
 	// Retrieve all 'published' places with geo coordinates defined
 	// If $related_ids is not empty, it's used to limit query results to the current post related places
 	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
+	return get_posts(array(
 		'post__in'    => $related_ids,
 		'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
 		'nopaging'    => true,
@@ -63,7 +63,7 @@ 
 			'field'    => 'slug',
 			'terms'    => 'place'
 		)
-	) );
+	));
 }
 
 /**
@@ -76,7 +76,7 @@ 
  *
  * @return array An array of markers and boundaries for Leaflet.
  */
-function wl_shortcode_geomap_prepare_map( $places ) {
+function wl_shortcode_geomap_prepare_map($places) {
 
 	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
 	$min_latitude  = PHP_INT_MAX;
@@ -91,13 +91,13 @@ 
 	$boundaries = array();
 
 	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+	foreach ($places as $entity) {
 
 		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+		$coordinates = wl_get_coordinates($entity->ID);
 
 		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+		if ($coordinates['latitude'] == 0 || $coordinates['longitude'] == 0) {
 			continue;
 		}
 
@@ -105,38 +105,38 @@ 
 		// This function should be focused on returning pure data instead
 
 		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+		$title = esc_attr($entity->post_title);
+		$link  = esc_attr(get_permalink($entity->ID));
+		if ('' !== ($thumbnail_id = get_post_thumbnail_id($entity->ID)) &&
+		     false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 		) {
-			$img_src = esc_attr( $attachment[0] );
+			$img_src = esc_attr($attachment[0]);
 		}
 
 		// Build HTML popup. TODO: move thumb width in css
 		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
+		if (isset($img_src)) {
+			$content = $content."<img src=$img_src style='width:100%'/>";
 		}
-		$content = $content . "</a><ul>";
+		$content = $content."</a><ul>";
 		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+		$related_posts = wl_core_get_related_post_ids($entity->ID, array(
 			'status' => 'publish'
-		) );
-		foreach ( $related_posts as $rp_id ) {
+		));
+		foreach ($related_posts as $rp_id) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
+			$rp      = get_post($rp_id);
+			$title   = esc_attr($rp->post_title);
+			$link    = esc_attr(get_permalink($rp->ID));
+			$content = $content."<li><a href=$link>$title</a></li>";
 		}
-		$content = $content . "</ul>";
+		$content = $content."</ul>";
 
 		// Formatting POI in geoJSON.
 		// http://leafletjs.com/examples/geojson.html
 		$poi = array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
+			'properties' => array('popupContent' => $content),
 			'geometry'   => array(
 				'type'        => 'Point',
 				'coordinates' => array(
@@ -151,7 +151,7 @@ 
 
 		// Formatting boundaries in a Leaflet-like format (see LatLngBounds).
 		// http://leafletjs.com/reference.html#latlngbounds
-		$boundaries[] = array( $coordinates['latitude'], $coordinates['longitude'] );
+		$boundaries[] = array($coordinates['latitude'], $coordinates['longitude']);
 
 	}
 
@@ -174,16 +174,16 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+	$places   = wl_shortcode_geomap_get_places($post_id);
+	$map_data = wl_shortcode_geomap_prepare_map($places);
 
-	wl_core_send_json( $map_data );
+	wl_core_send_json($map_data);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');
 
 ///**
 // * Print geomap shortcode

src/public/class-wordlift-chord-shortcode.php

Indentation +49 added lines, -49 removed lines

@@ -7,64 +7,64 @@ 
  */
 class Wordlift_Chord_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_chord';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_chord';
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
 
-		//extract attributes and set default values
-		$chord_atts = shortcode_atts( array(
-			'width'      => '100%',
-			'height'     => '500px',
-			'main_color' => '000',
-			'depth'      => 2,
-			'global'     => FALSE
-		), $atts );
+        //extract attributes and set default values
+        $chord_atts = shortcode_atts( array(
+            'width'      => '100%',
+            'height'     => '500px',
+            'main_color' => '000',
+            'depth'      => 2,
+            'global'     => FALSE
+        ), $atts );
 
-		if ( $chord_atts['global'] ) {
-			$post_id = wl_shortcode_chord_most_referenced_entity_id();
-			if ( $post_id == NULL ) {
-				return "WordLift Chord: no entities found.";
-			}
-			$widget_id            = 'wl_chord_global';
-			$chord_atts['height'] = '200px';
-		} else {
-			$post_id   = get_the_ID();
-			$widget_id = 'wl_chord_' . $post_id;
-		}
+        if ( $chord_atts['global'] ) {
+            $post_id = wl_shortcode_chord_most_referenced_entity_id();
+            if ( $post_id == NULL ) {
+                return "WordLift Chord: no entities found.";
+            }
+            $widget_id            = 'wl_chord_global';
+            $chord_atts['height'] = '200px';
+        } else {
+            $post_id   = get_the_ID();
+            $widget_id = 'wl_chord_' . $post_id;
+        }
 
-		// Adding css
-		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        // Adding css
+        wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
 
-		// Adding javascript code
-		wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
+        // Adding javascript code
+        wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
 
-		$this->enqueue_scripts();
+        $this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'action'   => 'wl_chord'
-			)
-		);
+        wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
+                'ajax_url' => admin_url( 'admin-ajax.php' ),
+                'action'   => 'wl_chord'
+            )
+        );
 
-		// Escaping atts.
-		$esc_class  = esc_attr( 'wl-chord' );
-		$esc_id     = esc_attr( $widget_id );
-		$esc_width  = esc_attr( $chord_atts['width'] );
-		$esc_height = esc_attr( $chord_atts['height'] );
+        // Escaping atts.
+        $esc_class  = esc_attr( 'wl-chord' );
+        $esc_id     = esc_attr( $widget_id );
+        $esc_width  = esc_attr( $chord_atts['width'] );
+        $esc_height = esc_attr( $chord_atts['height'] );
 
-		$esc_post_id    = esc_attr( $post_id );
-		$esc_depth      = esc_attr( $chord_atts['depth'] );
-		$esc_main_color = esc_attr( $chord_atts['main_color'] );
+        $esc_post_id    = esc_attr( $post_id );
+        $esc_depth      = esc_attr( $chord_atts['depth'] );
+        $esc_main_color = esc_attr( $chord_atts['main_color'] );
 
-		// Building template.
-		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
-		return <<<EOF
+        // Building template.
+        // TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
+        return <<<EOF
 <div class="$esc_class" 
 	id="$esc_id"
 	data-post-id="$esc_post_id"
@@ -77,6 +77,6 @@ 
         margin-bottom:10px">
 </div>
 EOF;
-	}
+    }
 
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -15,52 +15,52 @@
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		//extract attributes and set default values
-		$chord_atts = shortcode_atts( array(
+		$chord_atts = shortcode_atts(array(
 			'width'      => '100%',
 			'height'     => '500px',
 			'main_color' => '000',
 			'depth'      => 2,
 			'global'     => FALSE
-		), $atts );
+		), $atts);
 
-		if ( $chord_atts['global'] ) {
+		if ($chord_atts['global']) {
 			$post_id = wl_shortcode_chord_most_referenced_entity_id();
-			if ( $post_id == NULL ) {
+			if ($post_id == NULL) {
 				return "WordLift Chord: no entities found.";
 			}
 			$widget_id            = 'wl_chord_global';
 			$chord_atts['height'] = '200px';
 		} else {
 			$post_id   = get_the_ID();
-			$widget_id = 'wl_chord_' . $post_id;
+			$widget_id = 'wl_chord_'.$post_id;
 		}
 
 		// Adding css
-		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+		wp_enqueue_style('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-ui.min.css');
 
 		// Adding javascript code
-		wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
+		wp_enqueue_script('d3', dirname(plugin_dir_url(__FILE__)).'/bower_components/d3/d3.min.js');
 
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_localize_script('wordlift-ui', 'wl_chord_params', array(
+				'ajax_url' => admin_url('admin-ajax.php'),
 				'action'   => 'wl_chord'
 			)
 		);
 
 		// Escaping atts.
-		$esc_class  = esc_attr( 'wl-chord' );
-		$esc_id     = esc_attr( $widget_id );
-		$esc_width  = esc_attr( $chord_atts['width'] );
-		$esc_height = esc_attr( $chord_atts['height'] );
+		$esc_class  = esc_attr('wl-chord');
+		$esc_id     = esc_attr($widget_id);
+		$esc_width  = esc_attr($chord_atts['width']);
+		$esc_height = esc_attr($chord_atts['height']);
 
-		$esc_post_id    = esc_attr( $post_id );
-		$esc_depth      = esc_attr( $chord_atts['depth'] );
-		$esc_main_color = esc_attr( $chord_atts['main_color'] );
+		$esc_post_id    = esc_attr($post_id);
+		$esc_depth      = esc_attr($chord_atts['depth']);
+		$esc_main_color = esc_attr($chord_atts['main_color']);
 
 		// Building template.
 		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.

src/public/class-wordlift-timeline-shortcode.php

Indentation +69 added lines, -69 removed lines

@@ -7,79 +7,79 @@
  */
 class Wordlift_Timeline_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_timeline';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Create a Wordlift_Timeline_Shortcode instance.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
-
-	}
-
-	/**
-	 * Renders the Timeline.
-	 *
-	 * @since 3.1.0
-	 * @return string The rendered HTML.
-	 */
-	public function render( $atts ) {
-
-		//extract attributes and set default values
-		$timeline_atts = shortcode_atts( array(
-			'width'  => '100%',
-			'height' => '600px',
-			'global' => false
-		), $atts );
-
-		// Add timeline library.
-		wp_enqueue_script( 'timelinejs-storyjs-embed', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/TimelineJS.build/build/js/storyjs-embed.js' );
-		wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/TimelineJS.build/build/js/timeline-min.js' );
-
-		// Enqueue the scripts for the timeline.
-		$this->enqueue_scripts();
-
-		wp_localize_script( 'wordlift-ui', 'wl_timeline_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ), // TODO: this parameter is already provided by WP
-			'action'   => 'wl_timeline'
-		) );
-
-		// Get the current post id or set null if global is set to true.
-		$post_id = ( $timeline_atts['global'] ? null : get_the_ID() );
-
-		// Generate a unique ID for this timeline.
-		$element_id = uniqid( 'wl-timeline-' );
-
-		// Escaping atts.
-		$esc_width    = esc_attr( $timeline_atts['width'] );
-		$esc_height   = esc_attr( $timeline_atts['height'] );
-		$data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
-
-		if ( WP_DEBUG ) {
-			$this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
-		}
-
-		// Building template.
-		// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
-		return <<<EOF
+    const SHORTCODE = 'wl_timeline';
+
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Create a Wordlift_Timeline_Shortcode instance.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+        parent::__construct();
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
+
+    }
+
+    /**
+     * Renders the Timeline.
+     *
+     * @since 3.1.0
+     * @return string The rendered HTML.
+     */
+    public function render( $atts ) {
+
+        //extract attributes and set default values
+        $timeline_atts = shortcode_atts( array(
+            'width'  => '100%',
+            'height' => '600px',
+            'global' => false
+        ), $atts );
+
+        // Add timeline library.
+        wp_enqueue_script( 'timelinejs-storyjs-embed', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/TimelineJS.build/build/js/storyjs-embed.js' );
+        wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/TimelineJS.build/build/js/timeline-min.js' );
+
+        // Enqueue the scripts for the timeline.
+        $this->enqueue_scripts();
+
+        wp_localize_script( 'wordlift-ui', 'wl_timeline_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ), // TODO: this parameter is already provided by WP
+            'action'   => 'wl_timeline'
+        ) );
+
+        // Get the current post id or set null if global is set to true.
+        $post_id = ( $timeline_atts['global'] ? null : get_the_ID() );
+
+        // Generate a unique ID for this timeline.
+        $element_id = uniqid( 'wl-timeline-' );
+
+        // Escaping atts.
+        $esc_width    = esc_attr( $timeline_atts['width'] );
+        $esc_height   = esc_attr( $timeline_atts['height'] );
+        $data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
+
+        if ( WP_DEBUG ) {
+            $this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
+        }
+
+        // Building template.
+        // TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
+        return <<<EOF
 <div class="wl-timeline" id="$element_id" $data_post_id
 	style="width:$esc_width; height:$esc_height; margin-top:10px; margin-bottom:10px">
 </div>
 EOF;
 
-	}
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 	public function __construct() {
 		parent::__construct();
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Shortcode' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Shortcode');
 
 	}
 
@@ -36,40 +36,40 @@ 
 	 * @since 3.1.0
 	 * @return string The rendered HTML.
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		//extract attributes and set default values
-		$timeline_atts = shortcode_atts( array(
+		$timeline_atts = shortcode_atts(array(
 			'width'  => '100%',
 			'height' => '600px',
 			'global' => false
-		), $atts );
+		), $atts);
 
 		// Add timeline library.
-		wp_enqueue_script( 'timelinejs-storyjs-embed', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/TimelineJS.build/build/js/storyjs-embed.js' );
-		wp_enqueue_script( 'timelinejs', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/TimelineJS.build/build/js/timeline-min.js' );
+		wp_enqueue_script('timelinejs-storyjs-embed', dirname(plugin_dir_url(__FILE__)).'/bower_components/TimelineJS.build/build/js/storyjs-embed.js');
+		wp_enqueue_script('timelinejs', dirname(plugin_dir_url(__FILE__)).'/bower_components/TimelineJS.build/build/js/timeline-min.js');
 
 		// Enqueue the scripts for the timeline.
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_timeline_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ), // TODO: this parameter is already provided by WP
+		wp_localize_script('wordlift-ui', 'wl_timeline_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'), // TODO: this parameter is already provided by WP
 			'action'   => 'wl_timeline'
-		) );
+		));
 
 		// Get the current post id or set null if global is set to true.
-		$post_id = ( $timeline_atts['global'] ? null : get_the_ID() );
+		$post_id = ($timeline_atts['global'] ? null : get_the_ID());
 
 		// Generate a unique ID for this timeline.
-		$element_id = uniqid( 'wl-timeline-' );
+		$element_id = uniqid('wl-timeline-');
 
 		// Escaping atts.
-		$esc_width    = esc_attr( $timeline_atts['width'] );
-		$esc_height   = esc_attr( $timeline_atts['height'] );
-		$data_post_id = ( isset( $post_id ) ? "data-post-id='$post_id'" : '' );
+		$esc_width    = esc_attr($timeline_atts['width']);
+		$esc_height   = esc_attr($timeline_atts['height']);
+		$data_post_id = (isset($post_id) ? "data-post-id='$post_id'" : '');
 
-		if ( WP_DEBUG ) {
-			$this->log_service->trace( "Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]" );
+		if (WP_DEBUG) {
+			$this->log_service->trace("Creating a timeline widget [ element id :: $element_id ][ post id :: $post_id ]");
 		}
 
 		// Building template.

src/public/class-wordlift-shortcode.php

Indentation +45 added lines, -45 removed lines

@@ -8,50 +8,50 @@
  */
 abstract class Wordlift_Shortcode {
 
-	/**
-	 * The shortcode, set by extending classes.
-	 */
-	const SHORTCODE = NULL;
-
-	/**
-	 * Create a shortcode instance by registering the shortcode with the render
-	 * function.
-	 *
-	 * @since 3.5.4
-	 */
-	public function __construct() {
-
-		add_shortcode( static::SHORTCODE, array( $this, 'render' ) );
-
-	}
-
-	/**
-	 * Render the shortcode.
-	 *
-	 * @since 3.5.4
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 */
-	public abstract function render( $atts );
-
-	/**
-	 * Enqueue scripts. Called by the shortcode implementations in their render
-	 * method.
-	 *
-	 * @since 3.5.4
-	 */
-	protected function enqueue_scripts() {
-
-		wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-		wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js', array( 'angularjs' ) );
-		wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array(
-			'jquery',
-			'angularjs',
-			'angularjs-touch'
-		) );
-
-	}
+    /**
+     * The shortcode, set by extending classes.
+     */
+    const SHORTCODE = NULL;
+
+    /**
+     * Create a shortcode instance by registering the shortcode with the render
+     * function.
+     *
+     * @since 3.5.4
+     */
+    public function __construct() {
+
+        add_shortcode( static::SHORTCODE, array( $this, 'render' ) );
+
+    }
+
+    /**
+     * Render the shortcode.
+     *
+     * @since 3.5.4
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     */
+    public abstract function render( $atts );
+
+    /**
+     * Enqueue scripts. Called by the shortcode implementations in their render
+     * method.
+     *
+     * @since 3.5.4
+     */
+    protected function enqueue_scripts() {
+
+        wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+        wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js', array( 'angularjs' ) );
+        wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array(
+            'jquery',
+            'angularjs',
+            'angularjs-touch'
+        ) );
+
+    }
 
 }

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function __construct() {
 
-		add_shortcode( static::SHORTCODE, array( $this, 'render' ) );
+		add_shortcode(static::SHORTCODE, array($this, 'render'));
 
 	}
 
@@ -34,7 +34,7 @@ 
 	 *
 	 * @return string The output html code.
 	 */
-	public abstract function render( $atts );
+	public abstract function render($atts);
 
 	/**
 	 * Enqueue scripts. Called by the shortcode implementations in their render
@@ -44,13 +44,13 @@ 
 	 */
 	protected function enqueue_scripts() {
 
-		wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-		wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js', array( 'angularjs' ) );
-		wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array(
+		wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+		wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js', array('angularjs'));
+		wp_enqueue_script('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-ui.min.js', array(
 			'jquery',
 			'angularjs',
 			'angularjs-touch'
-		) );
+		));
 
 	}
 

src/public/class-wordlift-geomap-shortcode.php

Indentation +52 added lines, -52 removed lines

@@ -7,67 +7,67 @@ 
  */
 class Wordlift_Geomap_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_geomap';
+    const SHORTCODE = 'wl_geomap';
 
-	/**
-	 * Render the shortcode.
-	 *
-	 * @since 3.5.4
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 */
-	public function render( $atts ) {
+    /**
+     * Render the shortcode.
+     *
+     * @since 3.5.4
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     */
+    public function render( $atts ) {
 
-		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
-			'width'  => '100%',
-			'height' => '300px',
-			'global' => FALSE
-		), $atts );
+        // Extract attributes and set default values.
+        $geomap_atts = shortcode_atts( array(
+            'width'  => '100%',
+            'height' => '300px',
+            'global' => FALSE
+        ), $atts );
 
-		// Get id of the post
-		$post_id = get_the_ID();
+        // Get id of the post
+        $post_id = get_the_ID();
 
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
-			// Global geomap
-			$geomap_id = 'wl_geomap_global';
-			$post_id   = NULL;
-		} else {
-			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
-		}
+        if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+            // Global geomap
+            $geomap_id = 'wl_geomap_global';
+            $post_id   = NULL;
+        } else {
+            // Post-specific geomap
+            $geomap_id = 'wl_geomap_' . $post_id;
+        }
 
-		// Add leaflet css and library.
-		wp_enqueue_style(
-			'leaflet',
-			dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.css'
-		);
-		wp_enqueue_script(
-			'leaflet',
-			dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.js'
-		);
+        // Add leaflet css and library.
+        wp_enqueue_style(
+            'leaflet',
+            dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.css'
+        );
+        wp_enqueue_script(
+            'leaflet',
+            dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.js'
+        );
 
-		// Add wordlift-ui css and library.
-		wp_enqueue_style( 'wordlift-ui-css', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        // Add wordlift-ui css and library.
+        wp_enqueue_style( 'wordlift-ui-css', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
 
-		$this->enqueue_scripts();
+        $this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
-			'action'   => 'wl_geomap'            // Global param
-		) );
+        wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+            'action'   => 'wl_geomap'            // Global param
+        ) );
 
-		// Escaping atts.
-		$esc_class   = esc_attr( 'wl-geomap' );
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
+        // Escaping atts.
+        $esc_class   = esc_attr( 'wl-geomap' );
+        $esc_id      = esc_attr( $geomap_id );
+        $esc_width   = esc_attr( $geomap_atts['width'] );
+        $esc_height  = esc_attr( $geomap_atts['height'] );
+        $esc_post_id = esc_attr( $post_id );
 
-		// Return HTML template.
-		return <<<EOF
+        // Return HTML template.
+        return <<<EOF
 <div class="$esc_class" 
 	id="$esc_id"
 	data-post-id="$esc_post_id"
@@ -77,6 +77,6 @@ 
         ">
 </div>
 EOF;
-	}
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -18,53 +18,53 @@
 	 *
 	 * @return string The output html code.
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
+		$geomap_atts = shortcode_atts(array(
 			'width'  => '100%',
 			'height' => '300px',
 			'global' => FALSE
-		), $atts );
+		), $atts);
 
 		// Get id of the post
 		$post_id = get_the_ID();
 
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+		if ($geomap_atts['global'] || is_null($post_id)) {
 			// Global geomap
 			$geomap_id = 'wl_geomap_global';
 			$post_id   = NULL;
 		} else {
 			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
+			$geomap_id = 'wl_geomap_'.$post_id;
 		}
 
 		// Add leaflet css and library.
 		wp_enqueue_style(
 			'leaflet',
-			dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.css'
+			dirname(plugin_dir_url(__FILE__)).'/bower_components/leaflet/dist/leaflet.css'
 		);
 		wp_enqueue_script(
 			'leaflet',
-			dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.js'
+			dirname(plugin_dir_url(__FILE__)).'/bower_components/leaflet/dist/leaflet.js'
 		);
 
 		// Add wordlift-ui css and library.
-		wp_enqueue_style( 'wordlift-ui-css', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+		wp_enqueue_style('wordlift-ui-css', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-ui.min.css');
 
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+		wp_localize_script('wordlift-ui', 'wl_geomap_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'), // Global param
 			'action'   => 'wl_geomap'            // Global param
-		) );
+		));
 
 		// Escaping atts.
-		$esc_class   = esc_attr( 'wl-geomap' );
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
+		$esc_class   = esc_attr('wl-geomap');
+		$esc_id      = esc_attr($geomap_id);
+		$esc_width   = esc_attr($geomap_atts['width']);
+		$esc_height  = esc_attr($geomap_atts['height']);
+		$esc_post_id = esc_attr($post_id);
 
 		// Return HTML template.
 		return <<<EOF

src/public/class-wordlift-navigator-shortcode.php

Indentation +43 added lines, -43 removed lines

@@ -7,59 +7,59 @@
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
 
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'          => __( 'Related articles', 'wordlift' ),
-			'with_carousel'  => TRUE,
-			'squared_thumbs' => FALSE
-		), $atts );
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'          => __( 'Related articles', 'wordlift' ),
+            'with_carousel'  => TRUE,
+            'squared_thumbs' => FALSE
+        ), $atts );
 
-		foreach (
-			array(
-				'with_carousel',
-				'squared_thumbs'
-			) as $att
-		) {
+        foreach (
+            array(
+                'with_carousel',
+                'squared_thumbs'
+            ) as $att
+        ) {
 
-			// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-			$shortcode_atts[ $att ] = filter_var(
-				$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
-			);
-		}
+            // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
+            $shortcode_atts[ $att ] = filter_var(
+                $shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+            );
+        }
 
-		// avoid building the widget when there is a list of posts.
-		if ( ! is_single() ) {
-			return '';
-		}
+        // avoid building the widget when there is a list of posts.
+        if ( ! is_single() ) {
+            return '';
+        }
 
-		$current_post = get_post();
+        $current_post = get_post();
 
-		// Enqueue common shortcode scripts.
-		$this->enqueue_scripts();
+        // Enqueue common shortcode scripts.
+        $this->enqueue_scripts();
 
-		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
 
-		$navigator_id = uniqid( 'wl-navigator-widget-' );
+        $navigator_id = uniqid( 'wl-navigator-widget-' );
 
-		wp_localize_script( 'wordlift-ui', 'wl_navigator_params', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'action'   => 'wl_navigator',
-				'post_id'  => $current_post->ID,
-				'attrs'    => $shortcode_atts
-			)
-		);
+        wp_localize_script( 'wordlift-ui', 'wl_navigator_params', array(
+                'ajax_url' => admin_url( 'admin-ajax.php' ),
+                'action'   => 'wl_navigator',
+                'post_id'  => $current_post->ID,
+                'attrs'    => $shortcode_atts
+            )
+        );
 
-		return "<div id='$navigator_id' class='wl-navigator-widget'></div>";
-	}
+        return "<div id='$navigator_id' class='wl-navigator-widget'></div>";
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -15,14 +15,14 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'          => __( 'Related articles', 'wordlift' ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'          => __('Related articles', 'wordlift'),
 			'with_carousel'  => TRUE,
 			'squared_thumbs' => FALSE
-		), $atts );
+		), $atts);
 
 		foreach (
 			array(
@@ -32,13 +32,13 @@ 
 		) {
 
 			// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-			$shortcode_atts[ $att ] = filter_var(
-				$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+			$shortcode_atts[$att] = filter_var(
+				$shortcode_atts[$att], FILTER_VALIDATE_BOOLEAN
 			);
 		}
 
 		// avoid building the widget when there is a list of posts.
-		if ( ! is_single() ) {
+		if ( ! is_single()) {
 			return '';
 		}
 
@@ -47,12 +47,12 @@ 
 		// Enqueue common shortcode scripts.
 		$this->enqueue_scripts();
 
-		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+		wp_enqueue_style('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-ui.min.css');
 
-		$navigator_id = uniqid( 'wl-navigator-widget-' );
+		$navigator_id = uniqid('wl-navigator-widget-');
 
-		wp_localize_script( 'wordlift-ui', 'wl_navigator_params', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_localize_script('wordlift-ui', 'wl_navigator_params', array(
+				'ajax_url' => admin_url('admin-ajax.php'),
 				'action'   => 'wl_navigator',
 				'post_id'  => $current_post->ID,
 				'attrs'    => $shortcode_atts