insideout10 / wordlift-plugin

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

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	 *
 	 * @param int $post_id A post id.
 	 *
-	 * @return true if the post is an entity otherwise false.
+	 * @return boolean if the post is an entity otherwise false.
 	 */
 	public function is_entity( $post_id ) {
 

Indentation +230 added lines, -230 removed lines

@@ -7,240 +7,240 @@
  */
 class Wordlift_Entity_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * 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 alternate label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATE_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_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * 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 alternate label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATE_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_service = 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;
-	}
-
-	/**
-	 * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
-	 * its specific function).
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return array An array of post IDs.
-	 */
-	public function get_all_related_to_last_50_published_posts() {
-
-		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
-			'numberposts' => 50,
-			'fields'      => 'ids', //only get post IDs
-			'post_type'   => 'post',
-			'post_status' => 'publish'
-		) );
-
-		if ( empty( $latest_posts_ids ) ) {
-			// There are no posts.
-			return array();
-		}
-
-		// Collect entities related to latest posts
-		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
-				'status' => 'publish'
-			) ) );
-		}
-
-		return $entity_ids;
-	}
-
-	/**
-	 * Determines whether a post is an entity or not.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id A post id.
-	 *
-	 * @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 ) );
-	}
-
-	/**
-	 * Fires once a post has been saved.
-	 *
-	 * @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 ) {
-
-		// If it's not an entity, return.
-		if ( ! $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.
-	 */
-	private function set_alternative_labels( $post_id, $alt_labels ) {
-
-		$this->log_service->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::ALTERNATE_LABEL_META_KEY );
-
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATE_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_alternate_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATE_LABEL_META_KEY );
-	}
-
-	/**
-	 * 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_alternate_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 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' ) );
-	}
+    /**
+     * 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_service = 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;
+    }
+
+    /**
+     * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
+     * its specific function).
+     *
+     * @since 3.1.0
+     *
+     * @return array An array of post IDs.
+     */
+    public function get_all_related_to_last_50_published_posts() {
+
+        // Global timeline. Get entities from the latest posts.
+        $latest_posts_ids = get_posts( array(
+            'numberposts' => 50,
+            'fields'      => 'ids', //only get post IDs
+            'post_type'   => 'post',
+            'post_status' => 'publish'
+        ) );
+
+        if ( empty( $latest_posts_ids ) ) {
+            // There are no posts.
+            return array();
+        }
+
+        // Collect entities related to latest posts
+        $entity_ids = array();
+        foreach ( $latest_posts_ids as $id ) {
+            $entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+                'status' => 'publish'
+            ) ) );
+        }
+
+        return $entity_ids;
+    }
+
+    /**
+     * Determines whether a post is an entity or not.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id A post id.
+     *
+     * @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 ) );
+    }
+
+    /**
+     * Fires once a post has been saved.
+     *
+     * @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 ) {
+
+        // If it's not an entity, return.
+        if ( ! $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.
+     */
+    private function set_alternative_labels( $post_id, $alt_labels ) {
+
+        $this->log_service->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::ALTERNATE_LABEL_META_KEY );
+
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATE_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_alternate_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATE_LABEL_META_KEY );
+    }
+
+    /**
+     * 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_alternate_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 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' ) );
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -67,9 +67,9 @@ 
 	 *
 	 * @param \Wordlift_UI_Service $ui_service The UI service.
 	 */
-	public function __construct( $ui_service ) {
+	public function __construct($ui_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		// Set the UI service.
 		$this->ui_service = $ui_service;
@@ -101,24 +101,24 @@ 
 	public function get_all_related_to_last_50_published_posts() {
 
 		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
+		$latest_posts_ids = get_posts(array(
 			'numberposts' => 50,
 			'fields'      => 'ids', //only get post IDs
 			'post_type'   => 'post',
 			'post_status' => 'publish'
-		) );
+		));
 
-		if ( empty( $latest_posts_ids ) ) {
+		if (empty($latest_posts_ids)) {
 			// There are no posts.
 			return array();
 		}
 
 		// Collect entities related to latest posts
 		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+		foreach ($latest_posts_ids as $id) {
+			$entity_ids = array_merge($entity_ids, wl_core_get_related_entity_ids($id, array(
 				'status' => 'publish'
-			) ) );
+			)));
 		}
 
 		return $entity_ids;
@@ -133,9 +133,9 @@ 
 	 *
 	 * @return true if the post is an entity otherwise false.
 	 */
-	public function is_entity( $post_id ) {
+	public function is_entity($post_id) {
 
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
+		return (self::TYPE_NAME === get_post_type($post_id));
 	}
 
 	/**
@@ -147,18 +147,18 @@ 
 	 * @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 ) {
+	public function save_post($post_id, $post, $update) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
+		if ( ! $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();
+		$alt_labels = isset($_REQUEST['wl_alternative_label']) ? $_REQUEST['wl_alternative_label'] : array();
 
 		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
+		$this->set_alternative_labels($post_id, $alt_labels);
 
 	}
 
@@ -170,17 +170,17 @@ 
 	 * @param int $post_id The post id.
 	 * @param array $alt_labels An array of labels.
 	 */
-	private function set_alternative_labels( $post_id, $alt_labels ) {
+	private function set_alternative_labels($post_id, $alt_labels) {
 
-		$this->log_service->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+		$this->log_service->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::ALTERNATE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATE_LABEL_META_KEY);
 
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATE_LABEL_META_KEY, $alt_label );
+		foreach ($alt_labels as $alt_label) {
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATE_LABEL_META_KEY, $alt_label);
 			}
 		}
 
@@ -195,9 +195,9 @@ 
 	 *
 	 * @return mixed An array  of alternative labels.
 	 */
