insideout10 / wordlift-plugin

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

Indentation +177 added lines, -177 removed lines

@@ -26,182 +26,182 @@
  */
 class Wordlift_Entity_Link_Service {
 
-	/**
-	 * The entity type service.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Entity_Post_Type_Service $entity_type_service The entity type service.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity post type slug.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var string $slug The entity post type slug.
-	 */
-	private $slug;
-
-	/**
-	 * A logger instance.
-	 *
-	 * @since  3.6.0
-	 * @access private
-	 * @var Wordlift_Log_Service
-	 */
-	private $log;
-
-	/**
-	 * Wordlift_Entity_Link_Service constructor.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param Wordlift_Entity_Post_Type_Service $entity_type_service
-	 * @param string                            $slug The entity post type slug.
-	 */
-	public function __construct( $entity_type_service, $slug ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
-
-		$this->entity_type_service = $entity_type_service;
-		$this->slug                = $slug;
-
-	}
-
-	/**
-	 * Intercept link generation to posts in order to customize links to entities.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string  $post_link The post's permalink.
-	 * @param WP_Post $post      The post in question.
-	 * @param bool    $leavename Whether to keep the post name.
-	 * @param bool    $sample    Is it a sample permalink.
-	 *
-	 * @return string The link to the post.
-	 */
-	public function post_type_link( $post_link, $post, $leavename, $sample ) {
-
-		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
-			return $post_link;
-		}
-
-		// Replace /slug/post_name/ with /post_name/
-		// The slug comes from the Entity Type Service since that service is responsible for registering the default
-		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
-	}
-
-	/**
-	 * Alter the query to look for our own custom type.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param WP_Query $query
-	 */
-	public function pre_get_posts( $query ) {
-
-		// If a slug has been set, we don't need to alter the query.
-		if ( ! empty( $this->slug ) ) {
-			return;
-		}
-
-		// Check if it's a query we should extend with our own custom post type.
-		//
-		// The `$query->query` count could be > 2 if the preview parameter is passed too.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/439
-		if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
-			return;
-		}
-
-		// Add our own post type to the query.
-		$post_type = is_array( $query->get( 'post_type' ) ) ? $query->get( 'post_type' ) : array();
-		$query->set( 'post_type', array_merge( $post_type, array(
-			'post',
-			$this->entity_type_service->get_post_type(),
-			'page',
-		) ) );
-
-	}
-
-	/**
-	 * Hook to WordPress' wp_unique_post_slug_is_bad_flat_slug filter. This is called when a page is saved.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
-	 * @param string $slug      The post slug.
-	 * @param string $post_type Post type.
-	 *
-	 * @return bool Whether the slug is bad.
-	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
-
-		// The list of post types that might have conflicting slugs.
-		$post_types = array(
-			'post',
-			'page',
-			$this->entity_type_service->get_post_type(),
-		);
-
-		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types ) ) {
-			return $bad_slug;
-		}
-
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
-
-		$this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
-
-		return $exists;
-	}
-
-	/**
-	 * Hook to WordPress' wp_unique_post_slug_is_bad_hierarchical_slug filter. This is called when a page is saved.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
-	 * @param string $slug      The post slug.
-	 * @param string $post_type Post type.
-	 * @param int    $post_parent
-	 *
-	 * @return bool Whether the slug is bad.
-	 */
-	public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
-
-		// We only care about pages here.
-		if ( 'page' !== $post_type ) {
-			return $bad_slug;
-		}
-
-		// We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
-		// about overlapping slugs among pages and posts:
-		//  https://core.trac.wordpress.org/ticket/13459
-		return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
-	}
-
-	/**
-	 * Check whether a slug exists already for the specified post types.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $slug       The slug.
-	 * @param array  $post_types An array of post types.
-	 *
-	 * @return bool True if the slug exists, otherwise false.
-	 */
-	private function slug_exists( $slug, $post_types ) {
-		global $wpdb;
-
-		// Post slugs must be unique across all posts.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
-
-		return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
-	}
+    /**
+     * The entity type service.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Entity_Post_Type_Service $entity_type_service The entity type service.
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity post type slug.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var string $slug The entity post type slug.
+     */
+    private $slug;
+
+    /**
+     * A logger instance.
+     *
+     * @since  3.6.0
+     * @access private
+     * @var Wordlift_Log_Service
+     */
+    private $log;
+
+    /**
+     * Wordlift_Entity_Link_Service constructor.
+     *
+     * @since 3.6.0
+     *
+     * @param Wordlift_Entity_Post_Type_Service $entity_type_service
+     * @param string                            $slug The entity post type slug.
+     */
+    public function __construct( $entity_type_service, $slug ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
+
+        $this->entity_type_service = $entity_type_service;
+        $this->slug                = $slug;
+
+    }
+
+    /**
+     * Intercept link generation to posts in order to customize links to entities.
+     *
+     * @since 3.6.0
+     *
+     * @param string  $post_link The post's permalink.
+     * @param WP_Post $post      The post in question.
+     * @param bool    $leavename Whether to keep the post name.
+     * @param bool    $sample    Is it a sample permalink.
+     *
+     * @return string The link to the post.
+     */
+    public function post_type_link( $post_link, $post, $leavename, $sample ) {
+
+        // Return the post link if this is not our post type.
+        if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+            return $post_link;
+        }
+
+        // Replace /slug/post_name/ with /post_name/
+        // The slug comes from the Entity Type Service since that service is responsible for registering the default
+        // slug.
+        return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+    }
+
+    /**
+     * Alter the query to look for our own custom type.
+     *
+     * @since 3.6.0
+     *
+     * @param WP_Query $query
+     */
+    public function pre_get_posts( $query ) {
+
+        // If a slug has been set, we don't need to alter the query.
+        if ( ! empty( $this->slug ) ) {
+            return;
+        }
+
+        // Check if it's a query we should extend with our own custom post type.
+        //
+        // The `$query->query` count could be > 2 if the preview parameter is passed too.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/439
+        if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
+            return;
+        }
+
+        // Add our own post type to the query.
+        $post_type = is_array( $query->get( 'post_type' ) ) ? $query->get( 'post_type' ) : array();
+        $query->set( 'post_type', array_merge( $post_type, array(
+            'post',
+            $this->entity_type_service->get_post_type(),
+            'page',
+        ) ) );
+
+    }
+
+    /**
+     * Hook to WordPress' wp_unique_post_slug_is_bad_flat_slug filter. This is called when a page is saved.
+     *
+     * @since 3.6.0
+     *
+     * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
+     * @param string $slug      The post slug.
+     * @param string $post_type Post type.
+     *
+     * @return bool Whether the slug is bad.
+     */
+    public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+
+        // The list of post types that might have conflicting slugs.
+        $post_types = array(
+            'post',
+            'page',
+            $this->entity_type_service->get_post_type(),
+        );
+
+        // Ignore post types different from the ones we need to check.
+        if ( ! in_array( $post_type, $post_types ) ) {
+            return $bad_slug;
+        }
+
+        $exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+
+        $this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
+
+        return $exists;
+    }
+
+    /**
+     * Hook to WordPress' wp_unique_post_slug_is_bad_hierarchical_slug filter. This is called when a page is saved.
+     *
+     * @since 3.6.0
+     *
+     * @param bool   $bad_slug  Whether the post slug would be bad as a flat slug.
+     * @param string $slug      The post slug.
+     * @param string $post_type Post type.
+     * @param int    $post_parent
+     *
+     * @return bool Whether the slug is bad.
+     */
+    public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
+
+        // We only care about pages here.
+        if ( 'page' !== $post_type ) {
+            return $bad_slug;
+        }
+
+        // We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
+        // about overlapping slugs among pages and posts:
+        //  https://core.trac.wordpress.org/ticket/13459
+        return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
+    }
+
+    /**
+     * Check whether a slug exists already for the specified post types.
+     *
+     * @since 3.6.0
+     *
+     * @param string $slug       The slug.
+     * @param array  $post_types An array of post types.
+     *
+     * @return bool True if the slug exists, otherwise false.
+     */
+    private function slug_exists( $slug, $post_types ) {
+        global $wpdb;
+
+        // Post slugs must be unique across all posts.
+        $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
+
+        return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
+    }
 
 }

