insideout10 / wordlift-plugin

src/admin/class-wordlift-admin-publisher-element.php

Indentation +114 added lines, -114 removed lines

@@ -19,116 +19,116 @@ 
  */
 class Wordlift_Admin_Publisher_Element extends Wordlift_Admin_Author_Element {
 
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.11.0
-	 * @access private
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
-
-	/**
-	 * @var Wordlift_Admin_Tabs_Element
-	 */
-	private $tabs_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Publisher_Element} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 * @param \Wordlift_Publisher_Service     $publisher_service     The {@link Wordlift_Publisher_Service} instance.
-	 * @param \Wordlift_Admin_Tabs_Element    $tabs_element          The {@link Wordlift_Admin_Tabs_Element} instance.
-	 * @param \Wordlift_Admin_Select2_Element $select_element        The {@link Wordlift_Admin_Select_Element} instance.
-	 */
-	function __construct( $configuration_service, $publisher_service, $tabs_element, $select_element ) {
-		parent::__construct($publisher_service, $select_element);
-
-		$this->configuration_service = $configuration_service;
-		$this->publisher_service     = $publisher_service;
-
-		// Child elements.
-		$this->tabs_element   = $tabs_element;
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
-
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'   => uniqid( 'wl-input-' ),
-			'name' => uniqid( 'wl-input-' ),
-		) );
-
-		// Get the number of potential candidates as publishers.
-		$count = $this->publisher_service->count();
-
-		$this->tabs_element->render( array(
-			'tabs'   => array(
-				array(
-					'label'    => __( 'Select an Existing Publisher', 'wordlift' ),
-					'callback' => array( $this, 'select' ),
-					'args'     => $params,
-				),
-				array(
-					'label'    => __( 'Create a New Publisher', 'wordlift' ),
-					'callback' => array( $this, 'create' ),
-					'args'     => $params,
-				),
-			),
-			// Set the default tab according to the number of potential publishers
-			// configured in WP: 0 = select, 1 = create.
-			'active' => 0 === $count ? 1 : 0,
-		) );
-
-		// Finally return the element instance.
-		return $this;
-	}
-
-	/**
-	 * Render the publisher's select.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $params An array of parameters.
-	 */
-	public function select( $params ) {
-
-		// Get the configured publisher id. In case a publisher id is already configured
-		// this must be pre-loaded in the options.
-		$publisher_id = $this->configuration_service->get_publisher_id();
-
-		// Get the publisher data.
-		$data = $this->publisher_service->query();
-
-		// Call the select internal render.
-		$this->do_render( $params, $publisher_id, $data );
-
-	}
-
-	/**
-	 * Render the 'create publisher' form.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param array $params An array of parameters.
-	 */
-	public function create( $params ) {
-		?>
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.11.0
+     * @access private
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
+
+    /**
+     * @var Wordlift_Admin_Tabs_Element
+     */
+    private $tabs_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Publisher_Element} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     * @param \Wordlift_Publisher_Service     $publisher_service     The {@link Wordlift_Publisher_Service} instance.
+     * @param \Wordlift_Admin_Tabs_Element    $tabs_element          The {@link Wordlift_Admin_Tabs_Element} instance.
+     * @param \Wordlift_Admin_Select2_Element $select_element        The {@link Wordlift_Admin_Select_Element} instance.
+     */
+    function __construct( $configuration_service, $publisher_service, $tabs_element, $select_element ) {
+        parent::__construct($publisher_service, $select_element);
+
+        $this->configuration_service = $configuration_service;
+        $this->publisher_service     = $publisher_service;
+
+        // Child elements.
+        $this->tabs_element   = $tabs_element;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
+
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'   => uniqid( 'wl-input-' ),
+            'name' => uniqid( 'wl-input-' ),
+        ) );
+
+        // Get the number of potential candidates as publishers.
+        $count = $this->publisher_service->count();
+
+        $this->tabs_element->render( array(
+            'tabs'   => array(
+                array(
+                    'label'    => __( 'Select an Existing Publisher', 'wordlift' ),
+                    'callback' => array( $this, 'select' ),
+                    'args'     => $params,
+                ),
+                array(
+                    'label'    => __( 'Create a New Publisher', 'wordlift' ),
+                    'callback' => array( $this, 'create' ),
+                    'args'     => $params,
+                ),
+            ),
+            // Set the default tab according to the number of potential publishers
+            // configured in WP: 0 = select, 1 = create.
+            'active' => 0 === $count ? 1 : 0,
+        ) );
+
+        // Finally return the element instance.
+        return $this;
+    }
+
+    /**
+     * Render the publisher's select.
+     *
+     * @since 3.11.0
+     *
+     * @param array $params An array of parameters.
+     */
+    public function select( $params ) {
+
+        // Get the configured publisher id. In case a publisher id is already configured
+        // this must be pre-loaded in the options.
+        $publisher_id = $this->configuration_service->get_publisher_id();
+
+        // Get the publisher data.
+        $data = $this->publisher_service->query();
+
+        // Call the select internal render.
+        $this->do_render( $params, $publisher_id, $data );
+
+    }
+
+    /**
+     * Render the 'create publisher' form.
+     *
+     * @since 3.11.0
+     *
+     * @param array $params An array of parameters.
+     */
+    public function create( $params ) {
+        ?>
 		<p>
 			<strong><?php esc_html_e( 'Are you publishing as an individual or as a company?', 'wordlift' ) ?></strong>
 		</p>
@@ -138,13 +138,13 @@ 
 				       name="wl_publisher[type]" value="person"
 				       checked="checked">
 				<label for="wl-publisher-person"><?php
-					esc_html_e( 'Person', 'wordlift' ) ?></label>
+                    esc_html_e( 'Person', 'wordlift' ) ?></label>
 			</span>
 			<span>
 				<input id="wl-publisher-company" type="radio"
 				       name="wl_publisher[type]" value="organization"">
 				<label for="wl-publisher-company"><?php
-					esc_html_e( 'Company', 'wordlift' ) ?></label>
+                    esc_html_e( 'Company', 'wordlift' ) ?></label>
 			</span>
 		</p>
 		<p id="wl-publisher-name">
@@ -161,10 +161,10 @@ 
 				<img id="wl-publisher-media-uploader-preview" />
 				<button type="button" class="button"
 				        id="wl-publisher-media-uploader"><?php
-					esc_html_e( 'Select an existing image or upload a new one', 'wordlift' ); ?></button>
+                    esc_html_e( 'Select an existing image or upload a new one', 'wordlift' ); ?></button>
 			</p>
 		</div>
 		<?php
-	}
+    }
 
 }

Spacing +22 added lines, -22 removed lines

@@ -52,48 +52,48 @@ 
 	 * @param \Wordlift_Admin_Tabs_Element    $tabs_element          The {@link Wordlift_Admin_Tabs_Element} instance.
 	 * @param \Wordlift_Admin_Select2_Element $select_element        The {@link Wordlift_Admin_Select_Element} instance.
 	 */
-	function __construct( $configuration_service, $publisher_service, $tabs_element, $select_element ) {
+	function __construct($configuration_service, $publisher_service, $tabs_element, $select_element) {
 		parent::__construct($publisher_service, $select_element);
 
 		$this->configuration_service = $configuration_service;
 		$this->publisher_service     = $publisher_service;
 
 		// Child elements.
-		$this->tabs_element   = $tabs_element;
+		$this->tabs_element = $tabs_element;
 
 	}
 
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'   => uniqid( 'wl-input-' ),
-			'name' => uniqid( 'wl-input-' ),
-		) );
+		$params = wp_parse_args($args, array(
+			'id'   => uniqid('wl-input-'),
+			'name' => uniqid('wl-input-'),
+		));
 
 		// Get the number of potential candidates as publishers.
 		$count = $this->publisher_service->count();
 
-		$this->tabs_element->render( array(
+		$this->tabs_element->render(array(
 			'tabs'   => array(
 				array(
-					'label'    => __( 'Select an Existing Publisher', 'wordlift' ),
-					'callback' => array( $this, 'select' ),
+					'label'    => __('Select an Existing Publisher', 'wordlift'),
+					'callback' => array($this, 'select'),
 					'args'     => $params,
 				),
 				array(
-					'label'    => __( 'Create a New Publisher', 'wordlift' ),
-					'callback' => array( $this, 'create' ),
+					'label'    => __('Create a New Publisher', 'wordlift'),
+					'callback' => array($this, 'create'),
 					'args'     => $params,
 				),
 			),
 			// Set the default tab according to the number of potential publishers
 			// configured in WP: 0 = select, 1 = create.
 			'active' => 0 === $count ? 1 : 0,
-		) );
+		));
 
 		// Finally return the element instance.
 		return $this;
@@ -106,7 +106,7 @@ 
 	 *
 	 * @param array $params An array of parameters.
 	 */