-	public function get_alternate_labels( $post_id ) {
+	public function get_alternate_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATE_LABEL_META_KEY);
 	}
 
 	/**
@@ -207,25 +207,25 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function edit_form_before_permalink( $post ) {
+	public function edit_form_before_permalink($post) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		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() );
+		$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_alternate_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternate_labels($post->ID) as $alt_label) {
 
-			echo $this->get_alternative_label_input( $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' ) );
+		$this->ui_service->print_button('wl-add-alternative-labels-button', __('Add more titles', 'wordlift'));
 
 	}
 
@@ -238,9 +238,9 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function get_alternative_label_input( $value = '' ) {
+	private function get_alternative_label_input($value = '') {
 
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), __('Delete', 'wordlift'));
 	}
 
 }

src/includes/class-wordlift-query-builder.php

Indentation +273 added lines, -273 removed lines

@@ -7,278 +7,278 @@
  */
 class Wordlift_Query_Builder {
 
-	/**
-	 * The INSERT statement template.
-	 *
-	 * @since 3.1.7
-	 */
-	const INSERT = 'INSERT DATA { %s };';
-
-	/**
-	 * The DELETE statement template (it repeats the statements in the WHERE clause.
-	 *
-	 * @since 3.1.7
-	 */
-	const DELETE = 'DELETE { %s } WHERE { %1$s };';
-
-	/**
-	 * Tell the statement function to guess the object type (URI, value or parameter).
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_AUTO = - 1;
-
-	/**
-	 * Tell the statement function that the object is a URI.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_URI = 0;
-
-	/**
-	 * Tell the statement function that the object is a value.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_VALUE = 1;
-
-	/**
-	 * Tell the statement function that the object is a parameter.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_PARAMETER = 2;
-
-	/**
-	 * The RDFS type.
-	 *
-	 * @since 3.1.7
-	 */
-	const RDFS_TYPE_URI = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
-
-	/**
-	 * The schema.org/Person type.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_PERSON_URI = 'http://schema.org/Person';
-
-	/**
-	 * The schema.org given name predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_GIVEN_NAME_URI = 'http://schema.org/givenName';
-
-	/**
-	 * The schema.org family name predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_FAMILY_NAME_URI = 'http://schema.org/familyName';
-
-	/**
-	 * The schema.org url predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_URL_URI = 'http://schema.org/url';
-
-	/**
-	 * The RDF label.
-	 *
-	 * @since 3.1.7
-	 */
-	const RDFS_LABEL_URI = 'http://www.w3.org/2000/01/rdf-schema#label';
-
-	/**
-	 * Hold the template (INSERT or DELETE).
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var string $template The query template.
-	 */
-	private $template;
-
-	/**
-	 * An array of statements (in the form of subject, predicate, object).
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var array $statements An array of statements.
-	 */
-	private $statements = array();
-
-	/**
-	 * Create a new instance of the Query builder (compatible with PHP 5.3).
-	 *
-	 * @since 3.1.7
-	 * @return Wordlift_Query_Builder A new instance of the Query builder.
-	 */
-	public static function new_instance() {
-
-		return new Wordlift_Query_Builder();
-	}
-
-	/**
-	 * Set the query to INSERT.
-	 *
-	 * @since 3.1.7
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function insert() {
-
-		$this->template = self::INSERT;
-
-		return $this;
-	}
-
-	/**
-	 * Set the query to DELETE.
-	 *
-	 * @since 3.1.7
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function delete() {
-
-		$this->template = self::DELETE;
-
-		return $this;
-	}
-
-	/**
-	 * Add a statement.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $subject The subject of the statement (must be a URI).
-	 * @param string $predicate The predicate (must be a URI).
-	 * @param string $object The object, can be a URI or a value.
-	 * @param int $object_type The object type, either a {@link OBJECT_URI} or a value {@link OBJECT_VALUE}. If set to {@link OBJECT_AUTO}, the Query builder will try to guess.
-	 * @param string|null $data_type The data type (or null).
-	 * @param string|null $language The language code (or null).
-	 *
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
-
-		// If no value has been provided, we don't set any statement.
-		if ( empty( $object ) ) {
-			return $this;
-		}
-
-		// Get the object type if set, otherwise try to guess it.
-		$object_value_type = ( self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type( $predicate, $object ) );
-
-		// Prepare the statement template.
-		$template = '<%1$s> <%2$s> ' . (
-			self::OBJECT_URI === $object_value_type ? '<%3$s>' : (
-			self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
-				// self::OBJECT_VALUE === $object_value_type
-				'"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
-
-		// Escape the subject, predicate and object.
-		$escaped_subject   = $this->escape_uri( $subject );
-		$escaped_predicate = $this->escape_uri( $predicate );
-		$escaped_object    = ( self::OBJECT_URI === $object_value_type ? $this->escape_uri( $object ) : self::escape_value( $object ) );
-
-		// Prepare the statement and add it to the list of statements.
-		$this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
-
-		return $this;
-	}
-
-	/**
-	 * Build the query.
-	 *
-	 * @since 3.1.7
-	 * @return string The query string.
-	 */
-	public function build() {
-
-		return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
-	}
-
-	/**
-	 * Guess the statement object type.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $predicate The predicate.
-	 * @param string $object The object.
-	 *
-	 * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
-	 */
-	private function guess_object_type( $predicate, $object ) {
-
-		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $object, '?' ) ) {
-			return self::OBJECT_PARAMETER;
-		}
-
-		// Guess based on the predicate.
-		switch ( $predicate ) {
-
-			case self::RDFS_TYPE_URI:
-			case self::SCHEMA_URL_URI:
-				return self::OBJECT_URI;
-
-		}
-
-		return self::OBJECT_VALUE;
-	}
-
-	/**
-	 * Escape a URI.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $uri The URI to escape.
-	 *
-	 * @return string The escaped URI.
-	 */
-	private function escape_uri( $uri ) {
-
-		// Should we validate the IRI?
-		// http://www.w3.org/TR/sparql11-query/#QSynIRI
-
-		$escaped_uri = str_replace( '<', '\<', $uri );
-		$escaped_uri = str_replace( '>', '\>', $escaped_uri );
-
-		return $escaped_uri;
-	}
-
-	/**
-	 * Escape a value.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $value The value to escape.
-	 *
-	 * @return string The escaped value.
-	 */
-	public static function escape_value( $value ) {
-
-		// see http://www.w3.org/TR/rdf-sparql-query/
-		//    '\t'	U+0009 (tab)
-		//    '\n'	U+000A (line feed)
-		//    '\r'	U+000D (carriage return)
-		//    '\b'	U+0008 (backspace)
-		//    '\f'	U+000C (form feed)
-		//    '\"'	U+0022 (quotation mark, double quote mark)
-		//    "\'"	U+0027 (apostrophe-quote, single quote mark)
-		//    '\\'	U+005C (backslash)
-
-		$escaped_value = str_replace( '\\', '\\\\', $value );
-		$escaped_value = str_replace( '\'', '\\\'', $escaped_value );
-		$escaped_value = str_replace( '"', '\\"', $escaped_value );
-		$escaped_value = str_replace( "\f", '\\f', $escaped_value );
-		$escaped_value = str_replace( "\b", '\\b', $escaped_value );
-		$escaped_value = str_replace( "\r", '\\r', $escaped_value );
-		$escaped_value = str_replace( "\n", '\\n', $escaped_value );
-		$escaped_value = str_replace( "\t", '\\t', $escaped_value );
-
-		return $escaped_value;
-	}
+    /**
+     * The INSERT statement template.
+     *
+     * @since 3.1.7
+     */
+    const INSERT = 'INSERT DATA { %s };';
+
+    /**
+     * The DELETE statement template (it repeats the statements in the WHERE clause.
+     *
+     * @since 3.1.7
+     */
+    const DELETE = 'DELETE { %s } WHERE { %1$s };';
+
+    /**
+     * Tell the statement function to guess the object type (URI, value or parameter).
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_AUTO = - 1;
+
+    /**
+     * Tell the statement function that the object is a URI.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_URI = 0;
+
+    /**
+     * Tell the statement function that the object is a value.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_VALUE = 1;
+
+    /**
+     * Tell the statement function that the object is a parameter.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_PARAMETER = 2;
+
+    /**
+     * The RDFS type.
+     *
+     * @since 3.1.7
+     */
+    const RDFS_TYPE_URI = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
+
+    /**
+     * The schema.org/Person type.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_PERSON_URI = 'http://schema.org/Person';
+
+    /**
+     * The schema.org given name predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_GIVEN_NAME_URI = 'http://schema.org/givenName';
+
+    /**
+     * The schema.org family name predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_FAMILY_NAME_URI = 'http://schema.org/familyName';
+
+    /**
+     * The schema.org url predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_URL_URI = 'http://schema.org/url';
+
+    /**
+     * The RDF label.
+     *
+     * @since 3.1.7
+     */
+    const RDFS_LABEL_URI = 'http://www.w3.org/2000/01/rdf-schema#label';
+
+    /**
+     * Hold the template (INSERT or DELETE).
+     *
+     * @since 3.1.7
+     * @access private
+     * @var string $template The query template.
+     */
+    private $template;
+
+    /**
+     * An array of statements (in the form of subject, predicate, object).
+     *
+     * @since 3.1.7
+     * @access private
+     * @var array $statements An array of statements.
+     */
+    private $statements = array();
+
+    /**
+     * Create a new instance of the Query builder (compatible with PHP 5.3).
+     *
+     * @since 3.1.7
+     * @return Wordlift_Query_Builder A new instance of the Query builder.
+     */
+    public static function new_instance() {
+
+        return new Wordlift_Query_Builder();
+    }
+
+    /**
+     * Set the query to INSERT.
+     *
+     * @since 3.1.7
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function insert() {
+
+        $this->template = self::INSERT;
+
+        return $this;
+    }
+
+    /**
+     * Set the query to DELETE.
+     *
+     * @since 3.1.7
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function delete() {
+
+        $this->template = self::DELETE;
+
+        return $this;
+    }
+
+    /**
+     * Add a statement.
+     *
+     * @since 3.1.7
+     *
+     * @param string $subject The subject of the statement (must be a URI).
+     * @param string $predicate The predicate (must be a URI).
+     * @param string $object The object, can be a URI or a value.
+     * @param int $object_type The object type, either a {@link OBJECT_URI} or a value {@link OBJECT_VALUE}. If set to {@link OBJECT_AUTO}, the Query builder will try to guess.
+     * @param string|null $data_type The data type (or null).
+     * @param string|null $language The language code (or null).
+     *
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
+
+        // If no value has been provided, we don't set any statement.
+        if ( empty( $object ) ) {
+            return $this;
+        }
+
+        // Get the object type if set, otherwise try to guess it.
+        $object_value_type = ( self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type( $predicate, $object ) );
+
+        // Prepare the statement template.
+        $template = '<%1$s> <%2$s> ' . (
+            self::OBJECT_URI === $object_value_type ? '<%3$s>' : (
+            self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
+                // self::OBJECT_VALUE === $object_value_type
+                '"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
+
+        // Escape the subject, predicate and object.
+        $escaped_subject   = $this->escape_uri( $subject );
+        $escaped_predicate = $this->escape_uri( $predicate );
+        $escaped_object    = ( self::OBJECT_URI === $object_value_type ? $this->escape_uri( $object ) : self::escape_value( $object ) );
+
+        // Prepare the statement and add it to the list of statements.
+        $this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
+
+        return $this;
+    }
+
+    /**
+     * Build the query.
+     *
+     * @since 3.1.7
+     * @return string The query string.
+     */
+    public function build() {
+
+        return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
+    }
+
+    /**
+     * Guess the statement object type.
+     *
+     * @since 3.1.7
+     *
+     * @param string $predicate The predicate.
+     * @param string $object The object.
+     *
+     * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
+     */
+    private function guess_object_type( $predicate, $object ) {
+
+        // If the object starts with a question mark, it's a parameter.
+        if ( 0 === strpos( $object, '?' ) ) {
+            return self::OBJECT_PARAMETER;
+        }
+
+        // Guess based on the predicate.
+        switch ( $predicate ) {
+
+            case self::RDFS_TYPE_URI:
+            case self::SCHEMA_URL_URI:
+                return self::OBJECT_URI;
+
+        }
+
+        return self::OBJECT_VALUE;
+    }
+
+    /**
+     * Escape a URI.
+     *
+     * @since 3.1.7
+     *
+     * @param string $uri The URI to escape.
+     *
+     * @return string The escaped URI.
+     */
+    private function escape_uri( $uri ) {
+
+        // Should we validate the IRI?
+        // http://www.w3.org/TR/sparql11-query/#QSynIRI
+
+        $escaped_uri = str_replace( '<', '\<', $uri );
+        $escaped_uri = str_replace( '>', '\>', $escaped_uri );
+
+        return $escaped_uri;
+    }
+
+    /**
+     * Escape a value.
+     *
+     * @since 3.1.7
+     *
+     * @param string $value The value to escape.
+     *
+     * @return string The escaped value.
+     */
+    public static function escape_value( $value ) {
+
+        // see http://www.w3.org/TR/rdf-sparql-query/
+        //    '\t'	U+0009 (tab)
+        //    '\n'	U+000A (line feed)
+        //    '\r'	U+000D (carriage return)
+        //    '\b'	U+0008 (backspace)
+        //    '\f'	U+000C (form feed)
+        //    '\"'	U+0022 (quotation mark, double quote mark)
+        //    "\'"	U+0027 (apostrophe-quote, single quote mark)
+        //    '\\'	U+005C (backslash)
+
+        $escaped_value = str_replace( '\\', '\\\\', $value );
+        $escaped_value = str_replace( '\'', '\\\'', $escaped_value );
+        $escaped_value = str_replace( '"', '\\"', $escaped_value );
+        $escaped_value = str_replace( "\f", '\\f', $escaped_value );
+        $escaped_value = str_replace( "\b", '\\b', $escaped_value );
+        $escaped_value = str_replace( "\r", '\\r', $escaped_value );
+        $escaped_value = str_replace( "\n", '\\n', $escaped_value );
+        $escaped_value = str_replace( "\t", '\\t', $escaped_value );
+
+        return $escaped_value;
+    }
 
 }