Spacing +21 added lines, -21 removed lines

@@ -61,9 +61,9 @@ 
 	 * @param Wordlift_Entity_Post_Type_Service $entity_type_service
 	 * @param string                            $slug The entity post type slug.
 	 */
-	public function __construct( $entity_type_service, $slug ) {
+	public function __construct($entity_type_service, $slug) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Link_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Entity_Link_Service');
 
 		$this->entity_type_service = $entity_type_service;
 		$this->slug                = $slug;
@@ -82,17 +82,17 @@ 
 	 *
 	 * @return string The link to the post.
 	 */
-	public function post_type_link( $post_link, $post, $leavename, $sample ) {
+	public function post_type_link($post_link, $post, $leavename, $sample) {
 
 		// Return the post link if this is not our post type.
-		if ( ! empty( $this->slug ) || $this->entity_type_service->get_post_type() !== get_post_type( $post ) ) {
+		if ( ! empty($this->slug) || $this->entity_type_service->get_post_type() !== get_post_type($post)) {
 			return $post_link;
 		}
 
 		// Replace /slug/post_name/ with /post_name/
 		// The slug comes from the Entity Type Service since that service is responsible for registering the default
 		// slug.
-		return str_replace( "/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link );
+		return str_replace("/{$this->entity_type_service->get_slug()}/$post->post_name/", "/$post->post_name/", $post_link);
 	}
 
 	/**
@@ -102,10 +102,10 @@ 
 	 *
 	 * @param WP_Query $query
 	 */
-	public function pre_get_posts( $query ) {
+	public function pre_get_posts($query) {
 
 		// If a slug has been set, we don't need to alter the query.
-		if ( ! empty( $this->slug ) ) {
+		if ( ! empty($this->slug)) {
 			return;
 		}
 
@@ -114,17 +114,17 @@ 
 		// The `$query->query` count could be > 2 if the preview parameter is passed too.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/439
-		if ( ! $query->is_main_query() || 2 > count( $query->query ) || ! isset( $query->query['page'] ) || empty( $query->query['name'] ) ) {
+		if ( ! $query->is_main_query() || 2 > count($query->query) || ! isset($query->query['page']) || empty($query->query['name'])) {
 			return;
 		}
 
 		// Add our own post type to the query.
-		$post_type = is_array( $query->get( 'post_type' ) ) ? $query->get( 'post_type' ) : array();
-		$query->set( 'post_type', array_merge( $post_type, array(
+		$post_type = is_array($query->get('post_type')) ? $query->get('post_type') : array();
+		$query->set('post_type', array_merge($post_type, array(
 			'post',
 			$this->entity_type_service->get_post_type(),
 			'page',
-		) ) );
+		)));
 
 	}
 
@@ -139,7 +139,7 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type ) {
+	public function wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type) {
 
 		// The list of post types that might have conflicting slugs.
 		$post_types = array(
@@ -149,13 +149,13 @@ 
 		);
 
 		// Ignore post types different from the ones we need to check.
-		if ( ! in_array( $post_type, $post_types ) ) {
+		if ( ! in_array($post_type, $post_types)) {
 			return $bad_slug;
 		}
 
-		$exists = $this->slug_exists( $slug, array_diff( $post_types, array( $post_type ) ) );
+		$exists = $this->slug_exists($slug, array_diff($post_types, array($post_type)));
 
-		$this->log->debug( "Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: " . ( $exists ? "yes" : "no" ) . " ]" );
+		$this->log->debug("Checking if a slug exists [ post type :: $post_type ][ slug :: $slug ][ exists :: ".($exists ? "yes" : "no")." ]");
 
 		return $exists;
 	}
@@ -172,17 +172,17 @@ 
 	 *
 	 * @return bool Whether the slug is bad.
 	 */
-	public function wp_unique_post_slug_is_bad_hierarchical_slug( $bad_slug, $slug, $post_type, $post_parent ) {
+	public function wp_unique_post_slug_is_bad_hierarchical_slug($bad_slug, $slug, $post_type, $post_parent) {
 
 		// We only care about pages here.
-		if ( 'page' !== $post_type ) {
+		if ('page' !== $post_type) {
 			return $bad_slug;
 		}
 
 		// We redirect the call to the flat hook, this means that this check is going to solve also the 6-years old issue
 		// about overlapping slugs among pages and posts:
 		//  https://core.trac.wordpress.org/ticket/13459
-		return $this->wp_unique_post_slug_is_bad_flat_slug( $bad_slug, $slug, $post_type );
+		return $this->wp_unique_post_slug_is_bad_flat_slug($bad_slug, $slug, $post_type);
 	}
 
 	/**
@@ -195,13 +195,13 @@ 
 	 *
 	 * @return bool True if the slug exists, otherwise false.
 	 */
-	private function slug_exists( $slug, $post_types ) {
+	private function slug_exists($slug, $post_types) {
 		global $wpdb;
 
 		// Post slugs must be unique across all posts.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('" . implode( "', '", array_map( 'esc_sql', $post_types ) ) . "') LIMIT 1";
+		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ('".implode("', '", array_map('esc_sql', $post_types))."') LIMIT 1";
 
-		return null !== $wpdb->get_var( $wpdb->prepare( $check_sql, $slug ) );
+		return null !== $wpdb->get_var($wpdb->prepare($check_sql, $slug));
 	}
 
 }

src/modules/linked_data/wordlift_linked_data.php

Indentation +336 added lines, -336 removed lines

@@ -14,19 +14,19 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		return;
-	}
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        return;
+    }
 
-	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+    // unhook this function so it doesn't loop infinitely
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
 
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
 
-	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    // re-hook this function
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -40,143 +40,143 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		return;
-	}
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        return;
+    }
 
-	// get the current post.
-	$post = get_post( $post_id );
+    // get the current post.
+    $post = get_post( $post_id );
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
 
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( json_encode( $_POST['wl_entities'] ) );
+        wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
+        wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
+        wl_write_log( "]" );
 
-		$entities_via_post = $_POST['wl_entities'];
-		$boxes_via_post    = $_POST['wl_boxes'];
+        $entities_via_post = $_POST['wl_entities'];
+        $boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
 
-			// Only if the current entity is created from scratch let's avoid to create 
-			// more than one entity with same label & entity type
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
-				$entity['main_type'] : null;
-
-			// Look if current entity uri matches an internal existing entity, meaning:
-			// 1. when $entity_uri is an internal uri 
-			// 2. when $entity_uri is an external uri used as sameAs of an internal entity	
-			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
+            // Only if the current entity is created from scratch let's avoid to create 
+            // more than one entity with same label & entity type
+            $entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+                $entity['main_type'] : null;
+
+            // Look if current entity uri matches an internal existing entity, meaning:
+            // 1. when $entity_uri is an internal uri 
+            // 2. when $entity_uri is an external uri used as sameAs of an internal entity	
+            $ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
 
-			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
-				Wordlift_Entity_Service::get_instance()->build_uri(
-					$entity['label'],
-					Wordlift_Entity_Service::TYPE_NAME,
-					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+            // Detect the uri depending if is an existing or a new entity
+            $uri = ( null === $ie ) ?
+                Wordlift_Entity_Service::get_instance()->build_uri(
+                    $entity['label'],
+                    Wordlift_Entity_Service::TYPE_NAME,
+                    $entity_type
+                ) : wl_get_entity_uri( $ie->ID );
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+            wl_write_log( "Map $entity_uri on $uri" );
+            $entities_uri_mapping[ $entity_uri ] = $uri;
 
-			// Local entities have a tmp uri with 'local-entity-' prefix
-			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
-				// Override the entity obj
-				$entity['uri'] = $uri;
-			}
+            // Local entities have a tmp uri with 'local-entity-' prefix
+            // These uris need to be rewritten here and replaced in the content
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+                // Override the entity obj
+                $entity['uri'] = $uri;
+            }
 
-			// Update entity data with related post
-			$entity['related_post_id'] = $post_id;
+            // Update entity data with related post
+            $entity['related_post_id'] = $post_id;
 
-			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
-			}
+            // Save the entity if is a new entity
+            if ( null === $ie ) {
+                wl_save_entity( $entity );
+            }
 
-		}
+        }
 
-	}
+    }
 
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
-	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-	}
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+    // Save each entity and store the post id.
+    foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+        $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+    }
 