-	public function select( $params ) {
+	public function select($params) {
 
 		// Get the configured publisher id. In case a publisher id is already configured
 		// this must be pre-loaded in the options.
@@ -116,7 +116,7 @@ 
 		$data = $this->publisher_service->query();
 
 		// Call the select internal render.
-		$this->do_render( $params, $publisher_id, $data );
+		$this->do_render($params, $publisher_id, $data);
 
 	}
 
@@ -127,10 +127,10 @@ 
 	 *
 	 * @param array $params An array of parameters.
 	 */
-	public function create( $params ) {
+	public function create($params) {
 		?>
 		<p>
-			<strong><?php esc_html_e( 'Are you publishing as an individual or as a company?', 'wordlift' ) ?></strong>
+			<strong><?php esc_html_e('Are you publishing as an individual or as a company?', 'wordlift') ?></strong>
 		</p>
 		<p id="wl-publisher-type">
 			<span>
@@ -138,30 +138,30 @@ 
 				       name="wl_publisher[type]" value="person"
 				       checked="checked">
 				<label for="wl-publisher-person"><?php
-					esc_html_e( 'Person', 'wordlift' ) ?></label>
+					esc_html_e('Person', 'wordlift') ?></label>
 			</span>
 			<span>
 				<input id="wl-publisher-company" type="radio"
 				       name="wl_publisher[type]" value="organization"">
 				<label for="wl-publisher-company"><?php
-					esc_html_e( 'Company', 'wordlift' ) ?></label>
+					esc_html_e('Company', 'wordlift') ?></label>
 			</span>
 		</p>
 		<p id="wl-publisher-name">
 			<input type="text" name="wl_publisher[name]"
-			       placeholder="<?php echo esc_attr__( "What's your name?", 'wordlift' ) ?>">
+			       placeholder="<?php echo esc_attr__("What's your name?", 'wordlift') ?>">
 		</p>
 		<div id="wl-publisher-logo">
 			<input type="hidden" id="wl-publisher-media-uploader-id"
 			       name="wl_publisher[thumbnail_id]" />
 			<p>
-				<b><?php esc_html_e( "Choose the publisher's Logo", 'wordlift' ) ?></b>
+				<b><?php esc_html_e("Choose the publisher's Logo", 'wordlift') ?></b>
 			</p>
 			<p>
 				<img id="wl-publisher-media-uploader-preview" />
 				<button type="button" class="button"
 				        id="wl-publisher-media-uploader"><?php
-					esc_html_e( 'Select an existing image or upload a new one', 'wordlift' ); ?></button>
+					esc_html_e('Select an existing image or upload a new one', 'wordlift'); ?></button>
 			</p>
 		</div>
 		<?php

src/admin/class-wordlift-admin-author-element.php

Indentation +107 added lines, -107 removed lines

@@ -19,112 +19,112 @@
  */
 class Wordlift_Admin_Author_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 */
-	private $publisher_service;
-
-	/**
-	 * A {@link Wordlift_Admin_Select2_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Admin_Select2_Element $select_element A {@link Wordlift_Admin_Select2_Element} instance.
-	 */
-	private $select_element;
-
-	/**
-	 * Create a {@link Wordlift_Admin_Person_Element} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
-	 * @param \Wordlift_Admin_Select2_Element $select_element    The {@link Wordlift_Admin_Select_Element} instance.
-	 */
-	function __construct( $publisher_service, $select_element ) {
-
-		$this->publisher_service = $publisher_service;
-
-		// Child elements.
-		$this->select_element = $select_element;
-
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
-
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'             => uniqid( 'wl-input-' ),
-			'name'           => uniqid( 'wl-input-' ),
-			'current_entity' => 0,
-		) );
-
-		$current_entity_id = $params['current_entity'];
-		$data              = $this->publisher_service->query();
-
-		// Set a default to show when no entity is associated and a way to unassign.
-		array_unshift( $data, array(
-			'id'            => '0',
-			'text'          => __( '<em>(none)</em>', 'wordlift' ),
-			'type'          => '',
-			'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
-		) );
-
-		// Finally do the render, passing along also the current selected entity
-		// id and the options data.
-		return $this->do_render( $params, $current_entity_id, $data );
-	}
-
-	/**
-	 * Render the `select` using the provided parameters.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param array $params          The array of parameters from the `render` function.
-	 * @param int   $current_post_id The currently selected {@link WP_Post} `id`.
-	 * @param array $data            An array of Select2 options.
-	 *
-	 * @return \Wordlift_Admin_Author_Element $this Return this element.
-	 */
-	protected function do_render( $params, $current_post_id, $data ) {
-
-		// Queue the script which will initialize the select and style it.
-		wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-author-element.bundle.js', array( 'wordlift-select2' ) );
-
-		// Prepare the URLs for entities which don't have logos.
-		$person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . 'images/person.png';
-		$organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . 'images/organization.png';
-
-		// Get the current post.
-		$current_post = $current_post_id ? get_post( $current_post_id ) : null;
-
-		// Finally render the Select.
-		$this->select_element->render( array(
-			// Id.
-			'id'                 => $params['id'],
-			// Name.
-			'name'               => $params['name'],
-			// The selected id.
-			'value'              => $current_post_id,
-			// The selected item (must be in the options for Select2 to display it).
-			'options'            => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
-			// The list of available options.
-			'data'               => $data,
-			// The HTML template for each option.
-			'template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-			// The HTML template for the selected option.
-			'template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-		) );
-
-		// Finally return the element instance.
-		return $this;
-	}
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Publisher_Service $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     */
+    private $publisher_service;
+
+    /**
+     * A {@link Wordlift_Admin_Select2_Element} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Admin_Select2_Element $select_element A {@link Wordlift_Admin_Select2_Element} instance.
+     */
+    private $select_element;
+
+    /**
+     * Create a {@link Wordlift_Admin_Person_Element} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
+     * @param \Wordlift_Admin_Select2_Element $select_element    The {@link Wordlift_Admin_Select_Element} instance.
+     */
+    function __construct( $publisher_service, $select_element ) {
+
+        $this->publisher_service = $publisher_service;
+
+        // Child elements.
+        $this->select_element = $select_element;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
+
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'             => uniqid( 'wl-input-' ),
+            'name'           => uniqid( 'wl-input-' ),
+            'current_entity' => 0,
+        ) );
+
+        $current_entity_id = $params['current_entity'];
+        $data              = $this->publisher_service->query();
+
+        // Set a default to show when no entity is associated and a way to unassign.
+        array_unshift( $data, array(
+            'id'            => '0',
+            'text'          => __( '<em>(none)</em>', 'wordlift' ),
+            'type'          => '',
+            'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
+        ) );
+
+        // Finally do the render, passing along also the current selected entity
+        // id and the options data.
+        return $this->do_render( $params, $current_entity_id, $data );
+    }
+
+    /**
+     * Render the `select` using the provided parameters.
+     *
+     * @since 3.14.0
+     *
+     * @param array $params          The array of parameters from the `render` function.
+     * @param int   $current_post_id The currently selected {@link WP_Post} `id`.
+     * @param array $data            An array of Select2 options.
+     *
+     * @return \Wordlift_Admin_Author_Element $this Return this element.
+     */
+    protected function do_render( $params, $current_post_id, $data ) {
+
+        // Queue the script which will initialize the select and style it.
+        wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-author-element.bundle.js', array( 'wordlift-select2' ) );
+
+        // Prepare the URLs for entities which don't have logos.
+        $person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . 'images/person.png';
+        $organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . 'images/organization.png';
+
+        // Get the current post.
+        $current_post = $current_post_id ? get_post( $current_post_id ) : null;
+
+        // Finally render the Select.
+        $this->select_element->render( array(
+            // Id.
+            'id'                 => $params['id'],
+            // Name.
+            'name'               => $params['name'],
+            // The selected id.
+            'value'              => $current_post_id,
+            // The selected item (must be in the options for Select2 to display it).
+            'options'            => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
+            // The list of available options.
+            'data'               => $data,
+            // The HTML template for each option.
+            'template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
+            // The HTML template for the selected option.
+            'template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
+        ) );
+
+        // Finally return the element instance.
+        return $this;
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param \Wordlift_Publisher_Service     $publisher_service The {@link Wordlift_Publisher_Service} instance.
 	 * @param \Wordlift_Admin_Select2_Element $select_element    The {@link Wordlift_Admin_Select_Element} instance.
 	 */
-	function __construct( $publisher_service, $select_element ) {
+	function __construct($publisher_service, $select_element) {
 
 		$this->publisher_service = $publisher_service;
 
@@ -57,29 +57,29 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'             => uniqid( 'wl-input-' ),
-			'name'           => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'             => uniqid('wl-input-'),
+			'name'           => uniqid('wl-input-'),
 			'current_entity' => 0,
-		) );
+		));
 
 		$current_entity_id = $params['current_entity'];
 		$data              = $this->publisher_service->query();
 
 		// Set a default to show when no entity is associated and a way to unassign.
-		array_unshift( $data, array(
+		array_unshift($data, array(
 			'id'            => '0',
-			'text'          => __( '<em>(none)</em>', 'wordlift' ),
+			'text'          => __('<em>(none)</em>', 'wordlift'),
 			'type'          => '',
-			'thumbnail_url' => plugin_dir_url( dirname( __FILE__ ) ) . 'images/pixel.png',
-		) );
+			'thumbnail_url' => plugin_dir_url(dirname(__FILE__)).'images/pixel.png',
+		));
 
 		// Finally do the render, passing along also the current selected entity
 		// id and the options data.
-		return $this->do_render( $params, $current_entity_id, $data );
+		return $this->do_render($params, $current_entity_id, $data);
 	}
 
 	/**
@@ -93,20 +93,20 @@ 
 	 *
 	 * @return \Wordlift_Admin_Author_Element $this Return this element.
 	 */