Spacing +26 added lines, -27 removed lines

@@ -160,30 +160,29 @@ 
 	 *
 	 * @return $this \Wordlift_Query_Builder The Query builder.
 	 */
-	public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
+	public function statement($subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null) {
 
 		// If no value has been provided, we don't set any statement.
-		if ( empty( $object ) ) {
+		if (empty($object)) {
 			return $this;
 		}
 
 		// Get the object type if set, otherwise try to guess it.
-		$object_value_type = ( self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type( $predicate, $object ) );
+		$object_value_type = (self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type($predicate, $object));
 
 		// Prepare the statement template.
-		$template = '<%1$s> <%2$s> ' . (
+		$template = '<%1$s> <%2$s> '.(
 			self::OBJECT_URI === $object_value_type ? '<%3$s>' : (
-			self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
-				// self::OBJECT_VALUE === $object_value_type
-				'"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
+			self::OBJECT_PARAMETER === $object_value_type ? '%3$s' : // self::OBJECT_VALUE === $object_value_type
+				'"%3$s"'.(isset($data_type) ? '^^%4$s' : '').(isset($language) ? '@%5$s' : '') ) );
 
 		// Escape the subject, predicate and object.
-		$escaped_subject   = $this->escape_uri( $subject );
-		$escaped_predicate = $this->escape_uri( $predicate );
-		$escaped_object    = ( self::OBJECT_URI === $object_value_type ? $this->escape_uri( $object ) : self::escape_value( $object ) );
+		$escaped_subject   = $this->escape_uri($subject);
+		$escaped_predicate = $this->escape_uri($predicate);
+		$escaped_object    = (self::OBJECT_URI === $object_value_type ? $this->escape_uri($object) : self::escape_value($object));
 
 		// Prepare the statement and add it to the list of statements.
-		$this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
+		$this->statements[] = sprintf($template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language);
 
 		return $this;
 	}
@@ -196,7 +195,7 @@ 
 	 */
 	public function build() {
 
-		return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
+		return sprintf($this->template, implode(' . ', $this->statements))."\n";
 	}
 
 	/**
@@ -209,15 +208,15 @@ 
 	 *
 	 * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
 	 */
-	private function guess_object_type( $predicate, $object ) {
+	private function guess_object_type($predicate, $object) {
 
 		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $object, '?' ) ) {
+		if (0 === strpos($object, '?')) {
 			return self::OBJECT_PARAMETER;
 		}
 
 		// Guess based on the predicate.
-		switch ( $predicate ) {
+		switch ($predicate) {
 
 			case self::RDFS_TYPE_URI:
 			case self::SCHEMA_URL_URI:
@@ -237,13 +236,13 @@ 
 	 *
 	 * @return string The escaped URI.
 	 */
-	private function escape_uri( $uri ) {
+	private function escape_uri($uri) {
 
 		// Should we validate the IRI?
 		// http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-		$escaped_uri = str_replace( '<', '\<', $uri );
-		$escaped_uri = str_replace( '>', '\>', $escaped_uri );
+		$escaped_uri = str_replace('<', '\<', $uri);
+		$escaped_uri = str_replace('>', '\>', $escaped_uri);
 
 		return $escaped_uri;
 	}
@@ -257,7 +256,7 @@ 
 	 *
 	 * @return string The escaped value.
 	 */
-	public static function escape_value( $value ) {
+	public static function escape_value($value) {
 
 		// see http://www.w3.org/TR/rdf-sparql-query/
 		//    '\t'	U+0009 (tab)
@@ -269,14 +268,14 @@ 
 		//    "\'"	U+0027 (apostrophe-quote, single quote mark)
 		//    '\\'	U+005C (backslash)
 
-		$escaped_value = str_replace( '\\', '\\\\', $value );
-		$escaped_value = str_replace( '\'', '\\\'', $escaped_value );
-		$escaped_value = str_replace( '"', '\\"', $escaped_value );
-		$escaped_value = str_replace( "\f", '\\f', $escaped_value );
-		$escaped_value = str_replace( "\b", '\\b', $escaped_value );
-		$escaped_value = str_replace( "\r", '\\r', $escaped_value );
-		$escaped_value = str_replace( "\n", '\\n', $escaped_value );
-		$escaped_value = str_replace( "\t", '\\t', $escaped_value );
+		$escaped_value = str_replace('\\', '\\\\', $value);
+		$escaped_value = str_replace('\'', '\\\'', $escaped_value);
+		$escaped_value = str_replace('"', '\\"', $escaped_value);
+		$escaped_value = str_replace("\f", '\\f', $escaped_value);
+		$escaped_value = str_replace("\b", '\\b', $escaped_value);
+		$escaped_value = str_replace("\r", '\\r', $escaped_value);
+		$escaped_value = str_replace("\n", '\\n', $escaped_value);
+		$escaped_value = str_replace("\t", '\\t', $escaped_value);
 
 		return $escaped_value;
 	}

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

Indentation +64 added lines, -64 removed lines

@@ -7,80 +7,80 @@
  */
 class Wordlift_UI_Service {
 
-	/**
-	 * The button element HTML code.
-	 *
-	 * @since 3.2.0
-	 */
-	const BUTTON_HTML = '<a id="%s" class="button wl-button">%s</a>';
+    /**
+     * The button element HTML code.
+     *
+     * @since 3.2.0
+     */
+    const BUTTON_HTML = '<a id="%s" class="button wl-button">%s</a>';
 
-	/**
-	 * The template HTML code.
-	 *
-	 * @since 3.2.0
-	 */
-	const TEMPLATE_HTML = '<script id="%s" type="text/template">%s</script>';
+    /**
+     * The template HTML code.
+     *
+     * @since 3.2.0
+     */
+    const TEMPLATE_HTML = '<script id="%s" type="text/template">%s</script>';
 
-	/**
-	 * Get the button HTML.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $element_id The button element id.
-	 * @param string $label The button (translated) label.
-	 *
-	 * @return string The button HTML code.
-	 */
-	public function get_button_html( $element_id, $label ) {
+    /**
+     * Get the button HTML.
+     *
+     * @since 3.2.0
+     *
+     * @param string $element_id The button element id.
+     * @param string $label The button (translated) label.
+     *
+     * @return string The button HTML code.
+     */
+    public function get_button_html( $element_id, $label ) {
 
-		return sprintf( self::BUTTON_HTML, $element_id, esc_html( $label ) );
-	}
+        return sprintf( self::BUTTON_HTML, $element_id, esc_html( $label ) );
+    }
 
-	/**
-	 * Echo the button HTML.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $element_id The button element id.
-	 * @param string $label The button (translated) label.
-	 *
-	 * @return string The button HTML code.
-	 */
-	public function print_button( $element_id, $label ) {
+    /**
+     * Echo the button HTML.
+     *
+     * @since 3.2.0
+     *
+     * @param string $element_id The button element id.
+     * @param string $label The button (translated) label.
+     *
+     * @return string The button HTML code.
+     */
+    public function print_button( $element_id, $label ) {
 
-		echo( $this->get_button_html( $element_id, $label ) );
+        echo( $this->get_button_html( $element_id, $label ) );
 
-	}
+    }
 
-	/**
-	 * Get the HTML code for a template tag.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $element_id The element id.
-	 * @param string $body The element content.
-	 *
-	 * @return string The HTML code.
-	 */
-	public function get_template_html( $element_id, $body ) {
+    /**
+     * Get the HTML code for a template tag.
+     *
+     * @since 3.2.0
+     *
+     * @param string $element_id The element id.
+     * @param string $body The element content.
+     *
+     * @return string The HTML code.
+     */
+    public function get_template_html( $element_id, $body ) {
 
-		return sprintf( self::TEMPLATE_HTML, $element_id, $body );
-	}
+        return sprintf( self::TEMPLATE_HTML, $element_id, $body );
+    }
 
-	/**
-	 * Echo the HTML code for a template tag.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $element_id The element id.
-	 * @param string $body The element content.
-	 *
-	 * @return string The HTML code.
-	 */
-	public function print_template( $element_id, $body ) {
+    /**
+     * Echo the HTML code for a template tag.
+     *
+     * @since 3.2.0
+     *
+     * @param string $element_id The element id.
+     * @param string $body The element content.
+     *
+     * @return string The HTML code.
+     */
+    public function print_template( $element_id, $body ) {
 
-		echo( $this->get_template_html( $element_id, $body ) );
+        echo( $this->get_template_html( $element_id, $body ) );
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -31,9 +31,9 @@ 
 	 *
 	 * @return string The button HTML code.
 	 */
-	public function get_button_html( $element_id, $label ) {
+	public function get_button_html($element_id, $label) {
 
-		return sprintf( self::BUTTON_HTML, $element_id, esc_html( $label ) );
+		return sprintf(self::BUTTON_HTML, $element_id, esc_html($label));
 	}
 
 	/**
@@ -46,9 +46,9 @@ 
 	 *
 	 * @return string The button HTML code.
 	 */
-	public function print_button( $element_id, $label ) {
+	public function print_button($element_id, $label) {
 
-		echo( $this->get_button_html( $element_id, $label ) );
+		echo($this->get_button_html($element_id, $label));
 
 	}
 
@@ -62,9 +62,9 @@ 
 	 *
 	 * @return string The HTML code.
 	 */
-	public function get_template_html( $element_id, $body ) {
+	public function get_template_html($element_id, $body) {
 
-		return sprintf( self::TEMPLATE_HTML, $element_id, $body );
+		return sprintf(self::TEMPLATE_HTML, $element_id, $body);
 	}
 
 	/**
@@ -77,9 +77,9 @@ 
 	 *
 	 * @return string The HTML code.
 	 */
-	public function print_template( $element_id, $body ) {
+	public function print_template($element_id, $body) {
 
-		echo( $this->get_template_html( $element_id, $body ) );
+		echo($this->get_template_html($element_id, $body));
 
 	}
 

src/includes/class-wordlift.php

Indentation +369 added lines, -369 removed lines

@@ -29,374 +29,374 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since 3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	private $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-
-		$this->version = '3.2.0-dev';
-
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
-
-		$this->loader = new Wordlift_Loader();
-
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
-
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
-
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
-
-		// Create an instance of the Schema service.
-		new Wordlift_Schema_Service();
-
-		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
-
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
-
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
-
-		// Create an instance of the Timeline shortcode.
-		new Wordlift_Timeline_Shortcode();
-
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
-
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
-
-		// Create an instance of the Notice service.
-		new Wordlift_Notice_Service();
-	}
-
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
-
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
-
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
-
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
-
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
-
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
-
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_filter( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_filter( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since 3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The User service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    private $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+
+        $this->version = '3.2.0-dev';
+
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+
+        $this->loader = new Wordlift_Loader();
+
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
+
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
+
+        // Create an instance of the Schema service.
+        new Wordlift_Schema_Service();
+
+        // Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
+        $this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
+
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
+
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+
+        // Create an instance of the Timeline shortcode.
+        new Wordlift_Timeline_Shortcode();
+
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
+
+        // Create an instance of the Notice service.
+        new Wordlift_Notice_Service();
+    }
+
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
+
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
+
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
+
+        $plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $this->loader->add_filter( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_filter( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

Spacing +38 added lines, -38 removed lines

@@ -164,95 +164,95 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * The Log service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -264,13 +264,13 @@ 
 		new Wordlift_Schema_Service();
 
 		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
+		$this->entity_service = new Wordlift_Entity_Service($this->ui_service);
 
 		// Create an instance of the User service.
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create an instance of the Timeline shortcode.
 		new Wordlift_Timeline_Shortcode();
@@ -296,9 +296,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -311,29 +311,29 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Wordlift_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook save_post to the entity service to update custom fields (such as alternate labels).
 		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_filter( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_filter( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+		$this->loader->add_filter('save_post', $this->entity_service, 'save_post', 9, 3);
+		$this->loader->add_filter('edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1);
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 	}
 
@@ -346,17 +346,17 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 	}
 
 	/**

src/wordlift_to_redlink_data_push_callbacks.php

Indentation +236 added lines, -236 removed lines

@@ -8,67 +8,67 @@ 
 function wl_push_post_to_redlink( $post ) {
 
 
-	// Only handle published posts.
-	if ( 'post' !== $post->post_type or 'publish' !== $post->post_status ) {
-		wl_write_log( "wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]" );
+    // Only handle published posts.
+    if ( 'post' !== $post->post_type or 'publish' !== $post->post_status ) {
+        wl_write_log( "wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the post URI.
-	$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+    // Get the post URI.
+    $uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
 
-	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+    // If the URI ends with a trailing slash, then we have a problem.
+    if ( '/' === substr( $uri, - 1, 1 ) ) {
 
-		wl_write_log( "wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]" );
+        wl_write_log( "wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// wl_write_log( "wl_push_post_to_redlink [ post id :: $post->ID ][ uri :: $uri ]" );
+    // wl_write_log( "wl_push_post_to_redlink [ post id :: $post->ID ][ uri :: $uri ]" );
 
-	// Get the site language in order to define the literals language.
-	$site_language = wl_configuration_get_site_language();
+    // Get the site language in order to define the literals language.
+    $site_language = wl_configuration_get_site_language();
 
-	// save the author and get the author URI.
-	$author_uri = wl_sparql_escape_uri( Wordlift_User_Service::get_instance()->get_uri( $post->post_author ) );
+    // save the author and get the author URI.
+    $author_uri = wl_sparql_escape_uri( Wordlift_User_Service::get_instance()->get_uri( $post->post_author ) );
 
-	// Get other post properties.
-	$date_published      = wl_get_sparql_time( get_the_time( 'c', $post ) );
-	$date_modified       = wl_get_sparql_time( wl_get_post_modified_time( $post ) );
-	$title               = wordlift_esc_sparql( $post->post_title );
-	$permalink           = wl_sparql_escape_uri( get_permalink( $post->ID ) );
-	$user_comments_count = $post->comment_count;
+    // Get other post properties.
+    $date_published      = wl_get_sparql_time( get_the_time( 'c', $post ) );
+    $date_modified       = wl_get_sparql_time( wl_get_post_modified_time( $post ) );
+    $title               = wordlift_esc_sparql( $post->post_title );
+    $permalink           = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+    $user_comments_count = $post->comment_count;
 
-	wl_write_log( "wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]" );
+    wl_write_log( "wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]" );
 
-	// create the SPARQL query.
-	$sparql = '';
-	if ( ! empty( $title ) ) {
-		$sparql .= "<$uri> rdfs:label '$title'@$site_language . \n";
-	}
+    // create the SPARQL query.
+    $sparql = '';
+    if ( ! empty( $title ) ) {
+        $sparql .= "<$uri> rdfs:label '$title'@$site_language . \n";
+    }
 
-	$sparql .= "<$uri> a <http://schema.org/BlogPosting> . \n";
-	$sparql .= "<$uri> schema:url <$permalink> . \n";
-	$sparql .= "<$uri> schema:datePublished $date_published . \n";
-	$sparql .= "<$uri> schema:dateModified $date_modified . \n";
-	if ( ! empty( $author_uri ) ) {
-		$sparql .= "<$uri> schema:author <$author_uri> . \n";
-	}
-	$sparql .= "<$uri> schema:interactionCount 'UserComments:$user_comments_count' . \n";
+    $sparql .= "<$uri> a <http://schema.org/BlogPosting> . \n";
+    $sparql .= "<$uri> schema:url <$permalink> . \n";
+    $sparql .= "<$uri> schema:datePublished $date_published . \n";
+    $sparql .= "<$uri> schema:dateModified $date_modified . \n";
+    if ( ! empty( $author_uri ) ) {
+        $sparql .= "<$uri> schema:author <$author_uri> . \n";
+    }
+    $sparql .= "<$uri> schema:interactionCount 'UserComments:$user_comments_count' . \n";
 
 
-	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $post->ID );
+    // Add SPARQL stmts to write the schema:image.
+    $sparql .= wl_get_sparql_images( $uri, $post->ID );
 
-	// Get the SPARQL fragment with the dcterms:references statement.
-	$sparql .= wl_get_sparql_post_references( $post->ID );
+    // Get the SPARQL fragment with the dcterms:references statement.
+    $sparql .= wl_get_sparql_post_references( $post->ID );
 
-	// create the query:
-	//  - remove existing references to entities.
-	//  - set the new post information (including references).
-	$query = rl_sparql_prefixes() . <<<EOF
+    // create the query:
+    //  - remove existing references to entities.
+    //  - set the new post information (including references).
+    $query = rl_sparql_prefixes() . <<<EOF
             DELETE { <$uri> dct:references ?o . }
             WHERE  { <$uri> dct:references ?o . };
             DELETE { <$uri> schema:url ?o . }
@@ -90,8 +90,8 @@ 
             INSERT DATA { $sparql };
 EOF;
 
-	// execute the query.
-	rl_execute_sparql_update_query( $query );
+    // execute the query.
+    rl_execute_sparql_update_query( $query );
 }
 
 /**
@@ -101,153 +101,153 @@ 
  */
 function wl_push_entity_post_to_redlink( $entity_post ) {
 
-	// Get the Entity service instance to perform actions related to entities.
-	$entity_service = Wordlift_Entity_Service::get_instance();
+    // Get the Entity service instance to perform actions related to entities.
+    $entity_service = Wordlift_Entity_Service::get_instance();
 
-	// Only handle published entities.
-	if ( ! $entity_service->is_entity( $entity_post->ID ) || 'publish' !== $entity_post->post_status ) {
+    // Only handle published entities.
+    if ( ! $entity_service->is_entity( $entity_post->ID ) || 'publish' !== $entity_post->post_status ) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]" );
+        wl_write_log( "wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// get the entity URI and the SPARQL escaped version.
-	$uri   = wl_get_entity_uri( $entity_post->ID );
-	$uri_e = wl_sparql_escape_uri( $uri );
+    // get the entity URI and the SPARQL escaped version.
+    $uri   = wl_get_entity_uri( $entity_post->ID );
+    $uri_e = wl_sparql_escape_uri( $uri );
 
-	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+    // If the URI ends with a trailing slash, then we have a problem.
+    if ( '/' === substr( $uri, - 1, 1 ) ) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]" );
+        wl_write_log( "wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the site language in order to define the literals language.
-	$site_language = wl_configuration_get_site_language();
+    // Get the site language in order to define the literals language.
+    $site_language = wl_configuration_get_site_language();
 
-	// get the title and content as label and description.
-	$label     = wordlift_esc_sparql( $entity_post->post_title );
-	$descr     = wordlift_esc_sparql( wp_strip_all_tags( strip_shortcodes( $entity_post->post_content ) ) );
-	$permalink = wl_sparql_escape_uri( get_permalink( $entity_post->ID ) );
+    // get the title and content as label and description.
+    $label     = wordlift_esc_sparql( $entity_post->post_title );
+    $descr     = wordlift_esc_sparql( wp_strip_all_tags( strip_shortcodes( $entity_post->post_content ) ) );
+    $permalink = wl_sparql_escape_uri( get_permalink( $entity_post->ID ) );
 
-	// wl_write_log( "wl_push_entity_post_to_redlink [ entity post id :: $entity_post->ID ][ uri :: $uri ][ label :: $label ]" );
+    // wl_write_log( "wl_push_entity_post_to_redlink [ entity post id :: $entity_post->ID ][ uri :: $uri ][ label :: $label ]" );
 
-	// create a new empty statement.
-	$delete_stmt = '';
-	$sparql      = '';
+    // create a new empty statement.
+    $delete_stmt = '';
+    $sparql      = '';
 
-	// delete on RL all statements regarding properties set from WL (necessary when changing entity type)
-	$all_custom_fields        = wl_entity_taxonomy_get_custom_fields();
-	$predicates_to_be_deleted = array();
-	foreach ( $all_custom_fields as $type => $fields ) {
-		foreach ( $fields as $cf ) {
-			$predicate = $cf['predicate'];
-			if ( ! in_array( $predicate, $predicates_to_be_deleted ) ) {
-				$predicates_to_be_deleted[] = $predicate;
-				$delete_stmt .= "DELETE { <$uri_e> <$predicate> ?o } WHERE  { <$uri_e> <$predicate> ?o };\n";
-			}
-		}
-	}
+    // delete on RL all statements regarding properties set from WL (necessary when changing entity type)
+    $all_custom_fields        = wl_entity_taxonomy_get_custom_fields();
+    $predicates_to_be_deleted = array();
+    foreach ( $all_custom_fields as $type => $fields ) {
+        foreach ( $fields as $cf ) {
+            $predicate = $cf['predicate'];
+            if ( ! in_array( $predicate, $predicates_to_be_deleted ) ) {
+                $predicates_to_be_deleted[] = $predicate;
+                $delete_stmt .= "DELETE { <$uri_e> <$predicate> ?o } WHERE  { <$uri_e> <$predicate> ?o };\n";
+            }
+        }
+    }
 
-	// set the same as.
-	$same_as = wl_schema_get_value( $entity_post->ID, 'sameAs' );
-	foreach ( $same_as as $same_as_uri ) {
-		$same_as_uri_esc = wl_sparql_escape_uri( $same_as_uri );
-		$sparql .= "<$uri_e> owl:sameAs <$same_as_uri_esc> . \n";
-	}
+    // set the same as.
+    $same_as = wl_schema_get_value( $entity_post->ID, 'sameAs' );
+    foreach ( $same_as as $same_as_uri ) {
+        $same_as_uri_esc = wl_sparql_escape_uri( $same_as_uri );
+        $sparql .= "<$uri_e> owl:sameAs <$same_as_uri_esc> . \n";
+    }
 
-	// set the label
-	$sparql .= "<$uri_e> rdfs:label \"$label\"@$site_language . \n";
+    // set the label
+    $sparql .= "<$uri_e> rdfs:label \"$label\"@$site_language . \n";
 
-	// Set the alternative labels.
-	$alt_labels = $entity_service->get_alternate_labels( $entity_post->ID );
-	foreach ( $alt_labels as $alt_label ) {
-		$sparql .= sprintf( '<%s> rdfs:label "%s"@%s . ', $uri_e, Wordlift_Query_Builder::escape_value( $alt_label ), $site_language );
-	}
+    // Set the alternative labels.
+    $alt_labels = $entity_service->get_alternate_labels( $entity_post->ID );
+    foreach ( $alt_labels as $alt_label ) {
+        $sparql .= sprintf( '<%s> rdfs:label "%s"@%s . ', $uri_e, Wordlift_Query_Builder::escape_value( $alt_label ), $site_language );
+    }
 
-	// set the URL
-	$sparql .= "<$uri_e> schema:url <$permalink> . \n";
+    // set the URL
+    $sparql .= "<$uri_e> schema:url <$permalink> . \n";
 
-	// set the description.
-	if ( ! empty( $descr ) ) {
-		$sparql .= "<$uri_e> schema:description \"$descr\"@$site_language . \n";
-	}
+    // set the description.
+    if ( ! empty( $descr ) ) {
+        $sparql .= "<$uri_e> schema:description \"$descr\"@$site_language . \n";
+    }
 
-	$main_type = wl_entity_type_taxonomy_get_type( $entity_post->ID );
+    $main_type = wl_entity_type_taxonomy_get_type( $entity_post->ID );
 
-	if ( null != $main_type ) {
-		$main_type_uri = wl_sparql_escape_uri( $main_type['uri'] );
-		$sparql .= " <$uri_e> a <$main_type_uri> . \n";
+    if ( null != $main_type ) {
+        $main_type_uri = wl_sparql_escape_uri( $main_type['uri'] );
+        $sparql .= " <$uri_e> a <$main_type_uri> . \n";
 
-		// The type define custom fields that hold additional data about the entity.
-		// For example Events may have start/end dates, Places may have coordinates.
-		// The value in the export fields must be rewritten as triple predicates, this
-		// is what we're going to do here.
+        // The type define custom fields that hold additional data about the entity.
+        // For example Events may have start/end dates, Places may have coordinates.
+        // The value in the export fields must be rewritten as triple predicates, this
+        // is what we're going to do here.
 
 //		wl_write_log( 'wl_push_entity_post_to_redlink : checking if entity has export fields [ type :: ' . var_export( $main_type, true ) . ' ]' );
 
-		if ( isset( $main_type['custom_fields'] ) ) {
-			foreach ( $main_type['custom_fields'] as $field => $settings ) {
-
-				// wl_write_log( "wl_push_entity_post_to_redlink : entity has export fields" );
-
-				$predicate = wordlift_esc_sparql( $settings['predicate'] );
-				if ( ! isset( $settings['export_type'] ) || empty( $settings['export_type'] ) ) {
-					$type = null;
-				} else {
-					$type = $settings['export_type'];
-				}
-
-				foreach ( get_post_meta( $entity_post->ID, $field ) as $value ) {
-					$sparql .= " <$uri_e> <$predicate> ";
-
-					if ( ! is_null( $type ) && ( substr( $type, 0, 4 ) == 'http' ) ) {
-						// Type is defined by a raw uri (es. http://schema.org/PostalAddress)
-
-						// Extract uri if the value is numeric
-						if ( is_numeric( $value ) ) {
-							$value = wl_get_entity_uri( $value );
-						}
-
-						$sparql .= '<' . wl_sparql_escape_uri( $value ) . '>';
-					} else {
-						// Type is defined in another way (es. xsd:double)
-						$sparql .= '"' . wordlift_esc_sparql( $value ) . '"^^' . wordlift_esc_sparql( $type );
-					}
-
-					$sparql .= " . \n";
-				}
-			}
-		}
-	}
-
-	// Get the entity types.
-	$type_uris = wl_get_entity_rdf_types( $entity_post->ID );
-
-	// Support type are only schema.org ones: it could be null
-	foreach ( $type_uris as $type_uri ) {
-		$type_uri = wl_sparql_escape_uri( $type_uri );
-		$sparql .= "<$uri_e> a <$type_uri> . \n";
-	}
-
-	// get related entities.
-	$related_entities_ids = wl_core_get_related_entity_ids( $entity_post->ID );
-
-	if ( is_array( $related_entities_ids ) ) {
-		foreach ( $related_entities_ids as $entity_post_id ) {
-			$related_entity_uri = wl_sparql_escape_uri( wl_get_entity_uri( $entity_post_id ) );
-			// create a two-way relationship.
-			$sparql .= " <$uri_e> dct:relation <$related_entity_uri> . \n";
-			$sparql .= " <$related_entity_uri> dct:relation <$uri_e> . \n";
-		}
-	}
-
-	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $entity_post->ID );
-
-	$query = rl_sparql_prefixes() . <<<EOF
+        if ( isset( $main_type['custom_fields'] ) ) {
+            foreach ( $main_type['custom_fields'] as $field => $settings ) {
+
+                // wl_write_log( "wl_push_entity_post_to_redlink : entity has export fields" );
+
+                $predicate = wordlift_esc_sparql( $settings['predicate'] );
+                if ( ! isset( $settings['export_type'] ) || empty( $settings['export_type'] ) ) {
+                    $type = null;
+                } else {
+                    $type = $settings['export_type'];
+                }
+
+                foreach ( get_post_meta( $entity_post->ID, $field ) as $value ) {
+                    $sparql .= " <$uri_e> <$predicate> ";
+
+                    if ( ! is_null( $type ) && ( substr( $type, 0, 4 ) == 'http' ) ) {
+                        // Type is defined by a raw uri (es. http://schema.org/PostalAddress)
+
+                        // Extract uri if the value is numeric
+                        if ( is_numeric( $value ) ) {
+                            $value = wl_get_entity_uri( $value );
+                        }
+
+                        $sparql .= '<' . wl_sparql_escape_uri( $value ) . '>';
+                    } else {
+                        // Type is defined in another way (es. xsd:double)
+                        $sparql .= '"' . wordlift_esc_sparql( $value ) . '"^^' . wordlift_esc_sparql( $type );
+                    }
+
+                    $sparql .= " . \n";
+                }
+            }
+        }
+    }
+
+    // Get the entity types.
+    $type_uris = wl_get_entity_rdf_types( $entity_post->ID );
+
+    // Support type are only schema.org ones: it could be null
+    foreach ( $type_uris as $type_uri ) {
+        $type_uri = wl_sparql_escape_uri( $type_uri );
+        $sparql .= "<$uri_e> a <$type_uri> . \n";
+    }
+
+    // get related entities.
+    $related_entities_ids = wl_core_get_related_entity_ids( $entity_post->ID );
+
+    if ( is_array( $related_entities_ids ) ) {
+        foreach ( $related_entities_ids as $entity_post_id ) {
+            $related_entity_uri = wl_sparql_escape_uri( wl_get_entity_uri( $entity_post_id ) );
+            // create a two-way relationship.
+            $sparql .= " <$uri_e> dct:relation <$related_entity_uri> . \n";
+            $sparql .= " <$related_entity_uri> dct:relation <$uri_e> . \n";
+        }
+    }
+
+    // Add SPARQL stmts to write the schema:image.
+    $sparql .= wl_get_sparql_images( $uri, $entity_post->ID );
+
+    $query = rl_sparql_prefixes() . <<<EOF
     $delete_stmt
     DELETE { <$uri_e> rdfs:label ?o } WHERE  { <$uri_e> rdfs:label ?o };
     DELETE { <$uri_e> owl:sameAs ?o . } WHERE  { <$uri_e> owl:sameAs ?o . };
@@ -259,7 +259,7 @@ 
     INSERT DATA { $sparql };
 EOF;
 
-	rl_execute_sparql_update_query( $query );
+    rl_execute_sparql_update_query( $query );
 }
 
 /**
@@ -271,20 +271,20 @@ 
  */
 function wl_get_sparql_post_references( $post_id ) {
 
-	// Get the post URI.
-	$post_uri = wordlift_esc_sparql( wl_get_entity_uri( $post_id ) );
+    // Get the post URI.
+    $post_uri = wordlift_esc_sparql( wl_get_entity_uri( $post_id ) );
 
-	// Get the related entities IDs.
-	$related = wl_core_get_related_entity_ids( $post_id );
+    // Get the related entities IDs.
+    $related = wl_core_get_related_entity_ids( $post_id );
 
-	// Build the SPARQL fragment.
-	$sparql = '';
-	foreach ( $related as $id ) {
-		$uri = wordlift_esc_sparql( wl_get_entity_uri( $id ) );
-		$sparql .= "<$post_uri> dct:references <$uri> . ";
-	}
+    // Build the SPARQL fragment.
+    $sparql = '';
+    foreach ( $related as $id ) {
+        $uri = wordlift_esc_sparql( wl_get_entity_uri( $id ) );
+        $sparql .= "<$post_uri> dct:references <$uri> . ";
+    }
 
-	return $sparql;
+    return $sparql;
 }
 
 /**
@@ -294,12 +294,12 @@ 
  */
 function rl_sparql_prefixes() {
 
-	$prefixes = '';
-	foreach ( wl_prefixes() as $prefix => $uri ) {
-		$prefixes .= "PREFIX $prefix: <$uri>\n";
-	}
+    $prefixes = '';
+    foreach ( wl_prefixes() as $prefix => $uri ) {
+        $prefixes .= "PREFIX $prefix: <$uri>\n";
+    }
 
-	return $prefixes;
+    return $prefixes;
 }
 
 /**
@@ -310,26 +310,26 @@ 
  * @return string The escaped string.
  */
 function wordlift_esc_sparql( $string ) {
-	// see http://www.w3.org/TR/rdf-sparql-query/
-	//    '\t'	U+0009 (tab)
-	//    '\n'	U+000A (line feed)
-	//    '\r'	U+000D (carriage return)
-	//    '\b'	U+0008 (backspace)
-	//    '\f'	U+000C (form feed)
-	//    '\"'	U+0022 (quotation mark, double quote mark)
-	//    "\'"	U+0027 (apostrophe-quote, single quote mark)
-	//    '\\'	U+005C (backslash)
-
-	$string = str_replace( '\\', '\\\\', $string );
-	$string = str_replace( '\'', '\\\'', $string );
-	$string = str_replace( '"', '\\"', $string );
-	$string = str_replace( "\f", '\\f', $string );
-	$string = str_replace( "\b", '\\b', $string );
-	$string = str_replace( "\r", '\\r', $string );
-	$string = str_replace( "\n", '\\n', $string );
-	$string = str_replace( "\t", '\\t', $string );
-
-	return $string;
+    // see http://www.w3.org/TR/rdf-sparql-query/
+    //    '\t'	U+0009 (tab)
+    //    '\n'	U+000A (line feed)
+    //    '\r'	U+000D (carriage return)
+    //    '\b'	U+0008 (backspace)
+    //    '\f'	U+000C (form feed)
+    //    '\"'	U+0022 (quotation mark, double quote mark)
+    //    "\'"	U+0027 (apostrophe-quote, single quote mark)
+    //    '\\'	U+005C (backslash)
+
+    $string = str_replace( '\\', '\\\\', $string );
+    $string = str_replace( '\'', '\\\'', $string );
+    $string = str_replace( '"', '\\"', $string );
+    $string = str_replace( "\f", '\\f', $string );
+    $string = str_replace( "\b", '\\b', $string );
+    $string = str_replace( "\r", '\\r', $string );
+    $string = str_replace( "\n", '\\n', $string );
+    $string = str_replace( "\t", '\\t', $string );
+
+    return $string;
 }
 
 /**
@@ -343,13 +343,13 @@ 
  */
 function wl_sparql_escape_uri( $string ) {
 
-	// Should we validate the IRI?
-	// http://www.w3.org/TR/sparql11-query/#QSynIRI
+    // Should we validate the IRI?
+    // http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-	$string = str_replace( '<', '\<', $string );
-	$string = str_replace( '>', '\>', $string );
+    $string = str_replace( '<', '\<', $string );
+    $string = str_replace( '>', '\>', $string );
 
-	return $string;
+    return $string;
 
 }
 
@@ -358,35 +358,35 @@ 
  */
 function wordlift_reindex_triple_store() {
 
-	// Get the reindex URL.
-	$url = wl_configuration_get_dataset_index_url();
+    // Get the reindex URL.
+    $url = wl_configuration_get_dataset_index_url();
 
-	// Post the request.
-	// wl_write_log( "wordlift_reindex_triple_store" );
+    // Post the request.
+    // wl_write_log( "wordlift_reindex_triple_store" );
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'  => 'POST',
-		'headers' => array()
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'  => 'POST',
+        'headers' => array()
+    ) );
 
-	$response = wp_remote_request( $url, $args );
+    $response = wp_remote_request( $url, $args );
 
-	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== $response['response']['code'] ) {
+    // If an error has been raised, return the error.
+    if ( is_wp_error( $response ) || 200 !== $response['response']['code'] ) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+        $body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
 
-		wl_write_log( "wordlift_reindex_triple_store : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+        wl_write_log( "wordlift_reindex_triple_store : error [ url :: $url ][ args :: " );
+        wl_write_log( "\n" . var_export( $args, true ) );
+        wl_write_log( "[ response :: " );
+        wl_write_log( "\n" . var_export( $response, true ) );
+        wl_write_log( "][ body :: " );
+        wl_write_log( "\n" . $body );
+        wl_write_log( "]" );
 
-		return false;
-	}
+        return false;
+    }
 
-	return true;
+    return true;
 }
\ No newline at end of file

Spacing +91 added lines, -91 removed lines

@@ -5,23 +5,23 @@ 
  *
  * @param object $post A post instance.
  */
-function wl_push_post_to_redlink( $post ) {
+function wl_push_post_to_redlink($post) {
 
 
 	// Only handle published posts.
-	if ( 'post' !== $post->post_type or 'publish' !== $post->post_status ) {
-		wl_write_log( "wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]" );
+	if ('post' !== $post->post_type or 'publish' !== $post->post_status) {
+		wl_write_log("wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]");
 
 		return;
 	}
 
 	// Get the post URI.
-	$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+	$uri = wl_sparql_escape_uri(wl_get_entity_uri($post->ID));
 
 	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+	if ('/' === substr($uri, - 1, 1)) {
 
-		wl_write_log( "wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]" );
+		wl_write_log("wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]");
 
 		return;
 	}
@@ -32,20 +32,20 @@ 
 	$site_language = wl_configuration_get_site_language();
 
 	// save the author and get the author URI.
-	$author_uri = wl_sparql_escape_uri( Wordlift_User_Service::get_instance()->get_uri( $post->post_author ) );
+	$author_uri = wl_sparql_escape_uri(Wordlift_User_Service::get_instance()->get_uri($post->post_author));
 
 	// Get other post properties.
-	$date_published      = wl_get_sparql_time( get_the_time( 'c', $post ) );
-	$date_modified       = wl_get_sparql_time( wl_get_post_modified_time( $post ) );
-	$title               = wordlift_esc_sparql( $post->post_title );
-	$permalink           = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+	$date_published      = wl_get_sparql_time(get_the_time('c', $post));
+	$date_modified       = wl_get_sparql_time(wl_get_post_modified_time($post));
+	$title               = wordlift_esc_sparql($post->post_title);
+	$permalink           = wl_sparql_escape_uri(get_permalink($post->ID));
 	$user_comments_count = $post->comment_count;
 
-	wl_write_log( "wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]" );
+	wl_write_log("wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]");
 
 	// create the SPARQL query.
 	$sparql = '';
-	if ( ! empty( $title ) ) {
+	if ( ! empty($title)) {
 		$sparql .= "<$uri> rdfs:label '$title'@$site_language . \n";
 	}
 
@@ -53,22 +53,22 @@ 
 	$sparql .= "<$uri> schema:url <$permalink> . \n";
 	$sparql .= "<$uri> schema:datePublished $date_published . \n";
 	$sparql .= "<$uri> schema:dateModified $date_modified . \n";
-	if ( ! empty( $author_uri ) ) {
+	if ( ! empty($author_uri)) {
 		$sparql .= "<$uri> schema:author <$author_uri> . \n";
 	}
 	$sparql .= "<$uri> schema:interactionCount 'UserComments:$user_comments_count' . \n";
 
 
 	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $post->ID );
+	$sparql .= wl_get_sparql_images($uri, $post->ID);
 
 	// Get the SPARQL fragment with the dcterms:references statement.
-	$sparql .= wl_get_sparql_post_references( $post->ID );
+	$sparql .= wl_get_sparql_post_references($post->ID);
 
 	// create the query:
 	//  - remove existing references to entities.
 	//  - set the new post information (including references).
-	$query = rl_sparql_prefixes() . <<<EOF
+	$query = rl_sparql_prefixes().<<<EOF
             DELETE { <$uri> dct:references ?o . }
             WHERE  { <$uri> dct:references ?o . };
             DELETE { <$uri> schema:url ?o . }
@@ -91,7 +91,7 @@ 
 EOF;
 
 	// execute the query.
-	rl_execute_sparql_update_query( $query );
+	rl_execute_sparql_update_query($query);
 }
 
 /**
@@ -99,27 +99,27 @@ 
  *
  * @param object $entity_post An entity post instance.
  */
-function wl_push_entity_post_to_redlink( $entity_post ) {
+function wl_push_entity_post_to_redlink($entity_post) {
 
 	// Get the Entity service instance to perform actions related to entities.
 	$entity_service = Wordlift_Entity_Service::get_instance();
 
 	// Only handle published entities.
-	if ( ! $entity_service->is_entity( $entity_post->ID ) || 'publish' !== $entity_post->post_status ) {
+	if ( ! $entity_service->is_entity($entity_post->ID) || 'publish' !== $entity_post->post_status) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]" );
+		wl_write_log("wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]");
 
 		return;
 	}
 
 	// get the entity URI and the SPARQL escaped version.
-	$uri   = wl_get_entity_uri( $entity_post->ID );
-	$uri_e = wl_sparql_escape_uri( $uri );
+	$uri   = wl_get_entity_uri($entity_post->ID);
+	$uri_e = wl_sparql_escape_uri($uri);
 
 	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+	if ('/' === substr($uri, - 1, 1)) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]" );
+		wl_write_log("wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]");
 
 		return;
 	}
@@ -128,9 +128,9 @@ 
 	$site_language = wl_configuration_get_site_language();
 
 	// get the title and content as label and description.
-	$label     = wordlift_esc_sparql( $entity_post->post_title );
-	$descr     = wordlift_esc_sparql( wp_strip_all_tags( strip_shortcodes( $entity_post->post_content ) ) );
-	$permalink = wl_sparql_escape_uri( get_permalink( $entity_post->ID ) );
+	$label     = wordlift_esc_sparql($entity_post->post_title);
+	$descr     = wordlift_esc_sparql(wp_strip_all_tags(strip_shortcodes($entity_post->post_content)));
+	$permalink = wl_sparql_escape_uri(get_permalink($entity_post->ID));
 
 	// wl_write_log( "wl_push_entity_post_to_redlink [ entity post id :: $entity_post->ID ][ uri :: $uri ][ label :: $label ]" );
 
@@ -141,10 +141,10 @@ 
 	// delete on RL all statements regarding properties set from WL (necessary when changing entity type)
 	$all_custom_fields        = wl_entity_taxonomy_get_custom_fields();
 	$predicates_to_be_deleted = array();
-	foreach ( $all_custom_fields as $type => $fields ) {
-		foreach ( $fields as $cf ) {
+	foreach ($all_custom_fields as $type => $fields) {
+		foreach ($fields as $cf) {
 			$predicate = $cf['predicate'];
-			if ( ! in_array( $predicate, $predicates_to_be_deleted ) ) {
+			if ( ! in_array($predicate, $predicates_to_be_deleted)) {
 				$predicates_to_be_deleted[] = $predicate;
 				$delete_stmt .= "DELETE { <$uri_e> <$predicate> ?o } WHERE  { <$uri_e> <$predicate> ?o };\n";
 			}
@@ -152,9 +152,9 @@ 
 	}
 
 	// set the same as.
-	$same_as = wl_schema_get_value( $entity_post->ID, 'sameAs' );
-	foreach ( $same_as as $same_as_uri ) {
-		$same_as_uri_esc = wl_sparql_escape_uri( $same_as_uri );
+	$same_as = wl_schema_get_value($entity_post->ID, 'sameAs');
+	foreach ($same_as as $same_as_uri) {
+		$same_as_uri_esc = wl_sparql_escape_uri($same_as_uri);
 		$sparql .= "<$uri_e> owl:sameAs <$same_as_uri_esc> . \n";
 	}
 
@@ -162,23 +162,23 @@ 
 	$sparql .= "<$uri_e> rdfs:label \"$label\"@$site_language . \n";
 
 	// Set the alternative labels.
-	$alt_labels = $entity_service->get_alternate_labels( $entity_post->ID );
-	foreach ( $alt_labels as $alt_label ) {
-		$sparql .= sprintf( '<%s> rdfs:label "%s"@%s . ', $uri_e, Wordlift_Query_Builder::escape_value( $alt_label ), $site_language );
+	$alt_labels = $entity_service->get_alternate_labels($entity_post->ID);
+	foreach ($alt_labels as $alt_label) {
+		$sparql .= sprintf('<%s> rdfs:label "%s"@%s . ', $uri_e, Wordlift_Query_Builder::escape_value($alt_label), $site_language);
 	}
 
 	// set the URL
 	$sparql .= "<$uri_e> schema:url <$permalink> . \n";
 
 	// set the description.
-	if ( ! empty( $descr ) ) {
+	if ( ! empty($descr)) {
 		$sparql .= "<$uri_e> schema:description \"$descr\"@$site_language . \n";
 	}
 
-	$main_type = wl_entity_type_taxonomy_get_type( $entity_post->ID );
+	$main_type = wl_entity_type_taxonomy_get_type($entity_post->ID);
 
-	if ( null != $main_type ) {
-		$main_type_uri = wl_sparql_escape_uri( $main_type['uri'] );
+	if (null != $main_type) {
+		$main_type_uri = wl_sparql_escape_uri($main_type['uri']);
 		$sparql .= " <$uri_e> a <$main_type_uri> . \n";
 
 		// The type define custom fields that hold additional data about the entity.
@@ -188,33 +188,33 @@ 
 
 //		wl_write_log( 'wl_push_entity_post_to_redlink : checking if entity has export fields [ type :: ' . var_export( $main_type, true ) . ' ]' );
 
-		if ( isset( $main_type['custom_fields'] ) ) {
-			foreach ( $main_type['custom_fields'] as $field => $settings ) {
+		if (isset($main_type['custom_fields'])) {
+			foreach ($main_type['custom_fields'] as $field => $settings) {
 
 				// wl_write_log( "wl_push_entity_post_to_redlink : entity has export fields" );
 
-				$predicate = wordlift_esc_sparql( $settings['predicate'] );
-				if ( ! isset( $settings['export_type'] ) || empty( $settings['export_type'] ) ) {
+				$predicate = wordlift_esc_sparql($settings['predicate']);
+				if ( ! isset($settings['export_type']) || empty($settings['export_type'])) {
 					$type = null;
 				} else {
 					$type = $settings['export_type'];
 				}
 
-				foreach ( get_post_meta( $entity_post->ID, $field ) as $value ) {
+				foreach (get_post_meta($entity_post->ID, $field) as $value) {
 					$sparql .= " <$uri_e> <$predicate> ";
 
-					if ( ! is_null( $type ) && ( substr( $type, 0, 4 ) == 'http' ) ) {
+					if ( ! is_null($type) && (substr($type, 0, 4) == 'http')) {
 						// Type is defined by a raw uri (es. http://schema.org/PostalAddress)
 
 						// Extract uri if the value is numeric
-						if ( is_numeric( $value ) ) {
-							$value = wl_get_entity_uri( $value );
+						if (is_numeric($value)) {
+							$value = wl_get_entity_uri($value);
 						}
 
-						$sparql .= '<' . wl_sparql_escape_uri( $value ) . '>';
+						$sparql .= '<'.wl_sparql_escape_uri($value).'>';
 					} else {
 						// Type is defined in another way (es. xsd:double)
-						$sparql .= '"' . wordlift_esc_sparql( $value ) . '"^^' . wordlift_esc_sparql( $type );
+						$sparql .= '"'.wordlift_esc_sparql($value).'"^^'.wordlift_esc_sparql($type);
 					}
 
 					$sparql .= " . \n";
@@ -224,20 +224,20 @@ 
 	}
 
 	// Get the entity types.
-	$type_uris = wl_get_entity_rdf_types( $entity_post->ID );
+	$type_uris = wl_get_entity_rdf_types($entity_post->ID);
 
 	// Support type are only schema.org ones: it could be null
-	foreach ( $type_uris as $type_uri ) {
-		$type_uri = wl_sparql_escape_uri( $type_uri );
+	foreach ($type_uris as $type_uri) {
+		$type_uri = wl_sparql_escape_uri($type_uri);
 		$sparql .= "<$uri_e> a <$type_uri> . \n";
 	}
 
 	// get related entities.
-	$related_entities_ids = wl_core_get_related_entity_ids( $entity_post->ID );
+	$related_entities_ids = wl_core_get_related_entity_ids($entity_post->ID);
 
-	if ( is_array( $related_entities_ids ) ) {
-		foreach ( $related_entities_ids as $entity_post_id ) {
-			$related_entity_uri = wl_sparql_escape_uri( wl_get_entity_uri( $entity_post_id ) );
+	if (is_array($related_entities_ids)) {
+		foreach ($related_entities_ids as $entity_post_id) {
+			$related_entity_uri = wl_sparql_escape_uri(wl_get_entity_uri($entity_post_id));
 			// create a two-way relationship.
 			$sparql .= " <$uri_e> dct:relation <$related_entity_uri> . \n";
 			$sparql .= " <$related_entity_uri> dct:relation <$uri_e> . \n";
@@ -245,9 +245,9 @@ 
 	}
 
 	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $entity_post->ID );
+	$sparql .= wl_get_sparql_images($uri, $entity_post->ID);
 
-	$query = rl_sparql_prefixes() . <<<EOF
+	$query = rl_sparql_prefixes().<<<EOF
     $delete_stmt
     DELETE { <$uri_e> rdfs:label ?o } WHERE  { <$uri_e> rdfs:label ?o };
     DELETE { <$uri_e> owl:sameAs ?o . } WHERE  { <$uri_e> owl:sameAs ?o . };
@@ -259,7 +259,7 @@ 
     INSERT DATA { $sparql };
 EOF;
 
-	rl_execute_sparql_update_query( $query );
+	rl_execute_sparql_update_query($query);
 }
 
 /**
@@ -269,18 +269,18 @@ 
  *
  * @return string The SPARQL fragment (or an empty string).
  */
-function wl_get_sparql_post_references( $post_id ) {
+function wl_get_sparql_post_references($post_id) {
 
 	// Get the post URI.
-	$post_uri = wordlift_esc_sparql( wl_get_entity_uri( $post_id ) );
+	$post_uri = wordlift_esc_sparql(wl_get_entity_uri($post_id));
 
 	// Get the related entities IDs.
-	$related = wl_core_get_related_entity_ids( $post_id );
+	$related = wl_core_get_related_entity_ids($post_id);
 
 	// Build the SPARQL fragment.
 	$sparql = '';
-	foreach ( $related as $id ) {
-		$uri = wordlift_esc_sparql( wl_get_entity_uri( $id ) );
+	foreach ($related as $id) {
+		$uri = wordlift_esc_sparql(wl_get_entity_uri($id));
 		$sparql .= "<$post_uri> dct:references <$uri> . ";
 	}
 
@@ -295,7 +295,7 @@ 
 function rl_sparql_prefixes() {
 
 	$prefixes = '';
-	foreach ( wl_prefixes() as $prefix => $uri ) {
+	foreach (wl_prefixes() as $prefix => $uri) {
 		$prefixes .= "PREFIX $prefix: <$uri>\n";
 	}
 
@@ -309,7 +309,7 @@ 
  *
  * @return string The escaped string.
  */
-function wordlift_esc_sparql( $string ) {
+function wordlift_esc_sparql($string) {
 	// see http://www.w3.org/TR/rdf-sparql-query/
 	//    '\t'	U+0009 (tab)
 	//    '\n'	U+000A (line feed)
@@ -320,14 +320,14 @@ 
 	//    "\'"	U+0027 (apostrophe-quote, single quote mark)
 	//    '\\'	U+005C (backslash)
 
-	$string = str_replace( '\\', '\\\\', $string );
-	$string = str_replace( '\'', '\\\'', $string );
-	$string = str_replace( '"', '\\"', $string );
-	$string = str_replace( "\f", '\\f', $string );
-	$string = str_replace( "\b", '\\b', $string );
-	$string = str_replace( "\r", '\\r', $string );
-	$string = str_replace( "\n", '\\n', $string );
-	$string = str_replace( "\t", '\\t', $string );
+	$string = str_replace('\\', '\\\\', $string);
+	$string = str_replace('\'', '\\\'', $string);
+	$string = str_replace('"', '\\"', $string);
+	$string = str_replace("\f", '\\f', $string);
+	$string = str_replace("\b", '\\b', $string);
+	$string = str_replace("\r", '\\r', $string);
+	$string = str_replace("\n", '\\n', $string);
+	$string = str_replace("\t", '\\t', $string);
 
 	return $string;
 }
@@ -341,13 +341,13 @@ 
  *
  * @return string The escaped URI.
  */
-function wl_sparql_escape_uri( $string ) {
+function wl_sparql_escape_uri($string) {
 
 	// Should we validate the IRI?
 	// http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-	$string = str_replace( '<', '\<', $string );
-	$string = str_replace( '>', '\>', $string );
+	$string = str_replace('<', '\<', $string);
+	$string = str_replace('>', '\>', $string);
 
 	return $string;
 
@@ -365,25 +365,25 @@ 
 	// wl_write_log( "wordlift_reindex_triple_store" );
 
 	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 		'method'  => 'POST',
 		'headers' => array()
-	) );
+	));
 
-	$response = wp_remote_request( $url, $args );
+	$response = wp_remote_request($url, $args);
 
 	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== $response['response']['code'] ) {
+	if (is_wp_error($response) || 200 !== $response['response']['code']) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+		$body = (is_wp_error($response) ? $response->get_error_message() : $response['body']);
 
-		wl_write_log( "wordlift_reindex_triple_store : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+		wl_write_log("wordlift_reindex_triple_store : error [ url :: $url ][ args :: ");
+		wl_write_log("\n".var_export($args, true));
+		wl_write_log("[ response :: ");
+		wl_write_log("\n".var_export($response, true));
+		wl_write_log("][ body :: ");
+		wl_write_log("\n".$body);
+		wl_write_log("]");
 
 		return false;
 	}