-	// Update the post content
-	wp_update_post( array(
-		'ID'           => $post->ID,
-		'post_content' => $updated_post_content,
-	) );
+    // Update the post content
+    wp_update_post( array(
+        'ID'           => $post->ID,
+        'post_content' => $updated_post_content,
+    ) );
 
-	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+    // Extract related/referenced entities from text.
+    $disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
 
-	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+    // Reset previously saved instances
+    wl_core_delete_relation_instances( $post_id );
 
-	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+    // Save relation instances
+    foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
 
-		wl_core_add_relation_instance(
-			$post_id,
-			Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
-			$referenced_entity_id
-		);
+        wl_core_add_relation_instance(
+            $post_id,
+            Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
+            $referenced_entity_id
+        );
 
-	}
+    }
 
-	if ( isset( $_POST['wl_entities'] ) ) {
-		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
-			$_POST['wl_metadata'] : array();
+    if ( isset( $_POST['wl_entities'] ) ) {
+        // Save post metadata if available
+        $metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+            $_POST['wl_metadata'] : array();
 
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC,
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	// Push the post to Redlink.
-	wl_linked_data_push_to_redlink( $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC,
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri = ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    // Push the post to Redlink.
+    wl_linked_data_push_to_redlink( $post->ID );
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -186,13 +186,13 @@ 
  */
 function wordlift_save_post_add_default_schema_type( $entity_id ) {
 
-	$entity      = get_post( $entity_id );
-	$entity_type = wl_schema_get_types( $entity_id );
+    $entity      = get_post( $entity_id );
+    $entity_type = wl_schema_get_types( $entity_id );
 
-	// Assign type 'Thing' if we are dealing with an entity without type
-	if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
-		wl_schema_set_types( $entity_id, 'Thing' );
-	}
+    // Assign type 'Thing' if we are dealing with an entity without type
+    if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
+        wl_schema_set_types( $entity_id, 'Thing' );
+    }
 
 }
 
@@ -218,180 +218,180 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	$uri              = $entity_data['uri'];
-	$label            = $entity_data['label'];
-	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
-	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? wl_force_to_array( $entity_data['image'] ) : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? wl_force_to_array( $entity_data['sameas'] ) : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
-
-	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		return $post;
-	}
-
-	// Prepare properties of the new entity.
-	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
-		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-		'post_title'   => $label,
-		'post_content' => $description,
-		'post_excerpt' => '',
-		// Ensure we're using a valid slug. We're not overwriting an existing
-		// entity with a post_name already set, since this call is made only for
-		// new entities.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
-	);
-
-	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
-	// the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
-	// Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
-	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
-	// is created when saving a post.
-	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		) );
-	}
-
-	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
-	// save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
-	// to the save_post and restore them after we saved the entity.
-	// see https://github.com/insideout10/wordlift-plugin/issues/203
-	// see https://github.com/insideout10/wordlift-plugin/issues/156
-	// see https://github.com/insideout10/wordlift-plugin/issues/148
-	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
-
-	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		), 10, 2 );
-	}
-
-	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		wl_write_log( ': error occurred' );
-
-		// inform an error occurred.
-		return null;
-	}
-
-	wl_set_entity_main_type( $post_id, $type_uri );
-
-	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
-
-	// Get a dataset URI for the entity.
-	$wl_uri = wl_build_entity_uri( $post_id );
-
-	// Save the entity URI.
-	wl_set_entity_uri( $post_id, $wl_uri );
-
-	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
-	}
-
-	$new_uri = wl_get_entity_uri( $post_id );
-
-	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
-
-	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	wl_write_log( "[ post id :: $post_id ][ uri :: $uri ][ label :: $label ][ wl uri :: $wl_uri ][ types :: " . implode( ',', $entity_types ) . " ][ images count :: " . count( $images ) . " ][ same_as count :: " . count( $same_as ) . " ]" );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = wl_save_image( $image_remote_url );
-
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
-
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
-
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+    $uri              = $entity_data['uri'];
+    $label            = $entity_data['label'];
+    $type_uri         = $entity_data['main_type'];
+    $entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+    $description      = $entity_data['description'];
+    $images           = isset( $entity_data['image'] ) ? wl_force_to_array( $entity_data['image'] ) : array();
+    $same_as          = isset( $entity_data['sameas'] ) ? wl_force_to_array( $entity_data['sameas'] ) : array();
+    $related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
+    $other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+
+    // Check whether an entity already exists with the provided URI.
+    if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
+        return $post;
+    }
+
+    // Prepare properties of the new entity.
+    $params = array(
+        'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+        'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+        'post_title'   => $label,
+        'post_content' => $description,
+        'post_excerpt' => '',
+        // Ensure we're using a valid slug. We're not overwriting an existing
+        // entity with a post_name already set, since this call is made only for
+        // new entities.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/282
+        'post_name'    => sanitize_title( $label ),
+    );
+
+    // If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
+    // the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
+    // Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
+    // This does NOT affect saving an entity from the entity admin page since this function is called when an entity
+    // is created when saving a post.
+    global $wpseo_metabox, $seo_ultimate;
+    if ( isset( $wpseo_metabox ) ) {
+        remove_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    if ( isset( $seo_ultimate ) ) {
+        remove_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ) );
+    }
+
+    // The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
+    // save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
+    // to the save_post and restore them after we saved the entity.
+    // see https://github.com/insideout10/wordlift-plugin/issues/203
+    // see https://github.com/insideout10/wordlift-plugin/issues/156
+    // see https://github.com/insideout10/wordlift-plugin/issues/148
+    global $wp_filter;
+    $save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Restore all the existing filters.
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+
+    // If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
+    if ( isset( $wpseo_metabox ) ) {
+        add_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    // If SEO Ultimate is installed, add back the hook we removed a few lines above.
+    if ( isset( $seo_ultimate ) ) {
+        add_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ), 10, 2 );
+    }
+
+    // TODO: handle errors.
+    if ( is_wp_error( $post_id ) ) {
+        wl_write_log( ': error occurred' );
+
+        // inform an error occurred.
+        return null;
+    }
+
+    wl_set_entity_main_type( $post_id, $type_uri );
+
+    // Save the entity types.
+    wl_set_entity_rdf_types( $post_id, $entity_types );
+
+    // Get a dataset URI for the entity.
+    $wl_uri = wl_build_entity_uri( $post_id );
+
+    // Save the entity URI.
+    wl_set_entity_uri( $post_id, $wl_uri );
+
+    // Add the uri to the sameAs data if it's not a local URI.
+    if ( $wl_uri !== $uri ) {
+        array_push( $same_as, $uri );
+    }
+
+    $new_uri = wl_get_entity_uri( $post_id );
+
+    // Save the sameAs data for the entity.
+    wl_schema_set_value( $post_id, 'sameAs', $same_as );
+
+    // Save the other properties (latitude, langitude, startDate, endDate, etc.)
+    foreach ( $other_properties as $property_name => $property_value ) {
+        wl_schema_set_value( $post_id, $property_name, $property_value );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    wl_write_log( "[ post id :: $post_id ][ uri :: $uri ][ label :: $label ][ wl uri :: $wl_uri ][ types :: " . implode( ',', $entity_types ) . " ][ images count :: " . count( $images ) . " ][ same_as count :: " . count( $same_as ) . " ]" );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = wl_save_image( $image_remote_url );
+
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
+
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
+
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
 
-		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
-	}
+        // Set it as the featured image.
+        set_post_thumbnail( $post_id, $attachment_id );
+    }
 