-	protected function do_render( $params, $current_post_id, $data ) {
+	protected function do_render($params, $current_post_id, $data) {
 
 		// Queue the script which will initialize the select and style it.
-		wp_enqueue_script( 'wl-author-element', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/wordlift-author-element.bundle.js', array( 'wordlift-select2' ) );
+		wp_enqueue_script('wl-author-element', plugin_dir_url(dirname(__FILE__)).'admin/js/wordlift-author-element.bundle.js', array('wordlift-select2'));
 
 		// Prepare the URLs for entities which don't have logos.
-		$person_thumbnail_url       = plugin_dir_url( dirname( __FILE__ ) ) . 'images/person.png';
-		$organization_thumbnail_url = plugin_dir_url( dirname( __FILE__ ) ) . 'images/organization.png';
+		$person_thumbnail_url       = plugin_dir_url(dirname(__FILE__)).'images/person.png';
+		$organization_thumbnail_url = plugin_dir_url(dirname(__FILE__)).'images/organization.png';
 
 		// Get the current post.
-		$current_post = $current_post_id ? get_post( $current_post_id ) : null;
+		$current_post = $current_post_id ? get_post($current_post_id) : null;
 
 		// Finally render the Select.
-		$this->select_element->render( array(
+		$this->select_element->render(array(
 			// Id.
 			'id'                 => $params['id'],
 			// Name.
@@ -114,14 +114,14 @@ 
 			// The selected id.
 			'value'              => $current_post_id,
 			// The selected item (must be in the options for Select2 to display it).
-			'options'            => $current_post ? array( $current_post->ID => $current_post->post_title ) : array(),
+			'options'            => $current_post ? array($current_post->ID => $current_post->post_title) : array(),
 			// The list of available options.
 			'data'               => $data,
 			// The HTML template for each option.
 			'template-result'    => "<div class='wl-select2-result'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
 			// The HTML template for the selected option.
 			'template-selection' => "<div class='wl-select2-selection'><span class='wl-select2-thumbnail' style='background-image: url( <%= obj.thumbnail_url || ( 'Organization' === obj.type ? '$organization_thumbnail_url' : '$person_thumbnail_url' ) %> );'>&nbsp;</span><span class='wl-select2'><%= obj.text %></span><span class='wl-select2-type'><%= obj.type %></span></div>",
-		) );
+		));
 
 		// Finally return the element instance.
 		return $this;

src/includes/class-wordlift-activator.php

Spacing +7 added lines, -7 removed lines

@@ -32,17 +32,17 @@ 
 	public static function activate() {
 
 		// Do not let the plugin be activate on wordpress versions before 4.2.
-		$version = get_bloginfo( 'version' );
-		if ( version_compare( $version, '4.2', '<' ) ) {
-			die( __( 'The WordLift plugin requires WordPress version 4.2 or above.', 'wordlift' ) );
+		$version = get_bloginfo('version');
+		if (version_compare($version, '4.2', '<')) {
+			die(__('The WordLift plugin requires WordPress version 4.2 or above.', 'wordlift'));
 		}
 
 		$configuration_service = Wordlift_Configuration_Service::get_instance();
 
 		// Create a blank application key if there is none
 		$key = $configuration_service->get_key();
-		if ( empty( $key ) ) {
-			$configuration_service->set_key( '' );
+		if (empty($key)) {
+			$configuration_service->set_key('');
 		}
 
 		// Intentionally go through the whole upgrade procedure to be DRY.
@@ -50,8 +50,8 @@ 
 
 		// If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
 		// for granted that we're in a browser admin session.
-		if ( '' === $configuration_service->get_key() ) {
-			set_transient( '_wl_activation_redirect', true, 30 );
+		if ('' === $configuration_service->get_key()) {
+			set_transient('_wl_activation_redirect', true, 30);
 		}
 	}
 

Indentation +33 added lines, -33 removed lines

@@ -22,38 +22,38 @@
  */
 class Wordlift_Activator {
 
-	/**
-	 * Short Description. (use period)
-	 *
-	 * Long Description.
-	 *
-	 * @since    1.0.0
-	 */
-	public static function activate() {
-
-		// Do not let the plugin be activate on wordpress versions before 4.2.
-		$version = get_bloginfo( 'version' );
-		if ( version_compare( $version, '4.2', '<' ) ) {
-			die( __( 'The WordLift plugin requires WordPress version 4.2 or above.', 'wordlift' ) );
-		}
-
-		$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-		// Create a blank application key if there is none
-		$key = $configuration_service->get_key();
-		if ( empty( $key ) ) {
-			$configuration_service->set_key( '' );
-		}
-
-		// Intentionally go through the whole upgrade procedure to be DRY.
-		wl_core_update_db_check();
-
-		// If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
-		// for granted that we're in a browser admin session.
-		if ( '' === $configuration_service->get_key() ) {
-			set_transient( '_wl_activation_redirect', true, 30 );
-		}
-
-	}
+    /**
+     * Short Description. (use period)
+     *
+     * Long Description.
+     *
+     * @since    1.0.0
+     */
+    public static function activate() {
+
+        // Do not let the plugin be activate on wordpress versions before 4.2.
+        $version = get_bloginfo( 'version' );
+        if ( version_compare( $version, '4.2', '<' ) ) {
+            die( __( 'The WordLift plugin requires WordPress version 4.2 or above.', 'wordlift' ) );
+        }
+
+        $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+        // Create a blank application key if there is none
+        $key = $configuration_service->get_key();
+        if ( empty( $key ) ) {
+            $configuration_service->set_key( '' );
+        }
+
+        // Intentionally go through the whole upgrade procedure to be DRY.
+        wl_core_update_db_check();
+
+        // If WordLift's key is not configured, set `_wl_activation_redirect` transient. We won't redirect here, because we can't give
+        // for granted that we're in a browser admin session.
+        if ( '' === $configuration_service->get_key() ) {
+            set_transient( '_wl_activation_redirect', true, 30 );
+        }
+
+    }
 
 }

src/includes/class-wordlift-post-adapter.php

Indentation +37 added lines, -37 removed lines

@@ -16,42 +16,42 @@
  */
 class Wordlift_Post_Adapter {
 
-	/**
-	 * The post id to which the adopter relates.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @var integer $post_id .
-	 */
-	private $post_id;
-
-	/**
-	 * Create the {@link Wordlift_Post_Adatpter} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $post_id the post ID of the post the adopter relates to.
-	 */
-	function __construct( $post_id ) {
-
-		$this->post_id = $post_id;
-
-	}
-
-	/**
-	 * Get the word count of the post content.
-	 *
-	 * The count is calculated over the post content after stripping shortcodes and html tags.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @return integer the number of words in the content after stripping shortcodes and html tags..
-	 */
-	public function word_count() {
-
-		$post = get_post( $this->post_id );
-
-		return str_word_count( strip_tags( strip_shortcodes( $post->post_content ) ) );
-	}
+    /**
+     * The post id to which the adopter relates.
+     *
+     * @since 3.14.0
+     *
+     * @var integer $post_id .
+     */
+    private $post_id;
+
+    /**
+     * Create the {@link Wordlift_Post_Adatpter} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param integer $post_id the post ID of the post the adopter relates to.
+     */
+    function __construct( $post_id ) {
+
+        $this->post_id = $post_id;
+
+    }
+
+    /**
+     * Get the word count of the post content.
+     *
+     * The count is calculated over the post content after stripping shortcodes and html tags.
+     *
+     * @since 3.14.0
+     *
+     * @return integer the number of words in the content after stripping shortcodes and html tags..
+     */
+    public function word_count() {
+
+        $post = get_post( $this->post_id );
+
+        return str_word_count( strip_tags( strip_shortcodes( $post->post_content ) ) );
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param integer $post_id the post ID of the post the adopter relates to.
 	 */
-	function __construct( $post_id ) {
+	function __construct($post_id) {
 
 		$this->post_id = $post_id;
 
@@ -49,9 +49,9 @@ 
 	 */
 	public function word_count() {
 
-		$post = get_post( $this->post_id );
+		$post = get_post($this->post_id);
 
-		return str_word_count( strip_tags( strip_shortcodes( $post->post_content ) ) );
+		return str_word_count(strip_tags(strip_shortcodes($post->post_content)));
 	}
 
 }

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

Indentation +41 added lines, -41 removed lines

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

Spacing +48 added lines, -48 removed lines

@@ -12,7 +12,7 @@ 
 	<!-- Defining responsive ambient. -->
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-	<title><?php esc_html_e( 'WordLift Setup', 'wordlift' ); ?></title>
+	<title><?php esc_html_e('WordLift Setup', 'wordlift'); ?></title>
 
 	<?php
 
@@ -20,26 +20,26 @@ 
 	wp_enqueue_media();
 
 	// Enqueue styles and scripts.
-	wp_enqueue_style( 'wl-font-awesome', plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'css/font-awesome.min.css' );
-	wp_enqueue_style( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'css/wordlift-admin-setup.css', array(
+	wp_enqueue_style('wl-font-awesome', plugin_dir_url(dirname(dirname(__FILE__))).'css/font-awesome.min.css');
+	wp_enqueue_style('wordlift-admin-setup', plugin_dir_url(dirname(__FILE__)).'css/wordlift-admin-setup.css', array(
 		'wp-admin',
 		'wl-font-awesome',
-	) );
-	wp_enqueue_script( 'wordlift-admin-setup', plugin_dir_url( dirname( __FILE__ ) ) . 'js/wordlift-admin-setup.js', array( 'jquery' ) );
+	));
+	wp_enqueue_script('wordlift-admin-setup', plugin_dir_url(dirname(__FILE__)).'js/wordlift-admin-setup.js', array('jquery'));
 
 	//Get wp_permalink structure
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 	
 	// Set configuration settings.
-	wp_localize_script( 'wordlift-admin-setup', '_wlAdminSetup', array(
-		'ajaxUrl'   => parse_url( self_admin_url( 'admin-ajax.php' ), PHP_URL_PATH ),
+	wp_localize_script('wordlift-admin-setup', '_wlAdminSetup', array(
+		'ajaxUrl'   => parse_url(self_admin_url('admin-ajax.php'), PHP_URL_PATH),
 		'action'    => 'wl_validate_key',
 		'permalink' => $permalink_structure,
 		'media'     => array(
-			'title'  => __( 'WordLift Choose Logo', 'wordlift' ),
-			'button' => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+			'title'  => __('WordLift Choose Logo', 'wordlift'),
+			'button' => array('text' => __('Choose Logo', 'wordlift')),
 		),
-	) );
+	));
 
 	// Finally print styles and scripts.
 	wp_print_styles();
@@ -51,56 +51,56 @@ 
 
 	<!-- Pane 1 content -->
 	<script type="text/html" id="page-0">
-		<h2 class="page-title"><?php esc_html_e( 'Welcome', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('Welcome', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift' ); ?>
+			<?php esc_html_e('Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift'); ?>
 		</p>
 		<ul class="page-list">
 			<li>
 				<span class="fa fa-university"></span>
-				<?php esc_html_e( 'Trustworthiness', 'wordlift' ); ?>
+				<?php esc_html_e('Trustworthiness', 'wordlift'); ?>
 			</li>
 
 			<li>
 				<span class="fa fa-map-marker"></span>
-				<?php esc_html_e( 'Enrichment', 'wordlift' ); ?>
+				<?php esc_html_e('Enrichment', 'wordlift'); ?>
 			</li>
 
 			<li>
 				<span class="fa fa-heart"></span>
-				<?php esc_html_e( 'Engagement', 'wordlift' ); ?>
+				<?php esc_html_e('Engagement', 'wordlift'); ?>
 			</li>
 
 			<li>
 				<span class="fa fa-hand-o-right"></span>
-				<?php esc_html_e( 'Smart Navigation', 'wordlift' ); ?>
+				<?php esc_html_e('Smart Navigation', 'wordlift'); ?>
 			</li>
 
 			<li>
 				<span class="fa fa-google"></span>
-				<?php esc_html_e( 'SEO Optimization', 'wordlift' ); ?>
+				<?php esc_html_e('SEO Optimization', 'wordlift'); ?>
 			</li>
 
 			<li>
 				<span class="fa fa-group"></span>
-				<?php esc_html_e( 'Content Marketing', 'wordlift' ); ?>
+				<?php esc_html_e('Content Marketing', 'wordlift'); ?>
 			</li>
 		</ul>
 		<div class="btn-wrapper">
 			<a href="https://wordlift.io/blogger/?utm_campaign=wl_activation_learn_more"
 			   target="_tab"
-			   class="button"><?php esc_html_e( 'Learn More', 'wordlift' ); ?></a>
+			   class="button"><?php esc_html_e('Learn More', 'wordlift'); ?></a>
 			<input type="button" data-wl-next="wl-next"
 			       class="wl-default-action"
-			       value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>">
+			       value="<?php esc_attr_e('Next', 'wordlift'); ?>">
 		</div>
 	</script>
 
 	<!-- Pane 2 content -->
 	<script type="text/html" id="page-1">
-		<h2 class="page-title"><?php esc_html_e( 'License Key', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('License Key', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'If you already puchased a plan, check your email, get the activation key from your inbox and insert it in the field below. Otherwise ....', 'wordlift' ); ?>
+			<?php esc_html_e('If you already puchased a plan, check your email, get the activation key from your inbox and insert it in the field below. Otherwise ....', 'wordlift'); ?>
 		</p>
 		<input type="text" data-wl-key="wl-key" class="invalid untouched"
 		       id="key" name="key" value=""
@@ -109,39 +109,39 @@ 
 			<a
 				href="https://wordlift.io/?utm_campaign=wl_activation_grab_the_key#plan-and-price"
 				target="_tab"
-				class="button"><?php esc_html_e( 'Grab a Key!', 'wordlift' ); ?></a><input
+				class="button"><?php esc_html_e('Grab a Key!', 'wordlift'); ?></a><input
 				type="button" data-wl-next="wl-next" class="wl-default-action"
-				value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>">
+				value="<?php esc_attr_e('Next', 'wordlift'); ?>">
 		</div>
 	</script>
 
 	<!-- Pane 3 content -->
 	<script type="text/html" id="page-2">
-		<h2 class="page-title"><?php esc_html_e( 'Vocabulary', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('Vocabulary', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift' ); ?>
+			<?php esc_html_e('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift'); ?>
 		</p>
 		<input type="text" id="vocabulary" name="vocabulary" autocomplete="off"
 		       value="vocabulary"
 		       class="valid untouched" data-wl-vocabulary="wl-vocabulary">
 		<p class="page-det">
-			<?php esc_html_e( 'Leave it empty to place your entities in the root folder of your website', 'wordlift' ); ?>
+			<?php esc_html_e('Leave it empty to place your entities in the root folder of your website', 'wordlift'); ?>
 		</p>
 		<div class="btn-wrapper">
 			<input type="button" data-wl-next="wl-next"
 			       class="wl-default-action"
-			       value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>">
+			       value="<?php esc_attr_e('Next', 'wordlift'); ?>">
 		</div>
 	</script>
 
 	<!-- Pane 4 content -->
 	<script type="text/html" id="page-3">
-		<h2 class="page-title"><?php esc_html_e( 'Language', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('Language', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'Each WordLift key can be used only in one language. Pick yours.', 'wordlift' ); ?>
+			<?php esc_html_e('Each WordLift key can be used only in one language. Pick yours.', 'wordlift'); ?>
 		</p>
 		<select id="language" name="language"
-		        placeholder="<?php esc_attr_e( 'Choose your language', 'wordlift' ); ?>">
+		        placeholder="<?php esc_attr_e('Choose your language', 'wordlift'); ?>">
 			<?php
 
 			// Get WordLift's supported languages.
@@ -151,30 +151,30 @@ 
 			$locale = get_locale();
 
 			// Get the language locale part.
-			$parts = explode( '_', $locale );
+			$parts = explode('_', $locale);
 
 			// If we support WP's configured language, then use that, otherwise use English by default.
-			$language = isset( $languages[ $parts[0] ] ) ? $parts[0] : 'en';
+			$language = isset($languages[$parts[0]]) ? $parts[0] : 'en';
 
 			// Print all the supported language, preselecting the one configured in WP (or English if not supported).
-			foreach ( $languages as $code => $label ) { ?>
+			foreach ($languages as $code => $label) { ?>
 				<option
-					value="<?php echo esc_attr( $code ) ?>" <?php echo selected( $code, $language, false ) ?>><?php echo esc_html( $label ) ?></option>
+					value="<?php echo esc_attr($code) ?>" <?php echo selected($code, $language, false) ?>><?php echo esc_html($label) ?></option>
 			<?php } ?>
 		</select>
 
 		<div class="btn-wrapper">
 			<input type="button" data-wl-next="wl-next"
 			       class="wl-default-action"
-			       value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>">
+			       value="<?php esc_attr_e('Next', 'wordlift'); ?>">
 		</div>
 	</script>
 
 	<!-- Pane 5 content -->
 	<script type="text/html" id="page-4">
-		<h2 class="page-title"><?php esc_html_e( 'Publisher', 'wordlift' ); ?></h2>
+		<h2 class="page-title"><?php esc_html_e('Publisher', 'wordlift'); ?></h2>
 		<p class="page-txt">
-			<?php esc_html_e( 'Are you going to publish as an individual or as a company?', 'wordlift' ); ?>
+			<?php esc_html_e('Are you going to publish as an individual or as a company?', 'wordlift'); ?>
 		</p>
 		<div class="radio-wrapper">
 			<label for="personal">
@@ -182,20 +182,20 @@ 
 				       value="person" checked>
 				<span class="radio"><span class="check"></span></span>
 				<span
-					class="label"><?php esc_html_e( 'Personal', 'wordlift' ); ?></span>
+					class="label"><?php esc_html_e('Personal', 'wordlift'); ?></span>
 			</label>
 			<label for="company">
 				<input id="company" type="radio" name="user_type"
 				       value="organization">
 				<span class="radio"><span class="check"></span></span>
 				<span
-					class="label"><?php esc_html_e( 'Company', 'wordlift' ); ?></span>
+					class="label"><?php esc_html_e('Company', 'wordlift'); ?></span>
 			</label>
 		</div>
 		<input type="text" id="name" name="name" data-wl-name="wl-name" value=""
 		       autocomplete="off"
 		       class="untouched invalid"
-		       placeholder="<?php esc_attr_e( "What's your name?", 'wordlift' ); ?>">
+		       placeholder="<?php esc_attr_e("What's your name?", 'wordlift'); ?>">
 
 		<div data-wl-logo="wl-logo">
 			<input type="hidden" name="logo" />
@@ -205,12 +205,12 @@ 
 			</div>
 			<a data-wl-add-logo="wl-add-logo" class="add-logo"
 			   href="javascript:void(0);">
-				<?php esc_html_e( 'Add your logo', 'wordlift' ); ?>
+				<?php esc_html_e('Add your logo', 'wordlift'); ?>
 			</a>
 		</div>
 		<div class="btn-wrapper">
 			<input type="submit" id="btn-finish" class="wl-default-action"
-			       value="<?php esc_attr_e( 'Finish', 'wordlift' ); ?>">
+			       value="<?php esc_attr_e('Finish', 'wordlift'); ?>">
 		</div>
 	</script>
 
@@ -219,25 +219,25 @@ 
 
 <div class="wl-container">
 
-	<a href="<?php echo esc_url( admin_url() ); ?> "
+	<a href="<?php echo esc_url(admin_url()); ?> "
 	   class="fa fa-times wl-close"></a>
 
 	<header>
 		<h1><strong>Word</strong>Lift</h1>
 		<img
-			src="<?php echo plugin_dir_url( dirname( dirname( __FILE__ ) ) ) . 'images/shapes.png'; ?>" />
+			src="<?php echo plugin_dir_url(dirname(dirname(__FILE__))).'images/shapes.png'; ?>" />
 	</header>
 
 
 	<form method="post">
-		<?php wp_nonce_field( 'wl-save-configuration' ); ?>
+		<?php wp_nonce_field('wl-save-configuration'); ?>
 		<input type="hidden" name="action" value="wl-save-configuration" />
 		<div class="viewport"></div>
 	</form>
 
 </div>
 
-<?php do_action( 'admin_footer' ); ?>
+<?php do_action('admin_footer'); ?>
 
 </body>
 </html>

src/includes/class-wordlift-user-service.php

Doc Comments +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
 	 *
 	 * @param int $user_id The {@link WP_User} `id`.
 	 *
-	 * @return int bool True if editing is denied otherwise false.
+	 * @return boolean bool True if editing is denied otherwise false.
 	 */
 	public function is_deny_editor_entity_create( $user_id ) {
 

Indentation +424 added lines, -424 removed lines

@@ -10,436 +10,436 @@
  */
 class Wordlift_User_Service {
 
-	/**
-	 * The meta key where the user's URI is stored.
-	 *
-	 * @since 3.1.7
-	 */
-	const URI_META_KEY = '_wl_uri';
-
-	/**
-	 * The user meta key where the deny entity edit flag is stored.
-	 *
-	 * @since 3.14.0
-	 */
-	const DENY_ENTITY_CREATE_META_KEY = '_wl_deny_entity_create';
-
-	/**
-	 * The meta key holding the entity id representing a {@link WP_User}.
-	 *
-	 * @since 3.14.0
-	 */
-	const ENTITY_META_KEY = '_wl_entity';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * The singleton instance of the User service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of the User service.
-	 *
-	 * @since 3.1.7
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
-
-		self::$instance = $this;
-
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
-	}
-
-	/**
-	 * Get the singleton instance of the User service.
-	 *
-	 * @since 3.1.7
-	 * @return \Wordlift_User_Service The singleton instance of the User service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	public function get_uri( $user_id ) {
-
-		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
-			return $user_uri;
-		}
-
-		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
-
-		return $user_uri;
-	}
-
-	/**
-	 * Receives wp_insert_post events.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int     $post_id Post ID.
-	 * @param WP_Post $post    Post object.
-	 * @param bool    $update  Whether this is an existing post being updated or not.
-	 */
-	public function wp_insert_post( $post_id, $post, $update ) {
-
-		// If the post is not published, return.
-		if ( 'publish' !== get_post_status( $post_id ) ) {
-			return;
-		}
-
-		// We expect a numeric author id.
-		if ( ! is_numeric( $post->post_author ) ) {
-			return;
-		}
-
-		// Get the delete query,or return in case of failure.
-		if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
-			return;
-		}
-
-		// Get the insert query,or return in case of failure.
-		if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
-			return;
-		}
-
-		// Send the query to the triple store.
-		rl_execute_sparql_update_query( $delete . $insert );
-
-	}
-
-	/**
-	 * Set the `id` of the entity representing a {@link WP_User}.
-	 *
-	 * If the `id` is set to 0 (or less) then the meta is deleted.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User}.
-	 * @param int $value   The entity {@link WP_Post} `id`.
-	 *
-	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
-	 */
-	public function set_entity( $user_id, $value ) {
-
-		return 0 < $value
-			? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
-			: delete_user_meta( $user_id, self::ENTITY_META_KEY );
-	}
-
-	/**
-	 * Get the {@link WP_Post} `id` of the entity representing a {@link WP_User}.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User}'s `id`.
-	 *
-	 * @return string The entity {@link WP_Post} `id` or an empty string if not set.
-	 */
-	public function get_entity( $user_id ) {
-
-		return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
-	}
-
-	/**
-	 * Get the user's URI stored in the user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The user's URI or false if not found.
-	 */
-	private function _get_uri( $user_id ) {
-
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
-
-		if ( empty( $user_uri ) ) {
-			return false;
-		}
-
-		return $user_uri;
-	}
-
-	/**
-	 * Build an URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user's id.
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	private function _build_uri( $user_id ) {
-
-		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
-			return false;
-		}
-
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
-	}
-
-	/**
-	 * Store the URI in user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int    $user_id  The user's id.
-	 * @param string $user_uri The user's uri.
-	 *
-	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
-	 */
-	private function _set_uri( $user_id, $user_uri ) {
-
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
-	}
-
-	/**
-	 * Get the delete query.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The delete query or false in case of failure.
-	 */
-	private function get_delete_query( $user_id ) {
-
-		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Build the delete query.
-		$query = Wordlift_Query_Builder::new_instance()->delete()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
-		                               ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
-		                                 ->build();
-
-		return $query;
-	}
-
-	/**
-	 * Get the insert query.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The insert query or false in case of failure.
-	 */
-	private function get_insert_query( $user_id ) {
-
-		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Try to get the user data, in case of failure return false.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// Build the insert query.
-		$query = Wordlift_Query_Builder::new_instance()
-		                               ->insert()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
-		                               ->build();
-
-		return $query;
-	}
-
-	/**
-	 * Mark an editor user as denied from editing entities.
-	 * Does nothing if the user is not an editor
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $user_id The ID of the user
-	 */
-	public function deny_editor_entity_create( $user_id ) {
-
-		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return;
-		}
-
-		// The user explicitly do not have the capability.
-		update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
-
-	}
-
-	/**
-	 * Remove the "deny entity editing" mark from an editor user.
-	 * Does nothing if the user is not an editor
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $user_id The ID of the user
-	 */
-	public function allow_editor_entity_create( $user_id ) {
-
-		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return;
-		}
-
-		// The user explicitly do not have the capability.
-		delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
-
-	}
-
-	/**
-	 * Get whether the 'deny editor entity editing' flag is set.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return int bool True if editing is denied otherwise false.
-	 */
-	public function is_deny_editor_entity_create( $user_id ) {
-
-		return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
-	}
-
-	/**
-	 * Check whether the {@link WP_User} with the specified `id` is an editor,
-	 * i.e. has the `editor` role.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return bool True if the {@link WP_User} is an editor otherwise false.
-	 */
-	public function is_editor( $user_id ) {
-
-		// Get the user.
-		$user = get_user_by( 'id', $user_id );
-
-		// Return true, if the user is found and has the `editor` role.
-		return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles );
-	}
-
-	/**
-	 * Check if an editor can create entities.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The user id of the user being checked.
-	 *
-	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
-	 */
-	public function editor_can_create_entities( $user_id ) {
-
-		// Return true if not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return true;
-		}
-
-		// Check if the user explicitly denied.
-		return ! $this->is_deny_editor_entity_create( $user_id );
-	}
-
-	/**
-	 * Filter capabilities of user.
-	 *
-	 * Deny the capability of managing and editing entities for some users.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param array $allcaps All the capabilities of the user
-	 * @param array $cap     [0] Required capability
-	 * @param array $args    [0] Requested capability
-	 *                       [1] User ID
-	 *                       [2] Associated object ID
-	 *
-	 * @return array The capabilities array.
-	 */
-	public function has_cap( $allcaps, $cap, $args ) {
-		/*
+    /**
+     * The meta key where the user's URI is stored.
+     *
+     * @since 3.1.7
+     */
+    const URI_META_KEY = '_wl_uri';
+
+    /**
+     * The user meta key where the deny entity edit flag is stored.
+     *
+     * @since 3.14.0
+     */
+    const DENY_ENTITY_CREATE_META_KEY = '_wl_deny_entity_create';
+
+    /**
+     * The meta key holding the entity id representing a {@link WP_User}.
+     *
+     * @since 3.14.0
+     */
+    const ENTITY_META_KEY = '_wl_entity';
+
+    /**
+     * The Log service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * The singleton instance of the User service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of the User service.
+     *
+     * @since 3.1.7
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+
+        self::$instance = $this;
+
+        add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+    }
+
+    /**
+     * Get the singleton instance of the User service.
+     *
+     * @since 3.1.7
+     * @return \Wordlift_User_Service The singleton instance of the User service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    public function get_uri( $user_id ) {
+
+        // Try to get the URI stored in the user's meta and return it if available.
+        if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+            return $user_uri;
+        }
+
+        // Try to build an URI, return false in case of failure.
+        if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Store the URI for future requests (we need a "permanent" URI).
+        $this->_set_uri( $user_id, $user_uri );
+
+        return $user_uri;
+    }
+
+    /**
+     * Receives wp_insert_post events.
+     *
+     * @since 3.1.7
+     *
+     * @param int     $post_id Post ID.
+     * @param WP_Post $post    Post object.
+     * @param bool    $update  Whether this is an existing post being updated or not.
+     */
+    public function wp_insert_post( $post_id, $post, $update ) {
+
+        // If the post is not published, return.
+        if ( 'publish' !== get_post_status( $post_id ) ) {
+            return;
+        }
+
+        // We expect a numeric author id.
+        if ( ! is_numeric( $post->post_author ) ) {
+            return;
+        }
+
+        // Get the delete query,or return in case of failure.
+        if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
+            return;
+        }
+
+        // Get the insert query,or return in case of failure.
+        if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
+            return;
+        }
+
+        // Send the query to the triple store.
+        rl_execute_sparql_update_query( $delete . $insert );
+
+    }
+
+    /**
+     * Set the `id` of the entity representing a {@link WP_User}.
+     *
+     * If the `id` is set to 0 (or less) then the meta is deleted.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User}.
+     * @param int $value   The entity {@link WP_Post} `id`.
+     *
+     * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
+     */
+    public function set_entity( $user_id, $value ) {
+
+        return 0 < $value
+            ? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
+            : delete_user_meta( $user_id, self::ENTITY_META_KEY );
+    }
+
+    /**
+     * Get the {@link WP_Post} `id` of the entity representing a {@link WP_User}.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User}'s `id`.
+     *
+     * @return string The entity {@link WP_Post} `id` or an empty string if not set.
+     */
+    public function get_entity( $user_id ) {
+
+        return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
+    }
+
+    /**
+     * Get the user's URI stored in the user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The user's URI or false if not found.
+     */
+    private function _get_uri( $user_id ) {
+
+        $user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+
+        if ( empty( $user_uri ) ) {
+            return false;
+        }
+
+        return $user_uri;
+    }
+
+    /**
+     * Build an URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user's id.
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    private function _build_uri( $user_id ) {
+
+        // Get the user, return false in case of failure.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // If the nicename is not set, return a failure.
+        if ( empty( $user->user_nicename ) ) {
+            return false;
+        }
+
+        return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+    }
+
+    /**
+     * Store the URI in user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @param int    $user_id  The user's id.
+     * @param string $user_uri The user's uri.
+     *
+     * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
+     */
+    private function _set_uri( $user_id, $user_uri ) {
+
+        return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+    }
+
+    /**
+     * Get the delete query.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The delete query or false in case of failure.
+     */
+    private function get_delete_query( $user_id ) {
+
+        // Get the URI, return if there's none.
+        if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Build the delete query.
+        $query = Wordlift_Query_Builder::new_instance()->delete()
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+                                        ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+                                            ->build();
+
+        return $query;
+    }
+
+    /**
+     * Get the insert query.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The insert query or false in case of failure.
+     */
+    private function get_insert_query( $user_id ) {
+
+        // Get the URI, return if there's none.
+        if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Try to get the user data, in case of failure return false.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // Build the insert query.
+        $query = Wordlift_Query_Builder::new_instance()
+                                        ->insert()
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
+                                        ->build();
+
+        return $query;
+    }
+
+    /**
+     * Mark an editor user as denied from editing entities.
+     * Does nothing if the user is not an editor
+     *
+     * @since 3.14.0
+     *
+     * @param integer $user_id The ID of the user
+     */
+    public function deny_editor_entity_create( $user_id ) {
+
+        // Bail out if the user is not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return;
+        }
+
+        // The user explicitly do not have the capability.
+        update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
+
+    }
+
+    /**
+     * Remove the "deny entity editing" mark from an editor user.
+     * Does nothing if the user is not an editor
+     *
+     * @since 3.14.0
+     *
+     * @param integer $user_id The ID of the user
+     */
+    public function allow_editor_entity_create( $user_id ) {
+
+        // Bail out if the user is not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return;
+        }
+
+        // The user explicitly do not have the capability.
+        delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
+
+    }
+
+    /**
+     * Get whether the 'deny editor entity editing' flag is set.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return int bool True if editing is denied otherwise false.
+     */
+    public function is_deny_editor_entity_create( $user_id ) {
+
+        return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
+    }
+
+    /**
+     * Check whether the {@link WP_User} with the specified `id` is an editor,
+     * i.e. has the `editor` role.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return bool True if the {@link WP_User} is an editor otherwise false.
+     */
+    public function is_editor( $user_id ) {
+
+        // Get the user.
+        $user = get_user_by( 'id', $user_id );
+
+        // Return true, if the user is found and has the `editor` role.
+        return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles );
+    }
+
+    /**
+     * Check if an editor can create entities.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The user id of the user being checked.
+     *
+     * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
+     */
+    public function editor_can_create_entities( $user_id ) {
+
+        // Return true if not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return true;
+        }
+
+        // Check if the user explicitly denied.
+        return ! $this->is_deny_editor_entity_create( $user_id );
+    }
+
+    /**
+     * Filter capabilities of user.
+     *
+     * Deny the capability of managing and editing entities for some users.
+     *
+     * @since 3.14.0
+     *
+     * @param array $allcaps All the capabilities of the user
+     * @param array $cap     [0] Required capability
+     * @param array $args    [0] Requested capability
+     *                       [1] User ID
+     *                       [2] Associated object ID
+     *
+     * @return array The capabilities array.
+     */
+    public function has_cap( $allcaps, $cap, $args ) {
+        /*
 		 * For entity management/editing related capabilities
 		 * check that an editor was not explicitly denied (in user profile)
 		 * the capability.
 		 */
 
-		/*
+        /*
 		 * Need protection against the case of edit_user and likes which do not
 		 * require a capability, just request one.
 		 */
-		if ( empty( $cap ) ) {
-			return $allcaps;
-		}
-		if (
-			( 'edit_wordlift_entity' == $cap[0] ) ||
-			( 'edit_wordlift_entities' == $cap[0] ) ||
-			( 'edit_others_wordlift_entities' == $cap[0] ) ||
-			( 'publish_wordlift_entities' == $cap[0] ) ||
-			( 'read_private_wordlift_entities' == $cap[0] ) ||
-			( 'delete_wordlift_entity' == $cap[0] ) ||
-			( 'delete_wordlift_entities' == $cap[0] ) ||
-			( 'delete_others_wordlift_entities' == $cap[0] ) ||
-			( 'delete_published_wordlift_entities' == $cap[0] ) ||
-			( 'delete_private_wordlift_entities' == $cap[0] )
-		) {
-			$user_id = $args[1];
-
-			if ( ! $this->editor_can_create_entities( $user_id ) ) {
-				$allcaps[ $cap[0] ] = false;
-			}
-		}
-
-		return $allcaps;
-	}
+        if ( empty( $cap ) ) {
+            return $allcaps;
+        }
+        if (
+            ( 'edit_wordlift_entity' == $cap[0] ) ||
+            ( 'edit_wordlift_entities' == $cap[0] ) ||
+            ( 'edit_others_wordlift_entities' == $cap[0] ) ||
+            ( 'publish_wordlift_entities' == $cap[0] ) ||
+            ( 'read_private_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_wordlift_entity' == $cap[0] ) ||
+            ( 'delete_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_others_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_published_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_private_wordlift_entities' == $cap[0] )
+        ) {
+            $user_id = $args[1];
+
+            if ( ! $this->editor_can_create_entities( $user_id ) ) {
+                $allcaps[ $cap[0] ] = false;
+            }
+        }
+
+        return $allcaps;
+    }
 }

Spacing +69 added lines, -69 removed lines

@@ -56,11 +56,11 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_User_Service');
 
 		self::$instance = $this;
 
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+		add_filter('user_has_cap', array($this, 'has_cap'), 10, 3);
 	}
 
 	/**
@@ -83,20 +83,20 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	public function get_uri( $user_id ) {
+	public function get_uri($user_id) {
 
 		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+		if (false !== ($user_uri = $this->_get_uri($user_id))) {
 			return $user_uri;
 		}
 
 		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->_build_uri($user_id))) {
 			return false;
 		}
 
 		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
+		$this->_set_uri($user_id, $user_uri);
 
 		return $user_uri;
 	}
@@ -110,30 +110,30 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	public function wp_insert_post( $post_id, $post, $update ) {
+	public function wp_insert_post($post_id, $post, $update) {
 
 		// If the post is not published, return.
-		if ( 'publish' !== get_post_status( $post_id ) ) {
+		if ('publish' !== get_post_status($post_id)) {
 			return;
 		}
 
 		// We expect a numeric author id.
-		if ( ! is_numeric( $post->post_author ) ) {
+		if ( ! is_numeric($post->post_author)) {
 			return;
 		}
 
 		// Get the delete query,or return in case of failure.
-		if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
+		if (false === ($delete = $this->get_delete_query($post->post_author))) {
 			return;
 		}
 
 		// Get the insert query,or return in case of failure.
-		if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
+		if (false === ($insert = $this->get_insert_query($post->post_author))) {
 			return;
 		}
 
 		// Send the query to the triple store.
-		rl_execute_sparql_update_query( $delete . $insert );
+		rl_execute_sparql_update_query($delete.$insert);
 
 	}
 
@@ -149,11 +149,11 @@ 
 	 *
 	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	public function set_entity( $user_id, $value ) {
+	public function set_entity($user_id, $value) {
 
 		return 0 < $value
-			? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
-			: delete_user_meta( $user_id, self::ENTITY_META_KEY );
+			? update_user_meta($user_id, self::ENTITY_META_KEY, $value)
+			: delete_user_meta($user_id, self::ENTITY_META_KEY);
 	}
 
 	/**
@@ -165,9 +165,9 @@ 
 	 *
 	 * @return string The entity {@link WP_Post} `id` or an empty string if not set.
 	 */
-	public function get_entity( $user_id ) {
+	public function get_entity($user_id) {
 
-		return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
+		return get_user_meta($user_id, self::ENTITY_META_KEY, true);
 	}
 
 	/**
@@ -179,11 +179,11 @@ 
 	 *
 	 * @return false|string The user's URI or false if not found.
 	 */
-	private function _get_uri( $user_id ) {
+	private function _get_uri($user_id) {
 
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+		$user_uri = get_user_meta($user_id, self::URI_META_KEY, true);
 
-		if ( empty( $user_uri ) ) {
+		if (empty($user_uri)) {
 			return false;
 		}
 
@@ -199,19 +199,19 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	private function _build_uri( $user_id ) {
+	private function _build_uri($user_id) {
 
 		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
+		if (empty($user->user_nicename)) {
 			return false;
 		}
 
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+		return wl_configuration_get_redlink_dataset_uri()."/user/$user->user_nicename";
 	}
 
 	/**
@@ -224,9 +224,9 @@ 
 	 *
 	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	private function _set_uri( $user_id, $user_uri ) {
+	private function _set_uri($user_id, $user_uri) {
 
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+		return update_user_meta($user_id, self::URI_META_KEY, $user_uri);
 	}
 
 	/**
@@ -238,28 +238,28 @@ 
 	 *
 	 * @return false|string The delete query or false in case of failure.
 	 */
-	private function get_delete_query( $user_id ) {
+	private function get_delete_query($user_id) {
 
 		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->get_uri($user_id))) {
 			return false;
 		}
 
 		// Build the delete query.
 		$query = Wordlift_Query_Builder::new_instance()->delete()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o')
 		                               ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o')
 		                                 ->build();
 
 		return $query;
@@ -274,26 +274,26 @@ 
 	 *
 	 * @return false|string The insert query or false in case of failure.
 	 */
-	private function get_insert_query( $user_id ) {
+	private function get_insert_query($user_id) {
 
 		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->get_uri($user_id))) {
 			return false;
 		}
 
 		// Try to get the user data, in case of failure return false.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// Build the insert query.
 		$query = Wordlift_Query_Builder::new_instance()
 		                               ->insert()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI)
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty($user->user_url) ? $user->user_url : get_author_posts_url($user_id)))
 		                               ->build();
 
 		return $query;
@@ -307,15 +307,15 @@ 
 	 *
 	 * @param integer $user_id The ID of the user
 	 */
-	public function deny_editor_entity_create( $user_id ) {
+	public function deny_editor_entity_create($user_id) {
 
 		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return;
 		}
 
 		// The user explicitly do not have the capability.
-		update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
+		update_user_option($user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes');
 
 	}
 
@@ -327,15 +327,15 @@ 
 	 *
 	 * @param integer $user_id The ID of the user
 	 */
-	public function allow_editor_entity_create( $user_id ) {
+	public function allow_editor_entity_create($user_id) {
 
 		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return;
 		}
 
 		// The user explicitly do not have the capability.
-		delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
+		delete_user_option($user_id, self::DENY_ENTITY_CREATE_META_KEY);
 
 	}
 
@@ -348,9 +348,9 @@ 
 	 *
 	 * @return int bool True if editing is denied otherwise false.
 	 */
-	public function is_deny_editor_entity_create( $user_id ) {
+	public function is_deny_editor_entity_create($user_id) {
 
-		return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
+		return 'yes' === get_user_option(self::DENY_ENTITY_CREATE_META_KEY, $user_id);
 	}
 
 	/**
@@ -363,13 +363,13 @@ 
 	 *
 	 * @return bool True if the {@link WP_User} is an editor otherwise false.
 	 */
-	public function is_editor( $user_id ) {
+	public function is_editor($user_id) {
 
 		// Get the user.
-		$user = get_user_by( 'id', $user_id );
+		$user = get_user_by('id', $user_id);
 
 		// Return true, if the user is found and has the `editor` role.
-		return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles );
+		return is_a($user, 'WP_User') && in_array('editor', (array) $user->roles);
 	}
 
 	/**
@@ -381,15 +381,15 @@ 
 	 *
 	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
 	 */
-	public function editor_can_create_entities( $user_id ) {
+	public function editor_can_create_entities($user_id) {
 
 		// Return true if not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return true;
 		}
 
 		// Check if the user explicitly denied.
-		return ! $this->is_deny_editor_entity_create( $user_id );
+		return ! $this->is_deny_editor_entity_create($user_id);
 	}
 
 	/**
@@ -407,7 +407,7 @@ 
 	 *
 	 * @return array The capabilities array.
 	 */
-	public function has_cap( $allcaps, $cap, $args ) {
+	public function has_cap($allcaps, $cap, $args) {
 		/*
 		 * For entity management/editing related capabilities
 		 * check that an editor was not explicitly denied (in user profile)
@@ -418,25 +418,25 @@ 
 		 * Need protection against the case of edit_user and likes which do not
 		 * require a capability, just request one.
 		 */
-		if ( empty( $cap ) ) {
+		if (empty($cap)) {
 			return $allcaps;
 		}
 		if (
-			( 'edit_wordlift_entity' == $cap[0] ) ||
-			( 'edit_wordlift_entities' == $cap[0] ) ||
-			( 'edit_others_wordlift_entities' == $cap[0] ) ||
-			( 'publish_wordlift_entities' == $cap[0] ) ||
-			( 'read_private_wordlift_entities' == $cap[0] ) ||
-			( 'delete_wordlift_entity' == $cap[0] ) ||
-			( 'delete_wordlift_entities' == $cap[0] ) ||
-			( 'delete_others_wordlift_entities' == $cap[0] ) ||
-			( 'delete_published_wordlift_entities' == $cap[0] ) ||
-			( 'delete_private_wordlift_entities' == $cap[0] )
+			('edit_wordlift_entity' == $cap[0]) ||
+			('edit_wordlift_entities' == $cap[0]) ||
+			('edit_others_wordlift_entities' == $cap[0]) ||
+			('publish_wordlift_entities' == $cap[0]) ||
+			('read_private_wordlift_entities' == $cap[0]) ||
+			('delete_wordlift_entity' == $cap[0]) ||
+			('delete_wordlift_entities' == $cap[0]) ||
+			('delete_others_wordlift_entities' == $cap[0]) ||
+			('delete_published_wordlift_entities' == $cap[0]) ||
+			('delete_private_wordlift_entities' == $cap[0])
 		) {
 			$user_id = $args[1];
 
-			if ( ! $this->editor_can_create_entities( $user_id ) ) {
-				$allcaps[ $cap[0] ] = false;
+			if ( ! $this->editor_can_create_entities($user_id)) {
+				$allcaps[$cap[0]] = false;
 			}
 		}
 

src/modules/core/wordlift_core_constants.php

Spacing +21 added lines, -21 removed lines

@@ -1,54 +1,54 @@
 <?php
 
-define( 'WL_DEFAULT_THUMBNAIL_PATH', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/public/images/missing-image-150x150.png' );
-define( 'WL_DEFAULT_PATH', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/' );
+define('WL_DEFAULT_THUMBNAIL_PATH', dirname(dirname(plugin_dir_url(__FILE__))).'/public/images/missing-image-150x150.png');
+define('WL_DEFAULT_PATH', dirname(dirname(plugin_dir_url(__FILE__))).'/');
 
 // Database version
-define( 'WL_DB_VERSION', '3.14' );
+define('WL_DB_VERSION', '3.14');
 // Custom table name
-define( 'WL_DB_RELATION_INSTANCES_TABLE_NAME', 'wl_relation_instances' );
+define('WL_DB_RELATION_INSTANCES_TABLE_NAME', 'wl_relation_instances');
 
-define( 'WL_WHAT_RELATION', 'what' );
-define( 'WL_WHO_RELATION', 'who' );
-define( 'WL_WHERE_RELATION', 'where' );
-define( 'WL_WHEN_RELATION', 'when' );
+define('WL_WHAT_RELATION', 'what');
+define('WL_WHO_RELATION', 'who');
+define('WL_WHERE_RELATION', 'where');
+define('WL_WHEN_RELATION', 'when');
 
 // Mapping options / validations rules used by wl_core_get_posts to perform validation on args
 // The array is serialized because array constants are only from php 5.6 on.
-define( 'WL_CORE_GET_POSTS_VALIDATION_RULES', serialize( array(
-	'get'            => array( 'posts', 'post_ids' ),
-	'as'             => array( 'object', 'subject' ),
-	'post_type'      => array( 'post', 'entity' ),
-	'post_status'    => array( 'draft', 'trash', 'publish' ),
-	'with_predicate' => array( WL_WHAT_RELATION, WL_WHEN_RELATION, WL_WHERE_RELATION, WL_WHO_RELATION ),
-) ) );
+define('WL_CORE_GET_POSTS_VALIDATION_RULES', serialize(array(
+	'get'            => array('posts', 'post_ids'),
+	'as'             => array('object', 'subject'),
+	'post_type'      => array('post', 'entity'),
+	'post_status'    => array('draft', 'trash', 'publish'),
+	'with_predicate' => array(WL_WHAT_RELATION, WL_WHEN_RELATION, WL_WHERE_RELATION, WL_WHO_RELATION),
+)));
 
 // Classification boxes configuration for angularjs edit-post widget
 // The array is serialized because array constants are only from php 5.6 on.
 
-define( 'WL_CORE_POST_CLASSIFICATION_BOXES', serialize( array(
+define('WL_CORE_POST_CLASSIFICATION_BOXES', serialize(array(
 	array(
 		'id'               => WL_WHAT_RELATION,
 		'label'            => 'What',
-		'registeredTypes'  => array( 'thing', 'creative-work' ),
+		'registeredTypes'  => array('thing', 'creative-work'),
 		'selectedEntities' => array(),
 	),
 	array(
 		'id'               => WL_WHO_RELATION,
 		'label'            => 'Who',
-		'registeredTypes'  => array( 'organization', 'person', 'local-business' ),
+		'registeredTypes'  => array('organization', 'person', 'local-business'),
 		'selectedEntities' => array(),
 	),
 	array(
 		'id'               => WL_WHERE_RELATION,
 		'label'            => 'Where',
-		'registeredTypes'  => array( 'place' ),
+		'registeredTypes'  => array('place'),
 		'selectedEntities' => array(),
 	),
 	array(
 		'id'               => WL_WHEN_RELATION,
 		'label'            => 'When',
-		'registeredTypes'  => array( 'event' ),
+		'registeredTypes'  => array('event'),
 		'selectedEntities' => array(),
 	),
-) ) );
+)));

src/admin/class-wordlift-admin-user-profile-page.php

Indentation +119 added lines, -119 removed lines

@@ -18,75 +18,75 @@ 
  */
 class Wordlift_Admin_User_Profile_Page {
 
-	/**
-	 * The {@link Wordlift_Admin_Person_Element} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Admin_Author_Element $plugin The person entity
-	 *                selection element rendering the possible persons.
-	 */
-	private $author_element;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Create the {@link Wordlift_Admin_User_Profile_Page} instance.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param \Wordlift_Admin_Author_Element $author_element The person entity selection
-	 *                                                       element rendering the possible persons.
-	 * @param \Wordlift_User_Service         $user_service   The {@link Wordlift_User_Service} instance.
-	 */
-	function __construct( $author_element, $user_service ) {
-
-		$this->author_element = $author_element;
-		$this->user_service   = $user_service;
-
-		/*
+    /**
+     * The {@link Wordlift_Admin_Person_Element} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Admin_Author_Element $plugin The person entity
+     *                selection element rendering the possible persons.
+     */
+    private $author_element;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Create the {@link Wordlift_Admin_User_Profile_Page} instance.
+     *
+     * @since 3.14.0
+     *
+     * @param \Wordlift_Admin_Author_Element $author_element The person entity selection
+     *                                                       element rendering the possible persons.
+     * @param \Wordlift_User_Service         $user_service   The {@link Wordlift_User_Service} instance.
+     */
+    function __construct( $author_element, $user_service ) {
+
+        $this->author_element = $author_element;
+        $this->user_service   = $user_service;
+
+        /*
 		 * When an admin (or similar permissions) edits his own profile a
 		 * different action than the usual is being triggered.
 		 * It is too early in the wordpress boot to do user capabilities filtering
 		 * here and it is deferred to the handler.
 		 */
-		add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile_update', array(
-			$this,
-			'edit_user_profile_update',
-		) );
-		add_action( 'personal_options_update', array(
-			$this,
-			'edit_user_profile_update',
-		) );
-
-	}
-
-	/**
-	 * Add a WordLift section in the user profile which lets
-	 * the admin to associate a wordpress user with a person entity.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param WP_User $user The current WP_User object of the user being edited.
-	 */
-	public function edit_user_profile( $user ) {
-
-		// In case it is a user editing his own profile, make sure he has admin
-		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
-			return;
-		}
-
-		?>
+        add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) );
+        add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) );
+        add_action( 'edit_user_profile_update', array(
+            $this,
+            'edit_user_profile_update',
+        ) );
+        add_action( 'personal_options_update', array(
+            $this,
+            'edit_user_profile_update',
+        ) );
+
+    }
+
+    /**
+     * Add a WordLift section in the user profile which lets
+     * the admin to associate a wordpress user with a person entity.
+     *
+     * @since 3.14.0
+     *
+     * @param WP_User $user The current WP_User object of the user being edited.
+     */
+    public function edit_user_profile( $user ) {
+
+        // In case it is a user editing his own profile, make sure he has admin
+        // like capabilities.
+        if ( ! current_user_can( 'edit_users' ) ) {
+            return;
+        }
+
+        ?>
 		<h2><?php esc_html_e( 'WordLift', 'wordlift' ); ?></h2>
 
 		<table class="form-table">
@@ -96,12 +96,12 @@ 
 				</th>
 				<td>
 					<?php
-					$this->author_element->render( array(
-						'id'             => 'wl_person',
-						'name'           => 'wl_person',
-						'current_entity' => $this->user_service->get_entity( $user->ID ),
-					) );
-					?>
+                    $this->author_element->render( array(
+                        'id'             => 'wl_person',
+                        'name'           => 'wl_person',
+                        'current_entity' => $this->user_service->get_entity( $user->ID ),
+                    ) );
+                    ?>
 					<p class="description"><?php _e( 'The entity, person or organization, from the vocabulary to associate with this author.', 'wordlift' ); ?></p>
 				</td>
 			</tr>
@@ -119,54 +119,54 @@ 
 				<?php } ?>
 		</table>
 		<?php
-	}
-
-	/**
-	 * Handle storing the person entity associated with the user.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The user id of the user being saved.
-	 */
-	public function edit_user_profile_update( $user_id ) {
-
-		// In case it is a user editing his own profile, make sure he has admin
-		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
-			return;
-		}
-
-		// Link an entity to the user.
-		$this->link_entity( $user_id, $_POST );
-
-		// Deny and enable the edit entity capability
-		if ( isset( $_POST['wl_can_create_entities'] ) ) {
-			// User has capability so remove the deny indication if present.
-			$this->user_service->allow_editor_entity_create( $user_id );
-		} else {
-			$this->user_service->deny_editor_entity_create( $user_id );
-		}
-
-	}
-
-	/**
-	 * Link an entity (specified in the `$_POST` array) to the {@link WP_User}
-	 * with the specified `id`.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int   $user_id The {@link WP_User} `id`.
-	 * @param array $post    The `$_POST` array.
-	 */
-	private function link_entity( $user_id, $post ) {
-
-		// Bail out if the `wl_person` parameter isn't set.
-		if ( ! isset( $post['wl_person'] ) || ! is_numeric( $post['wl_person'] ) ) {
-			return;
-		}
-
-		$this->user_service->set_entity( $user_id, intval( $post['wl_person'] ) );
-
-	}
+    }
+
+    /**
+     * Handle storing the person entity associated with the user.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The user id of the user being saved.
+     */
+    public function edit_user_profile_update( $user_id ) {
+
+        // In case it is a user editing his own profile, make sure he has admin
+        // like capabilities.
+        if ( ! current_user_can( 'edit_users' ) ) {
+            return;
+        }
+
+        // Link an entity to the user.
+        $this->link_entity( $user_id, $_POST );
+
+        // Deny and enable the edit entity capability
+        if ( isset( $_POST['wl_can_create_entities'] ) ) {
+            // User has capability so remove the deny indication if present.
+            $this->user_service->allow_editor_entity_create( $user_id );
+        } else {
+            $this->user_service->deny_editor_entity_create( $user_id );
+        }
+
+    }
+
+    /**
+     * Link an entity (specified in the `$_POST` array) to the {@link WP_User}
+     * with the specified `id`.
+     *
+     * @since 3.14.0
+     *
+     * @param int   $user_id The {@link WP_User} `id`.
+     * @param array $post    The `$_POST` array.
+     */
+    private function link_entity( $user_id, $post ) {
+
+        // Bail out if the `wl_person` parameter isn't set.
+        if ( ! isset( $post['wl_person'] ) || ! is_numeric( $post['wl_person'] ) ) {
+            return;
+        }
+
+        $this->user_service->set_entity( $user_id, intval( $post['wl_person'] ) );
+
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -46,7 +46,7 @@ 
 	 *                                                       element rendering the possible persons.
 	 * @param \Wordlift_User_Service         $user_service   The {@link Wordlift_User_Service} instance.
 	 */
-	function __construct( $author_element, $user_service ) {
+	function __construct($author_element, $user_service) {
 
 		$this->author_element = $author_element;
 		$this->user_service   = $user_service;
@@ -57,16 +57,16 @@ 
 		 * It is too early in the wordpress boot to do user capabilities filtering
 		 * here and it is deferred to the handler.
 		 */
-		add_action( 'show_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile', array( $this, 'edit_user_profile' ) );
-		add_action( 'edit_user_profile_update', array(
+		add_action('show_user_profile', array($this, 'edit_user_profile'));
+		add_action('edit_user_profile', array($this, 'edit_user_profile'));
+		add_action('edit_user_profile_update', array(
 			$this,
 			'edit_user_profile_update',
-		) );
-		add_action( 'personal_options_update', array(
+		));
+		add_action('personal_options_update', array(
 			$this,
 			'edit_user_profile_update',
-		) );
+		));
 
 	}
 
@@ -78,43 +78,43 @@ 
 	 *
 	 * @param WP_User $user The current WP_User object of the user being edited.
 	 */
-	public function edit_user_profile( $user ) {
+	public function edit_user_profile($user) {
 
 		// In case it is a user editing his own profile, make sure he has admin
 		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
+		if ( ! current_user_can('edit_users')) {
 			return;
 		}
 
 		?>
-		<h2><?php esc_html_e( 'WordLift', 'wordlift' ); ?></h2>
+		<h2><?php esc_html_e('WordLift', 'wordlift'); ?></h2>
 
 		<table class="form-table">
 			<tr class="user-description-wrap">
 				<th><label
-						for="wl_person"><?php _e( 'Author from the vocabulary', 'wordlift' ); ?></label>
+						for="wl_person"><?php _e('Author from the vocabulary', 'wordlift'); ?></label>
 				</th>
 				<td>
 					<?php
-					$this->author_element->render( array(
+					$this->author_element->render(array(
 						'id'             => 'wl_person',
 						'name'           => 'wl_person',
-						'current_entity' => $this->user_service->get_entity( $user->ID ),
-					) );
+						'current_entity' => $this->user_service->get_entity($user->ID),
+					));
 					?>
-					<p class="description"><?php _e( 'The entity, person or organization, from the vocabulary to associate with this author.', 'wordlift' ); ?></p>
+					<p class="description"><?php _e('The entity, person or organization, from the vocabulary to associate with this author.', 'wordlift'); ?></p>
 				</td>
 			</tr>
-			<?php if ( $this->user_service->is_editor( $user->ID ) ) { ?>
+			<?php if ($this->user_service->is_editor($user->ID)) { ?>
 			<tr>
 				<th>
 					<label
-						for="wl_can_create_entities"><?php esc_html_e( 'Can create new entities', 'wordlift' ) ?></label>
+						for="wl_can_create_entities"><?php esc_html_e('Can create new entities', 'wordlift') ?></label>
 				</th>
 				<td>
 					<input id="wl_can_create_entities"
 					       name="wl_can_create_entities"
-					       type="checkbox" <?php checked( $this->user_service->editor_can_create_entities( $user->ID ) ) ?>
+					       type="checkbox" <?php checked($this->user_service->editor_can_create_entities($user->ID)) ?>
 				</td>
 				<?php } ?>
 		</table>
@@ -128,23 +128,23 @@ 
 	 *
 	 * @param int $user_id The user id of the user being saved.
 	 */
-	public function edit_user_profile_update( $user_id ) {
+	public function edit_user_profile_update($user_id) {
 
 		// In case it is a user editing his own profile, make sure he has admin
 		// like capabilities.
-		if ( ! current_user_can( 'edit_users' ) ) {
+		if ( ! current_user_can('edit_users')) {
 			return;
 		}
 
 		// Link an entity to the user.
-		$this->link_entity( $user_id, $_POST );
+		$this->link_entity($user_id, $_POST);
 
 		// Deny and enable the edit entity capability
-		if ( isset( $_POST['wl_can_create_entities'] ) ) {
+		if (isset($_POST['wl_can_create_entities'])) {
 			// User has capability so remove the deny indication if present.
-			$this->user_service->allow_editor_entity_create( $user_id );
+			$this->user_service->allow_editor_entity_create($user_id);
 		} else {
-			$this->user_service->deny_editor_entity_create( $user_id );
+			$this->user_service->deny_editor_entity_create($user_id);
 		}
 
 	}
@@ -158,14 +158,14 @@ 
 	 * @param int   $user_id The {@link WP_User} `id`.
 	 * @param array $post    The `$_POST` array.
 	 */
-	private function link_entity( $user_id, $post ) {
+	private function link_entity($user_id, $post) {
 
 		// Bail out if the `wl_person` parameter isn't set.
-		if ( ! isset( $post['wl_person'] ) || ! is_numeric( $post['wl_person'] ) ) {
+		if ( ! isset($post['wl_person']) || ! is_numeric($post['wl_person'])) {
 			return;
 		}
 
-		$this->user_service->set_entity( $user_id, intval( $post['wl_person'] ) );
+		$this->user_service->set_entity($user_id, intval($post['wl_person']));
 
 	}
 

src/includes/class-wordlift-entity-service.php

Indentation +496 added lines, -496 removed lines

@@ -7,506 +7,506 @@
  */
 class Wordlift_Entity_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The entity post type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const TYPE_NAME = 'entity';
-
-	/**
-	 * The alternative label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
-
-	/**
-	 * The alternative label input template.
-	 *
-	 * @since 3.2.0
-	 */
-	// TODO: this should be moved to a class that deals with HTML code.
-	const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
+    /**
+     * The Log service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The UI service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The entity post type name.
+     *
+     * @since 3.1.0
+     */
+    const TYPE_NAME = 'entity';
+
+    /**
+     * The alternative label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
+
+    /**
+     * The alternative label input template.
+     *
+     * @since 3.2.0
+     */
+    // TODO: this should be moved to a class that deals with HTML code.
+    const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
                 <label class="screen-reader-text" id="wl-alternative-label-prompt-text" for="wl-alternative-label">Enter alternative label here</label>
                 <input name="wl_alternative_label[]" size="30" value="%s" id="wl-alternative-label" type="text">
                 <button class="button wl-delete-button">%s</button>
                 </div>';
 
-	/**
-	 * A singleton instance of the Entity service.
-	 *
-	 * @since  3.2.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Entity_Service instance.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	public function __construct( $ui_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		// Set the UI service.
-		$this->ui_service = $ui_service;
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @since 3.2.0
-	 * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Determines whether a post is an entity or not.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id A post id.
-	 *
-	 * @return bool Return true if the post is an entity otherwise false.
-	 */
-	public function is_entity( $post_id ) {
-
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
-	}
-
-	/**
-	 * Get the proper classification scope for a given entity post
-	 *
-	 * @since 3.5.0
-	 *
-	 * @param integer $post_id An entity post id.
-	 *
-	 * @return string Returns an uri.
-	 */
-	public function get_classification_scope_for( $post_id ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the entity type
-		$entity_type_arr = wl_entity_type_taxonomy_get_type( $post_id );
-		$entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
-		// Retrieve classification boxes configuration
-		$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-		foreach ( $classification_boxes as $cb ) {
-			if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
-				return $cb['id'];
-			}
-		}
-
-		// or null
-		return null;
-
-	}
-
-
-	public function is_used( $post_id ) {
-
-		if ( false === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the post
-		$entity = get_post( $post_id );
-
-		global $wpdb;
-		// Retrieve Wordlift relation instances table name
-		$table_name = wl_core_get_relation_instances_table_name();
-
-		// Check is it's referenced / related to another post / entity
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
-			$entity->ID
-		);
-
-		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt );
-		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {
-			return true;
-		}
-
-		// Check if the entity uri is used as meta_value
-		$stmt = $wpdb->prepare(
-			"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
-			$entity->ID,
-			wl_get_entity_uri( $entity->ID )
-		);
-		// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt );
-
-		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
-			return true;
-		}
-
-		// If we are here, it means the current entity is not used at the moment
-		return false;
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @since 3.3.2
-	 *
-	 * @param int $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 */
-	public function is_internal_uri( $uri ) {
-
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 */
-	public function get_entity_post_by_uri( $uri ) {
-
-		// Check if we've been provided with a value otherwise return null.
-		if ( empty( $uri ) ) {
-			return null;
-		}
-
-		$query_args = array(
-			'posts_per_page' => 1,
-			'post_status'    => 'any',
-			'post_type'      => self::TYPE_NAME,
-			'meta_query'     => array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uri,
-					'compare' => '=',
-				),
-			),
-		);
-
-		// Only if the current uri is not an internal uri, entity search is
-		// performed also looking at sameAs values.
-		//
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( ! $this->is_internal_uri( $uri ) ) {
-
-			$query_args['meta_query']['relation'] = 'OR';
-			$query_args['meta_query'][]           = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $uri,
-				'compare' => '=',
-			);
-		}
-
-		$query = new WP_Query( $query_args );
-
-		// Get the matching entity posts.
-		$posts = $query->get_posts();
-
-		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
-			return null;
-		}
-
-		// Return the found post.
-		return $posts[0];
-	}
-
-	/**
-	 * Fires once a post has been saved. This function uses the $_REQUEST, therefore
-	 * we check that the post we're saving is the current post.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/363
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int     $post_id Post ID.
-	 * @param WP_Post $post    Post object.
-	 * @param bool    $update  Whether this is an existing post being updated or not.
-	 */
-	public function save_post( $post_id, $post, $update ) {
-
-		// Avoid doing anything if post is autosave or a revision.
-		if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
-			return;
-		}
-
-		// We're setting the alternative label that have been provided via the UI
-		// (in fact we're using $_REQUEST), while save_post may be also called
-		// programmatically by some other function: we need to check therefore if
-		// the $post_id in the save_post call matches the post id set in the request.
-		//
-		// If this is not the current post being saved or if it's not an entity, return.
-		if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-
-		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
-
-		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
-
-	}
-
-	/**
-	 * Set the alternative labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int   $post_id    The post id.
-	 * @param array $alt_labels An array of labels.
-	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
-
-		// Force $alt_labels to be an array
-		if ( ! is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
-		}
-
-		$this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
-
-		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
-			}
-		}
-
-	}
-
-	/**
-	 * Retrieve the alternate labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id Post id.
-	 *
-	 * @return mixed An array  of alternative labels.
-	 */
-	public function get_alternative_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-	}
-
-	/**
-	 * Retrieve the labels for an entity, i.e. the title + the synonyms.
-	 *
-	 * @since 3.12.0
-	 *
-	 * @param int $post_id The entity {@link WP_Post} id.
-	 *
-	 * @return array An array with the entity title and labels.
-	 */
-	public function get_labels( $post_id ) {
-
-		return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
-	}
-
-	/**
-	 * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public function edit_form_before_permalink( $post ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-
-		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
-
-		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
-
-			echo $this->get_alternative_label_input( $alt_label );
-
-		};
-
-		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
-
-	}
-
-	/**
-	 * Get the URI for the entity with the specified post id.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
-	 */
-	public function get_uri( $post_id ) {
-
-		// If a null is given, nothing to do
-		if ( null == $post_id ) {
-			return null;
-		}
-
-		$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
-
-		// If the dataset uri is not properly configured, null is returned
-		if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
-			return null;
-		}
-
-		// Set the URI if it isn't set yet.
-		$post_status = get_post_status( $post_id );
-		if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
-			$uri = wl_build_entity_uri( $post_id );
-			wl_set_entity_uri( $post_id, $uri );
-		}
-
-		return $uri;
-	}
-
-
-	/**
-	 * Get the alternative label input HTML code.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $value The input value.
-	 *
-	 * @return string The input HTML code.
-	 */
-	private function get_alternative_label_input( $value = '' ) {
-
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
-	}
-
-	/**
-	 * Get the number of entity posts published in this blog.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @return int The number of published entity posts.
-	 */
-	public function count() {
-
-		$count = wp_count_posts( self::TYPE_NAME );
-
-		return $count->publish;
-	}
-
-	/**
-	 * Create a new entity.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $name     The entity name.
-	 * @param string $type_uri The entity's type URI.
-	 * @param null   $logo     The entity logo id (or NULL if none).
-	 * @param string $status   The post status, by default 'publish'.
-	 *
-	 * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
-	 */
-	public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
-
-		// Create an entity for the publisher.
-		$post_id = wp_insert_post( array(
-			'post_type'    => self::TYPE_NAME,
-			'post_title'   => $name,
-			'post_status'  => $status,
-			'post_content' => '',
-		) );
-
-		// Return the error if any.
-		if ( is_wp_error( $post_id ) ) {
-			return $post_id;
-		}
-
-		// Set the entity logo.
-		if ( $logo && is_numeric( $logo ) ) {
-			set_post_thumbnail( $post_id, $logo );
-		}
-
-		// Set the entity type.
-		Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
-
-		return $post_id;
-	}
-
-	/**
-	 * Get the entities related to the one with the specified id. By default only
-	 * published entities will be returned.
-	 *
-	 * @since 3.10.0
-	 *
-	 * @param int    $id          The post id.
-	 * @param string $post_status The target post status (default = publish).
-	 *
-	 * @return array An array of post ids.
-	 */
-	public function get_related_entities( $id, $post_status = 'publish' ) {
-
-		return wl_core_inner_get_related_entities( 'post_ids', $id, null, $post_status );
-	}
-
-	/**
-	 * Get the list of entities.
-	 *
-	 * @since 3.12.2
-	 *
-	 * @param array $params Custom parameters for WordPress' own {@link get_posts} function.
-	 *
-	 * @return array An array of entity posts.
-	 */
-	public function get( $params = array() ) {
-
-		// Set the defaults.
-		$defaults = array( 'post_type' => 'entity' );
-
-		// Merge the defaults with the provided parameters.
-		$args = wp_parse_args( $params, $defaults );
-
-		// Call the `get_posts` function.
-		return get_posts( $args );
-	}
+    /**
+     * A singleton instance of the Entity service.
+     *
+     * @since  3.2.0
+     * @access private
+     * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Entity_Service instance.
+     *
+     * @since 3.2.0
+     *
+     * @param \Wordlift_UI_Service $ui_service The UI service.
+     */
+    public function __construct( $ui_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        // Set the UI service.
+        $this->ui_service = $ui_service;
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @since 3.2.0
+     * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Determines whether a post is an entity or not.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id A post id.
+     *
+     * @return bool Return true if the post is an entity otherwise false.
+     */
+    public function is_entity( $post_id ) {
+
+        return ( self::TYPE_NAME === get_post_type( $post_id ) );
+    }
+
+    /**
+     * Get the proper classification scope for a given entity post
+     *
+     * @since 3.5.0
+     *
+     * @param integer $post_id An entity post id.
+     *
+     * @return string Returns an uri.
+     */
+    public function get_classification_scope_for( $post_id ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the entity type
+        $entity_type_arr = wl_entity_type_taxonomy_get_type( $post_id );
+        $entity_type     = str_replace( 'wl-', '', $entity_type_arr['css_class'] );
+        // Retrieve classification boxes configuration
+        $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+        foreach ( $classification_boxes as $cb ) {
+            if ( in_array( $entity_type, $cb['registeredTypes'] ) ) {
+                return $cb['id'];
+            }
+        }
+
+        // or null
+        return null;
+
+    }
+
+
+    public function is_used( $post_id ) {
+
+        if ( false === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the post
+        $entity = get_post( $post_id );
+
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Check is it's referenced / related to another post / entity
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $table_name WHERE  object_id = %d",
+            $entity->ID
+        );
+
+        // Perform the query
+        $relation_instances = (int) $wpdb->get_var( $stmt );
+        // If there is at least one relation instance for the current entity, then it's used
+        if ( 0 < $relation_instances ) {
+            return true;
+        }
+
+        // Check if the entity uri is used as meta_value
+        $stmt = $wpdb->prepare(
+            "SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s",
+            $entity->ID,
+            wl_get_entity_uri( $entity->ID )
+        );
+        // Perform the query
+        $meta_instances = (int) $wpdb->get_var( $stmt );
+
+        // If there is at least one meta that refers the current entity uri, then current entity is used
+        if ( 0 < $meta_instances ) {
+            return true;
+        }
+
+        // If we are here, it means the current entity is not used at the moment
+        return false;
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @since 3.3.2
+     *
+     * @param int $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     */
+    public function is_internal_uri( $uri ) {
+
+        return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @since 3.2.0
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     */
+    public function get_entity_post_by_uri( $uri ) {
+
+        // Check if we've been provided with a value otherwise return null.
+        if ( empty( $uri ) ) {
+            return null;
+        }
+
+        $query_args = array(
+            'posts_per_page' => 1,
+            'post_status'    => 'any',
+            'post_type'      => self::TYPE_NAME,
+            'meta_query'     => array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uri,
+                    'compare' => '=',
+                ),
+            ),
+        );
+
+        // Only if the current uri is not an internal uri, entity search is
+        // performed also looking at sameAs values.
+        //
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( ! $this->is_internal_uri( $uri ) ) {
+
+            $query_args['meta_query']['relation'] = 'OR';
+            $query_args['meta_query'][]           = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $uri,
+                'compare' => '=',
+            );
+        }
+
+        $query = new WP_Query( $query_args );
+
+        // Get the matching entity posts.
+        $posts = $query->get_posts();
+
+        // Return null if no post is found.
+        if ( 0 === count( $posts ) ) {
+            return null;
+        }
+
+        // Return the found post.
+        return $posts[0];
+    }
+
+    /**
+     * Fires once a post has been saved. This function uses the $_REQUEST, therefore
+     * we check that the post we're saving is the current post.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/363
+     *
+     * @since 3.2.0
+     *
+     * @param int     $post_id Post ID.
+     * @param WP_Post $post    Post object.
+     * @param bool    $update  Whether this is an existing post being updated or not.
+     */
+    public function save_post( $post_id, $post, $update ) {
+
+        // Avoid doing anything if post is autosave or a revision.
+        if ( wp_is_post_autosave( $post ) || wp_is_post_revision( $post ) ) {
+            return;
+        }
+
+        // We're setting the alternative label that have been provided via the UI
+        // (in fact we're using $_REQUEST), while save_post may be also called
+        // programmatically by some other function: we need to check therefore if
+        // the $post_id in the save_post call matches the post id set in the request.
+        //
+        // If this is not the current post being saved or if it's not an entity, return.
+        if ( ! isset( $_REQUEST['post_ID'] ) || $_REQUEST['post_ID'] != $post_id || ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+
+        // Get the alt labels from the request (or empty array).
+        $alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
+
+        // Set the alternative labels.
+        $this->set_alternative_labels( $post_id, $alt_labels );
+
+    }
+
+    /**
+     * Set the alternative labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int   $post_id    The post id.
+     * @param array $alt_labels An array of labels.
+     */
+    public function set_alternative_labels( $post_id, $alt_labels ) {
+
+        // Force $alt_labels to be an array
+        if ( ! is_array( $alt_labels ) ) {
+            $alt_labels = array( $alt_labels );
+        }
+
+        $this->log->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+
+        // Delete all the existing alternate labels.
+        delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+            }
+        }
+
+    }
+
+    /**
+     * Retrieve the alternate labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id Post id.
+     *
+     * @return mixed An array  of alternative labels.
+     */
+    public function get_alternative_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+    }
+
+    /**
+     * Retrieve the labels for an entity, i.e. the title + the synonyms.
+     *
+     * @since 3.12.0
+     *
+     * @param int $post_id The entity {@link WP_Post} id.
+     *
+     * @return array An array with the entity title and labels.
+     */
+    public function get_labels( $post_id ) {
+
+        return array_merge( (array) get_the_title( $post_id ), $this->get_alternative_labels( $post_id ) );
+    }
+
+    /**
+     * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
+     *
+     * @since 3.2.0
+     *
+     * @param WP_Post $post Post object.
+     */
+    public function edit_form_before_permalink( $post ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+
+        // Print the input template.
+        $this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+
+        // Print all the currently set alternative labels.
+        foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+
+            echo $this->get_alternative_label_input( $alt_label );
+
+        };
+
+        // Print the button.
+        $this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+
+    }
+
+    /**
+     * Get the URI for the entity with the specified post id.
+     *
+     * @since 3.6.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return null|string The entity URI or NULL if not found or the dataset URI is not configured.
+     */
+    public function get_uri( $post_id ) {
+
+        // If a null is given, nothing to do
+        if ( null == $post_id ) {
+            return null;
+        }
+
+        $uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+
+        // If the dataset uri is not properly configured, null is returned
+        if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
+            return null;
+        }
+
+        // Set the URI if it isn't set yet.
+        $post_status = get_post_status( $post_id );
+        if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
+            $uri = wl_build_entity_uri( $post_id );
+            wl_set_entity_uri( $post_id, $uri );
+        }
+
+        return $uri;
+    }
+
+
+    /**
+     * Get the alternative label input HTML code.
+     *
+     * @since 3.2.0
+     *
+     * @param string $value The input value.
+     *
+     * @return string The input HTML code.
+     */
+    private function get_alternative_label_input( $value = '' ) {
+
+        return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+    }
+
+    /**
+     * Get the number of entity posts published in this blog.
+     *
+     * @since 3.6.0
+     *
+     * @return int The number of published entity posts.
+     */
+    public function count() {
+
+        $count = wp_count_posts( self::TYPE_NAME );
+
+        return $count->publish;
+    }
+
+    /**
+     * Create a new entity.
+     *
+     * @since 3.9.0
+     *
+     * @param string $name     The entity name.
+     * @param string $type_uri The entity's type URI.
+     * @param null   $logo     The entity logo id (or NULL if none).
+     * @param string $status   The post status, by default 'publish'.
+     *
+     * @return int|WP_Error The entity post id or a {@link WP_Error} in case the `wp_insert_post` call fails.
+     */
+    public function create( $name, $type_uri, $logo = null, $status = 'publish' ) {
+
+        // Create an entity for the publisher.
+        $post_id = wp_insert_post( array(
+            'post_type'    => self::TYPE_NAME,
+            'post_title'   => $name,
+            'post_status'  => $status,
+            'post_content' => '',
+        ) );
+
+        // Return the error if any.
+        if ( is_wp_error( $post_id ) ) {
+            return $post_id;
+        }
+
+        // Set the entity logo.
+        if ( $logo && is_numeric( $logo ) ) {
+            set_post_thumbnail( $post_id, $logo );
+        }
+
+        // Set the entity type.
+        Wordlift_Entity_Type_Service::get_instance()->set( $post_id, $type_uri );
+
+        return $post_id;
+    }
+
+    /**
+     * Get the entities related to the one with the specified id. By default only
+     * published entities will be returned.
+     *
+     * @since 3.10.0
+     *
+     * @param int    $id          The post id.
+     * @param string $post_status The target post status (default = publish).
+     *
+     * @return array An array of post ids.
+     */
+    public function get_related_entities( $id, $post_status = 'publish' ) {
+
+        return wl_core_inner_get_related_entities( 'post_ids', $id, null, $post_status );
+    }
+
+    /**
+     * Get the list of entities.
+     *
+     * @since 3.12.2
+     *
+     * @param array $params Custom parameters for WordPress' own {@link get_posts} function.
+     *
+     * @return array An array of entity posts.
+     */
+    public function get( $params = array() ) {
+
+        // Set the defaults.
+        $defaults = array( 'post_type' => 'entity' );
+
+        // Merge the defaults with the provided parameters.
+        $args = wp_parse_args( $params, $defaults );
+
+        // Call the `get_posts` function.
+        return get_posts( $args );
+    }
 
 }