-	// The entity is pushed to Redlink on save by the function hooked to save_post.
-	// save the entity in the triple store.
-	wl_linked_data_push_to_redlink( $post_id );
+    // The entity is pushed to Redlink on save by the function hooked to save_post.
+    // save the entity in the triple store.
+    wl_linked_data_push_to_redlink( $post_id );
 
-	// finally return the entity post.
-	return get_post( $post_id );
+    // finally return the entity post.
+    return get_post( $post_id );
 }
 
 /**
@@ -405,42 +405,42 @@ 
  */
 function wl_linked_data_content_get_embedded_entities( $content ) {
 
-	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+    // Remove quote escapes.
+    $content = str_replace( '\\"', '"', $content );
 
-	// Match all itemid attributes.
-	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
+    // Match all itemid attributes.
+    $pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
 
-	//	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
+    //	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
 
-	// Remove the pattern while it is found (match nested annotations).
-	$matches = array();
+    // Remove the pattern while it is found (match nested annotations).
+    $matches = array();
 
-	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+    // In case of errors, return an empty array.
+    if ( false === preg_match_all( $pattern, $content, $matches ) ) {
+        wl_write_log( "Found no entities embedded in content" );
 
-		return array();
-	}
+        return array();
+    }
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	// Collect the entities.
-	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+    // Collect the entities.
+    $entities = array();
+    foreach ( $matches[1] as $uri ) {
+        $uri_d = html_entity_decode( $uri );
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
-		}
-	}
+        if ( null !== $entity ) {
+            array_push( $entities, $entity->ID );
+        }
+    }
 
-	// $count = sizeof( $entities );
-	// wl_write_log( "Found $count entities embedded in content" );
+    // $count = sizeof( $entities );
+    // wl_write_log( "Found $count entities embedded in content" );
 
-	return $entities;
+    return $entities;
 }
 
 /**
@@ -452,22 +452,22 @@ 
  */
 function wl_linked_data_push_to_redlink( $post_id ) {
 
-	// Get the post.
-	$post = get_post( $post_id );
+    // Get the post.
+    $post = get_post( $post_id );
 
-	// wl_write_log( "wl_linked_data_push_to_redlink [ post id :: $post_id ][ post type :: $post->post_type ]" );
+    // wl_write_log( "wl_linked_data_push_to_redlink [ post id :: $post_id ][ post type :: $post->post_type ]" );
 
-	// Call the method on behalf of the post type.
-	switch ( $post->post_type ) {
-		case 'entity':
-			wl_push_entity_post_to_redlink( $post );
-			break;
-		default:
-			wl_push_post_to_redlink( $post );
-	}
+    // Call the method on behalf of the post type.
+    switch ( $post->post_type ) {
+        case 'entity':
+            wl_push_entity_post_to_redlink( $post );
+            break;
+        default:
+            wl_push_post_to_redlink( $post );
+    }
 
-	// Reindex the triple store if buffering is turned off.
-	if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
-		wordlift_reindex_triple_store();
-	}
+    // Reindex the triple store if buffering is turned off.
+    if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+        wordlift_reindex_triple_store();
+    }
 }

Spacing +123 added lines, -123 removed lines

@@ -3,7 +3,7 @@ 
  * The Linked Data module provides synchronization of local WordPress data with the remote Linked Data store.
  */
 
-require_once( 'wordlift_linked_data_images.php' );
+require_once('wordlift_linked_data_images.php');
 
 /**
  * Receive events from post saves, and split them according to the post type.
@@ -12,24 +12,24 @@ 
  *
  * @param int $post_id The post id.
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
 		return;
 	}
 
 	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -38,17 +38,17 @@ 
  *
  * @param int $post_id The post id being saved.
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -56,44 +56,44 @@ 
 	$entities_uri_mapping = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 		$boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
 			// Only if the current entity is created from scratch let's avoid to create 
 			// more than one entity with same label & entity type
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+			$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
 				$entity['main_type'] : null;
 
 			// Look if current entity uri matches an internal existing entity, meaning:
 			// 1. when $entity_uri is an internal uri 
 			// 2. when $entity_uri is an external uri used as sameAs of an internal entity	
-			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
+			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($entity_uri);
 
 			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
+			$uri = (null === $ie) ?
 				Wordlift_Entity_Service::get_instance()->build_uri(
 					$entity['label'],
 					Wordlift_Entity_Service::TYPE_NAME,
 					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+				) : wl_get_entity_uri($ie->ID);
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 			// Local entities have a tmp uri with 'local-entity-' prefix
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Override the entity obj
 				$entity['uri'] = $uri;
 			}
@@ -102,8 +102,8 @@ 
 			$entity['related_post_id'] = $post_id;
 
 			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
+			if (null === $ie) {
+				wl_save_entity($entity);
 			}
 
 		}
@@ -113,36 +113,36 @@ 
 	// Replace tmp uris in content post if needed
 	$updated_post_content = $post->post_content;
 	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+	foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+		$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 	}
 
 	// Update the post content
-	wp_update_post( array(
+	wp_update_post(array(
 		'ID'           => $post->ID,
 		'post_content' => $updated_post_content,
-	) );
+	));
 
 	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+	$disambiguated_entities = wl_linked_data_content_get_embedded_entities($updated_post_content);
 
 	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+	foreach (array_unique($disambiguated_entities) as $referenced_entity_id) {
 
 		wl_core_add_relation_instance(
 			$post_id,
-			Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
+			Wordlift_Entity_Service::get_instance()->get_classification_scope_for($referenced_entity_id),
 			$referenced_entity_id
 		);
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) {
+	if (isset($_POST['wl_entities'])) {
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ?
 			$_POST['wl_metadata'] : array();
 
 		$fields = array(
@@ -151,54 +151,54 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if ($field === Wordlift_Schema_Service::FIELD_TOPIC) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
 	// Push the post to Redlink.
-	wl_linked_data_push_to_redlink( $post->ID );
+	wl_linked_data_push_to_redlink($post->ID);
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Adds default schema type "Thing" as soon as an entity is created.
  */
-function wordlift_save_post_add_default_schema_type( $entity_id ) {
+function wordlift_save_post_add_default_schema_type($entity_id) {
 
-	$entity      = get_post( $entity_id );
-	$entity_type = wl_schema_get_types( $entity_id );
+	$entity      = get_post($entity_id);
+	$entity_type = wl_schema_get_types($entity_id);
 
 	// Assign type 'Thing' if we are dealing with an entity without type
-	if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
-		wl_schema_set_types( $entity_id, 'Thing' );
+	if ($entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null($entity_type)) {
+		wl_schema_set_types($entity_id, 'Thing');
 	}
 
 }
 
 // Priority 1 (default is 10) because we want the default type to be set as soon as possible
 // Attatched to save_post because *wl_linked_data_save_post* does not always fire
-add_action( 'save_post', 'wordlift_save_post_add_default_schema_type', 1 );
+add_action('save_post', 'wordlift_save_post_add_default_schema_type', 1);
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -216,26 +216,26 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
 	$uri              = $entity_data['uri'];
 	$label            = $entity_data['label'];
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? wl_force_to_array( $entity_data['image'] ) : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? wl_force_to_array( $entity_data['sameas'] ) : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+	$images           = isset($entity_data['image']) ? wl_force_to_array($entity_data['image']) : array();
+	$same_as          = isset($entity_data['sameas']) ? wl_force_to_array($entity_data['sameas']) : array();
+	$related_post_id  = isset($entity_data['related_post_id']) ? $entity_data['related_post_id'] : null;
+	$other_properties = isset($entity_data['properties']) ? $entity_data['properties'] : array();
 
 	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
+	if (null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri)) {
 		return $post;
 	}
 
 	// Prepare properties of the new entity.
 	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+		'post_status'  => (is_numeric($related_post_id) ? get_post_status($related_post_id) : 'draft'),
 		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
 		'post_title'   => $label,
 		'post_content' => $description,
@@ -245,7 +245,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -254,18 +254,18 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		remove_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		remove_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		) );
+		));
 	}
 
 	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
@@ -275,88 +275,88 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		add_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		add_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		), 10, 2 );
+		), 10, 2);
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		wl_write_log( ': error occurred' );
+	if (is_wp_error($post_id)) {
+		wl_write_log(': error occurred');
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = wl_build_entity_uri( $post_id );
+	$wl_uri = wl_build_entity_uri($post_id);
 
 	// Save the entity URI.
-	wl_set_entity_uri( $post_id, $wl_uri );
+	wl_set_entity_uri($post_id, $wl_uri);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
+	if ($wl_uri !== $uri) {
+		array_push($same_as, $uri);
 	}
 
-	$new_uri = wl_get_entity_uri( $post_id );
+	$new_uri = wl_get_entity_uri($post_id);
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	wl_write_log( "[ post id :: $post_id ][ uri :: $uri ][ label :: $label ][ wl uri :: $wl_uri ][ types :: " . implode( ',', $entity_types ) . " ][ images count :: " . count( $images ) . " ][ same_as count :: " . count( $same_as ) . " ]" );
+	wl_write_log("[ post id :: $post_id ][ uri :: $uri ][ label :: $label ][ wl uri :: $wl_uri ][ types :: ".implode(',', $entity_types)." ][ images count :: ".count($images)." ][ same_as count :: ".count($same_as)." ]");
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = wl_save_image( $image_remote_url );
+		$image = wl_save_image($image_remote_url);
 
 		// Get the local URL.
 		$filename     = $image['path'];
@@ -374,24 +374,24 @@ 
 		);
 
 		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+		$attachment_id = wp_insert_attachment($attachment, $filename, $post_id);
 
 		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+		wl_set_source_url($attachment_id, $image_remote_url);
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
+		set_post_thumbnail($post_id, $attachment_id);
 	}
 
 	// The entity is pushed to Redlink on save by the function hooked to save_post.
 	// save the entity in the triple store.
-	wl_linked_data_push_to_redlink( $post_id );
+	wl_linked_data_push_to_redlink($post_id);
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }
 
 /**
@@ -403,10 +403,10 @@ 
  *
  * @return array An array of entity posts.
  */
-function wl_linked_data_content_get_embedded_entities( $content ) {
+function wl_linked_data_content_get_embedded_entities($content) {
 
 	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+	$content = str_replace('\\"', '"', $content);
 
 	// Match all itemid attributes.
 	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
@@ -417,8 +417,8 @@ 
 	$matches = array();
 
 	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+	if (false === preg_match_all($pattern, $content, $matches)) {
+		wl_write_log("Found no entities embedded in content");
 
 		return array();
 	}
@@ -427,13 +427,13 @@ 
 
 	// Collect the entities.
 	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+	foreach ($matches[1] as $uri) {
+		$uri_d = html_entity_decode($uri);
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri_d);
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
+		if (null !== $entity) {
+			array_push($entities, $entity->ID);
 		}
 	}
 
@@ -450,24 +450,24 @@ 
  *
  * @param int $post_id The post ID.
  */
-function wl_linked_data_push_to_redlink( $post_id ) {
+function wl_linked_data_push_to_redlink($post_id) {
 
 	// Get the post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
 	// wl_write_log( "wl_linked_data_push_to_redlink [ post id :: $post_id ][ post type :: $post->post_type ]" );
 
 	// Call the method on behalf of the post type.
-	switch ( $post->post_type ) {
+	switch ($post->post_type) {
 		case 'entity':
-			wl_push_entity_post_to_redlink( $post );
+			wl_push_entity_post_to_redlink($post);
 			break;
 		default:
-			wl_push_post_to_redlink( $post );
+			wl_push_post_to_redlink($post);
 	}
 
 	// Reindex the triple store if buffering is turned off.
-	if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+	if (false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 		wordlift_reindex_triple_store();
 	}
 }