insideout10 / wordlift-plugin

src/admin/wordlift_admin.php

Indentation +29 added lines, -29 removed lines

@@ -15,21 +15,21 @@ 
  */
 function wl_serialize_entity( $entity ) {
 
-	$entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
+    $entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
 	
-	$type   = wl_entity_type_taxonomy_get_type( $entity->ID );
-	$images = wl_get_image_urls( $entity->ID );
+    $type   = wl_entity_type_taxonomy_get_type( $entity->ID );
+    $images = wl_get_image_urls( $entity->ID );
 
-	return array(
-		'id'         	=> wl_get_entity_uri( $entity->ID ),
-		'label'      	=> $entity->post_title,
-		'description'	=> $entity->post_content,
-		'sameAs'     	=> wl_schema_get_value( $entity->ID, 'sameAs' ),
-		'mainType'      => str_replace( 'wl-', '', $type['css_class'] ),
-		'types'      	=> wl_get_entity_rdf_types( $entity->ID ),
-		'images' 		=> $images,
+    return array(
+        'id'         	=> wl_get_entity_uri( $entity->ID ),
+        'label'      	=> $entity->post_title,
+        'description'	=> $entity->post_content,
+        'sameAs'     	=> wl_schema_get_value( $entity->ID, 'sameAs' ),
+        'mainType'      => str_replace( 'wl-', '', $type['css_class'] ),
+        'types'      	=> wl_get_entity_rdf_types( $entity->ID ),
+        'images' 		=> $images,
 
-	);
+    );
 }
 
 /**
@@ -43,23 +43,23 @@ 
  */
 function wl_remove_text_annotations( $data ) {
 
-	// Remove blank elements that can interfere with annoataions removing
-	// See https://github.com/insideout10/wordlift-plugin/issues/234
-	// Just blank attributes without any attribtues are cleaned up
-	$pattern = '/<(\w+)><\/\1>/im';
-	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
-	}
-	// Remove text annotations
-	//    <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">
-	$pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?!\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
-	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
-	}
+    // Remove blank elements that can interfere with annoataions removing
+    // See https://github.com/insideout10/wordlift-plugin/issues/234
+    // Just blank attributes without any attribtues are cleaned up
+    $pattern = '/<(\w+)><\/\1>/im';
+    // Remove the pattern while it is found (match nested annotations).
+    while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
+        $data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+    }
+    // Remove text annotations
+    //    <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">
+    $pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?!\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
+    // Remove the pattern while it is found (match nested annotations).
+    while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
+        $data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+    }
 
-	return $data;
+    return $data;
 }
 
 add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
@@ -75,5 +75,5 @@ 
  */
 function wl_admin_metaboxes_add_css_class( $classes = array() ){
 	
-	return array_merge( $classes, array( 'wl-metabox' ) );
+    return array_merge( $classes, array( 'wl-metabox' ) );
 }

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  */
 
 // Add the Admin menu.
-require_once( 'wordlift_admin_menu.php' );
+require_once('wordlift_admin_menu.php');
 
 /**
  * Serialize an entity post.
@@ -13,20 +13,20 @@ 
  *
  * @return array mixed The entity data array.
  */
-function wl_serialize_entity( $entity ) {
+function wl_serialize_entity($entity) {
 
-	$entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
+	$entity = (is_numeric($entity)) ? get_post($entity) : $entity;
 	
-	$type   = wl_entity_type_taxonomy_get_type( $entity->ID );
-	$images = wl_get_image_urls( $entity->ID );
+	$type   = wl_entity_type_taxonomy_get_type($entity->ID);
+	$images = wl_get_image_urls($entity->ID);
 
 	return array(
-		'id'         	=> wl_get_entity_uri( $entity->ID ),
+		'id'         	=> wl_get_entity_uri($entity->ID),
 		'label'      	=> $entity->post_title,
 		'description'	=> $entity->post_content,
-		'sameAs'     	=> wl_schema_get_value( $entity->ID, 'sameAs' ),
-		'mainType'      => str_replace( 'wl-', '', $type['css_class'] ),
-		'types'      	=> wl_get_entity_rdf_types( $entity->ID ),
+		'sameAs'     	=> wl_schema_get_value($entity->ID, 'sameAs'),
+		'mainType'      => str_replace('wl-', '', $type['css_class']),
+		'types'      	=> wl_get_entity_rdf_types($entity->ID),
 		'images' 		=> $images,
 
 	);
@@ -41,28 +41,28 @@ 
  *
  * @return array mixed The post data array.
  */
-function wl_remove_text_annotations( $data ) {
+function wl_remove_text_annotations($data) {
 
 	// Remove blank elements that can interfere with annoataions removing
 	// See https://github.com/insideout10/wordlift-plugin/issues/234
 	// Just blank attributes without any attribtues are cleaned up
 	$pattern = '/<(\w+)><\/\1>/im';
 	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+	while (1 === preg_match($pattern, $data['post_content'])) {		
+		$data['post_content'] = preg_replace($pattern, '$2', $data['post_content'], -1, $count); 
 	}
 	// Remove text annotations
 	//    <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">
 	$pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?!\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
 	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+	while (1 === preg_match($pattern, $data['post_content'])) {		
+		$data['post_content'] = preg_replace($pattern, '$2', $data['post_content'], -1, $count); 
 	}
 
 	return $data;
 }
 
-add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
+add_filter('wp_insert_post_data', 'wl_remove_text_annotations', '98', 1);
 
 /**
  * Adds wl-metabox CSS class to a metabox.
@@ -73,7 +73,7 @@ 
  *
  * @return array The updated list of CSS classes.
  */
-function wl_admin_metaboxes_add_css_class( $classes = array() ){
+function wl_admin_metaboxes_add_css_class($classes = array()) {
 	
-	return array_merge( $classes, array( 'wl-metabox' ) );
+	return array_merge($classes, array('wl-metabox'));
 }

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

Doc Comments +5 added lines, -5 removed lines

@@ -154,6 +154,8 @@ 
 	 * @since 3.2.0
 	 *
 	 * @param \Wordlift_UI_Service $ui_service The UI service.
+	 * @param Wordlift_Schema_Service $schema_service
+	 * @param Wordlift_Notice_Service $notice_service
 	 */
 	public function __construct( $ui_service, $schema_service, $notice_service ) {
 
@@ -236,7 +238,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 ) {
 
@@ -250,7 +252,7 @@ 
 	 *
 	 * @param int $uri An uri.
 	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
+	 * @return boolean if the uri internal to the current dataset otherwise false.
 	 */
 	public function is_internal_uri( $uri ) {
 
@@ -409,7 +411,6 @@ 
 	 *
 	 * @since 3.3.0
 	 *
-	 * @param WP_Post $post Post object.
 	 */
 	public function in_admin_header() {
 
@@ -470,7 +471,6 @@ 
 	 * @since 3.3.0
 	 *
 	 * @param int $post_id The entity post id.
-	 * @param $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
 	 *
 	 * @return int An array representing the rating obj.
 	 */
@@ -620,7 +620,7 @@ 
 	 *
 	 * @param int $score The rating score for a given entity.
 	 *
-	 * @return string The input HTML code.
+	 * @return double The input HTML code.
 	 */
 	private function convert_raw_score_to_percentage( $score ) {
 		// RATING_MAX : $score = 100 : x 

Indentation +602 added lines, -602 removed lines

@@ -7,637 +7,637 @@
  */
 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 Schema service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	private $schema_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The entity post type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const TYPE_NAME = 'entity';
-
-	/**
-	 * Entity rating max.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_MAX = 7;
+    /**
+     * 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 Schema service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    private $schema_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The entity post type name.
+     *
+     * @since 3.1.0
+     */
+    const TYPE_NAME = 'entity';
+
+    /**
+     * Entity rating max.
+     *
+     * @since 3.3.0
+     */
+    const RATING_MAX = 7;
 	
-	/**
-	 * Entity rating score meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
+    /**
+     * Entity rating score meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
 	
-	/**
-	 * Entity rating warnings meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
-
-	/**
-	 * Entity warning has related post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
-
-	/**
-	 * Entity warning has content post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
-
-	/**
-	 * Entity warning has related entities identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
-
-	/**
-	 * Entity warning is published identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
-
-	/**
-	 * Entity warning has thumbnail identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
-
-	/**
-	 * Entity warning has same as identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
-
-	/**
-	 * Entity warning has completed metadata identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
-
-	/**
-	 * The alternative label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
-
-	/**
-	 * The alternative label input template.
-	 *
-	 * @since 3.2.0
-	 */
-	// TODO: this should be moved to a class that deals with HTML code.
-	const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
+    /**
+     * Entity rating warnings meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
+
+    /**
+     * Entity warning has related post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
+
+    /**
+     * Entity warning has content post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
+
+    /**
+     * Entity warning has related entities identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
+
+    /**
+     * Entity warning is published identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
+
+    /**
+     * Entity warning has thumbnail identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
+
+    /**
+     * Entity warning has same as identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
+
+    /**
+     * Entity warning has completed metadata identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
+
+    /**
+     * The alternative label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
+
+    /**
+     * The alternative label input template.
+     *
+     * @since 3.2.0
+     */
+    // TODO: this should be moved to a class that deals with HTML code.
+    const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
                 <label class="screen-reader-text" id="wl-alternative-label-prompt-text" for="wl-alternative-label">Enter alternative label here</label>
                 <input name="wl_alternative_label[]" size="30" value="%s" id="wl-alternative-label" type="text">
                 <button class="button wl-delete-button">%s</button>
                 </div>';
 
-	/**
-	 * A singleton instance of the Entity service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Entity_Service instance.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	public function __construct( $ui_service, $schema_service, $notice_service ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		// Set the UI service.
-		$this->ui_service = $ui_service;
-
-		// Set the Schema service.
-		$this->schema_service = $schema_service;
-
-		// Set the Schema service.
-		$this->notice_service = $notice_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 rating max 
-	 *
-	 * @since 3.3.0
-	 *
-	 * @return int Max rating according to performed checks.
-	 */
-	public static function get_rating_max() {
-		return self::RATING_MAX;
-	}
-
-	/**
-	 * 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 ) );
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @since 3.3.2
-	 *
-	 * @param int $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 */
-	public function is_internal_uri( $uri ) {
-
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 */
-	public function get_entity_post_by_uri( $uri ) {
-
-		$query_args = array(
-			'posts_per_page'	=> 1,
-			'post_status'		=> 'any',
-			'post_type'			=> self::TYPE_NAME,
-			'meta_query'		=> array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uri,
-					'compare' => '='
-				)
-			)
-		);
-
-		// Only if the current uri is not an internal uri 
-		// entity search is performed also looking at sameAs values
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( !$this->is_internal_uri( $uri ) ) {
+    /**
+     * 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, $schema_service, $notice_service ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        // Set the UI service.
+        $this->ui_service = $ui_service;
+
+        // Set the Schema service.
+        $this->schema_service = $schema_service;
+
+        // Set the Schema service.
+        $this->notice_service = $notice_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 rating max 
+     *
+     * @since 3.3.0
+     *
+     * @return int Max rating according to performed checks.
+     */
+    public static function get_rating_max() {
+        return self::RATING_MAX;
+    }
+
+    /**
+     * 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 ) );
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @since 3.3.2
+     *
+     * @param int $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     */
+    public function is_internal_uri( $uri ) {
+
+        return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @since 3.2.0
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     */
+    public function get_entity_post_by_uri( $uri ) {
+
+        $query_args = array(
+            'posts_per_page'	=> 1,
+            'post_status'		=> 'any',
+            'post_type'			=> self::TYPE_NAME,
+            'meta_query'		=> array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uri,
+                    'compare' => '='
+                )
+            )
+        );
+
+        // Only if the current uri is not an internal uri 
+        // entity search is performed also looking at sameAs values
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( !$this->is_internal_uri( $uri ) ) {
 		
-			$query_args[ 'meta_query' ][ 'relation' ] = 'OR';
-			$query_args[ 'meta_query' ][] = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $uri,
-				'compare' => '='
-			);
-		} 
-
-		$query = new WP_Query( $query_args );
-
-		// Get the matching entity posts.
-		$posts = $query->get_posts();
-
-		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
-			return null;
-		}
-
-		// Return the found post.
-		return $posts[0];
-	}
-
-	/**
-	 * Fires once a post has been saved.
-	 *
-	 * @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.
-	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+            $query_args[ 'meta_query' ][ 'relation' ] = 'OR';
+            $query_args[ 'meta_query' ][] = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $uri,
+                'compare' => '='
+            );
+        } 
+
+        $query = new WP_Query( $query_args );
+
+        // Get the matching entity posts.
+        $posts = $query->get_posts();
+
+        // Return null if no post is found.
+        if ( 0 === count( $posts ) ) {
+            return null;
+        }
+
+        // Return the found post.
+        return $posts[0];
+    }
+
+    /**
+     * Fires once a post has been saved.
+     *
+     * @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.
+     */
+    public function set_alternative_labels( $post_id, $alt_labels ) {
 		
-		// Force $alt_labels to be an array
-		if( !is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
-		}
+        // Force $alt_labels to be an array
+        if( !is_array( $alt_labels ) ) {
+            $alt_labels = array( $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::ALTERNATIVE_LABEL_META_KEY );
+        // Delete all the existing alternate labels.
+        delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
 		
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
-			}
-		}
-
-	}
-
-	/**
-	 * Retrieve the alternate labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id Post id.
-	 *
-	 * @return mixed An array  of alternative labels.
-	 */
-	public function get_alternative_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-	}
-
-	/**
-	 * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public function edit_form_before_permalink( $post ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-
-		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
-
-		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
-
-			echo $this->get_alternative_label_input( $alt_label );
-
-		};
-
-		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
-
-	}
-
-	/**
-	 * Add admin notices for the current entity depending on the current rating.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public function in_admin_header() {
-
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
-
-		// If you're not in the entity post edit page, return.
-		if ( self::TYPE_NAME !== get_current_screen()->id ) {
-			return;
-		}
-		// Retrieve the current global post
-		global $post;
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
-		// If there is at least 1 warning
-		if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
-			// TODO - Pass Wordlift_Notice_Service trough the service constructor 
-			$this->notice_service->add_suggestion( $rating[ 'warnings' ] );
-		}
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+            }
+        }
+
+    }
+
+    /**
+     * Retrieve the alternate labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id Post id.
+     *
+     * @return mixed An array  of alternative labels.
+     */
+    public function get_alternative_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+    }
+
+    /**
+     * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
+     *
+     * @since 3.2.0
+     *
+     * @param WP_Post $post Post object.
+     */
+    public function edit_form_before_permalink( $post ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+
+        // Print the input template.
+        $this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+
+        // Print all the currently set alternative labels.
+        foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+
+            echo $this->get_alternative_label_input( $alt_label );
+
+        };
+
+        // Print the button.
+        $this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+
+    }
+
+    /**
+     * Add admin notices for the current entity depending on the current rating.
+     *
+     * @since 3.3.0
+     *
+     * @param WP_Post $post Post object.
+     */
+    public function in_admin_header() {
+
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( FALSE === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
+
+        // If you're not in the entity post edit page, return.
+        if ( self::TYPE_NAME !== get_current_screen()->id ) {
+            return;
+        }
+        // Retrieve the current global post
+        global $post;
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+        // Retrieve an updated rating for the current entity
+        $rating = $this->get_rating_for( $post->ID, true );
+        // If there is at least 1 warning
+        if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
+            // TODO - Pass Wordlift_Notice_Service trough the service constructor 
+            $this->notice_service->add_suggestion( $rating[ 'warnings' ] );
+        }
 		
-	}
+    }
 	
-	/**
-	 * Set rating for a given entity
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return int An array representing the rating obj.
-	 */
-	public function set_rating_for( $post_id ) {
-
-		// Calculate rating for the given post
-		$rating = $this->calculate_rating_for( $post_id );
-		// Store the rating on db as post meta
-		// Please notice that RATING_RAW_SCORE_META_KEY 
-		// is saved on a different meta to allow score sorting
-		// Both meta are managed as unique
-		// https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
+    /**
+     * Set rating for a given entity
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return int An array representing the rating obj.
+     */
+    public function set_rating_for( $post_id ) {
+
+        // Calculate rating for the given post
+        $rating = $this->calculate_rating_for( $post_id );
+        // Store the rating on db as post meta
+        // Please notice that RATING_RAW_SCORE_META_KEY 
+        // is saved on a different meta to allow score sorting
+        // Both meta are managed as unique
+        // https://codex.wordpress.org/Function_Reference/update_post_meta
+        update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
+        update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
 		
-		$this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
+        $this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
 		
-		// Finally returns the rating 
-		return $rating;
-	}
-	/**
-	 * Get or calculate rating for a given entity
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 * @param $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
-	 *
-	 * @return int An array representing the rating obj.
-	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+        // Finally returns the rating 
+        return $rating;
+    }
+    /**
+     * Get or calculate rating for a given entity
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     * @param $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
+     *
+     * @return int An array representing the rating obj.
+     */
+    public function get_rating_for( $post_id, $force_reload = false ) {
 		
-		// If forced reload is required or rating is missing ..
-		if ( $force_reload ) {
-			$this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
-			return $this->set_rating_for( $post_id );
-		}
+        // If forced reload is required or rating is missing ..
+        if ( $force_reload ) {
+            $this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
+            return $this->set_rating_for( $post_id );
+        }
 		
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
+        $current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
 			
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-			return $this->set_rating_for( $post_id );
-		}
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
+        if ( ! is_numeric( $current_raw_score ) ) {
+            $this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
+            return $this->set_rating_for( $post_id );
+        }
+        $current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
 		
-		// Finally return score and warnings
-		return array( 
-			'raw_score'				=> $current_raw_score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
-			'warnings'				=> $current_warnings, 
-		);
-
-	}
-	/**
-	 * Calculate rating for a given entity
-	 * Rating depends from following criteria
-	 *
-	 * 1. Is the current entity related to at least 1 post?
-	 * 2. Is the current entity content post not empty?
-	 * 3. Is the current entity related to at least 1 entity?
-	 * 4. Is the entity published? 
-	 * 5. There is a a thumbnail associated to the entity?
-	 * 6. Has the entity a sameas defined?
-	 * 7. Are all schema.org required metadata compiled?
-	 *
-	 * Each positive check means +1 in terms of rating score
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return int An array representing the rating obj.
-	 */
-	public function calculate_rating_for( $post_id ) {
+        // Finally return score and warnings
+        return array( 
+            'raw_score'				=> $current_raw_score,
+            'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
+            'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
+            'warnings'				=> $current_warnings, 
+        );
+
+    }
+    /**
+     * Calculate rating for a given entity
+     * Rating depends from following criteria
+     *
+     * 1. Is the current entity related to at least 1 post?
+     * 2. Is the current entity content post not empty?
+     * 3. Is the current entity related to at least 1 entity?
+     * 4. Is the entity published? 
+     * 5. There is a a thumbnail associated to the entity?
+     * 6. Has the entity a sameas defined?
+     * 7. Are all schema.org required metadata compiled?
+     *
+     * Each positive check means +1 in terms of rating score
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return int An array representing the rating obj.
+     */
+    public function calculate_rating_for( $post_id ) {
 		
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-		// Retrieve the post object
-		$post = get_post( $post_id );
-		// Rating value
-		$score = 0;
-		// Store warning messages
-		$warnings = array();
-
-		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score++ : 
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+        // Retrieve the post object
+        $post = get_post( $post_id );
+        // Rating value
+        $score = 0;
+        // Store warning messages
+        $warnings = array();
+
+        // Is the current entity related to at least 1 post?
+        ( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
+            $score++ : 
+            array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
 		
-		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+        // Is the post content not empty?
+        ( ! empty( $post->post_content ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
 		
-		// Is the current entity related to at least 1 entity?
-		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+        // Is the current entity related to at least 1 entity?
+        // Was the current entity already disambiguated?
+        ( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
 		
-		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+        // Is the entity published?
+        ( 'publish' === get_post_status( $post->ID ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
 		
-		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+        // Has a thumbnail?
+        ( has_post_thumbnail( $post->ID ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
 		
-		// Get all post meta keys for the current post		
-		global $wpdb;
-		$query = $wpdb->prepare( 
-			"SELECT DISTINCT(meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID 
-		);
+        // Get all post meta keys for the current post		
+        global $wpdb;
+        $query = $wpdb->prepare( 
+            "SELECT DISTINCT(meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID 
+        );
 		
-		// Check intersection between available meta keys 
-		// and expected ones arrays to detect missing values
-		$available_meta_keys = $wpdb->get_col( $query );
-
-		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+        // Check intersection between available meta keys 
+        // and expected ones arrays to detect missing values
+        $available_meta_keys = $wpdb->get_col( $query );
+
+        // If each expected key is contained in available keys array ...
+        ( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
 		
-		$schema = wl_entity_type_taxonomy_get_type( $post_id );
+        $schema = wl_entity_type_taxonomy_get_type( $post_id );
 
-		$expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
-			array() : 
-			array_keys( $schema[ 'custom_fields' ] );
+        $expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
+            array() : 
+            array_keys( $schema[ 'custom_fields' ] );
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
-		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+        $intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+        // If each expected key is contained in available keys array ...
+        ( count( $intersection ) === count( $expected_meta_keys ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
 		
-		// Finally return score and warnings
-		return array( 
-			'raw_score'				=> $score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
-			'warnings'				=> $warnings, 
-		);
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
-		// RATING_MAX : $score = 3 : x 
-		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
-		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating; 
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 */
-	public function convert_raw_score_to_percentage( $score ) {
-		// RATING_MAX : $score = 100 : x 
-		return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
-	}
-
-	/**
-	 * 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' ) );
-	}
+        // Finally return score and warnings
+        return array( 
+            'raw_score'				=> $score,
+            'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
+            'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
+            'warnings'				=> $warnings, 
+        );
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @since 3.3.0
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     */
+    private function convert_raw_score_to_traffic_light( $score ) {
+        // RATING_MAX : $score = 3 : x 
+        // See http://php.net/manual/en/function.round.php
+        $rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+        // If rating is 0, return 1, otherwise return rating
+        return ( 0 == $rating ) ? 1 : $rating; 
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @since 3.3.0
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     */
+    public function convert_raw_score_to_percentage( $score ) {
+        // RATING_MAX : $score = 100 : x 
+        return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+    }
+
+    /**
+     * 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 +91 added lines, -99 removed lines

@@ -155,9 +155,9 @@ 
 	 *
 	 * @param \Wordlift_UI_Service $ui_service The UI service.
 	 */
-	public function __construct( $ui_service, $schema_service, $notice_service ) {
+	public function __construct($ui_service, $schema_service, $notice_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;
@@ -206,24 +206,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;
@@ -238,9 +238,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));
 	}
 
 	/**
@@ -252,9 +252,9 @@ 
 	 *
 	 * @return true if the uri internal to the current dataset otherwise false.
 	 */
-	public function is_internal_uri( $uri ) {
+	public function is_internal_uri($uri) {
 
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+		return (0 === strrpos($uri, wl_configuration_get_redlink_dataset_uri()));
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 	 *
 	 * @return WP_Post|null A WP_Post instance or null if not found.
 	 */
-	public function get_entity_post_by_uri( $uri ) {
+	public function get_entity_post_by_uri($uri) {
 
 		$query_args = array(
 			'posts_per_page'	=> 1,
@@ -284,23 +284,23 @@ 
 		// Only if the current uri is not an internal uri 
 		// entity search is performed also looking at sameAs values
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( !$this->is_internal_uri( $uri ) ) {
+		if ( ! $this->is_internal_uri($uri)) {
 		
-			$query_args[ 'meta_query' ][ 'relation' ] = 'OR';
-			$query_args[ 'meta_query' ][] = array(
+			$query_args['meta_query']['relation'] = 'OR';
+			$query_args['meta_query'][] = array(
 				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
 				'value'   => $uri,
 				'compare' => '='
 			);
 		} 
 
-		$query = new WP_Query( $query_args );
+		$query = new WP_Query($query_args);
 
 		// Get the matching entity posts.
 		$posts = $query->get_posts();
 
 		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
+		if (0 === count($posts)) {
 			return null;
 		}
 
@@ -317,18 +317,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);
 
 	}
 
@@ -340,22 +340,22 @@ 
 	 * @param int $post_id The post id.
 	 * @param array $alt_labels An array of labels.
 	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+	public function set_alternative_labels($post_id, $alt_labels) {
 		
 		// Force $alt_labels to be an array
-		if( !is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
+		if ( ! is_array($alt_labels)) {
+			$alt_labels = array($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::ALTERNATIVE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 		
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+		foreach ($alt_labels as $alt_label) {
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label);
 			}
 		}
 
@@ -370,9 +370,9 @@ 
 	 *
 	 * @return mixed An array  of alternative labels.
 	 */
-	public function get_alternative_labels( $post_id ) {
+	public function get_alternative_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 	}
 
 	/**
@@ -382,25 +382,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_alternative_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternative_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'));
 
 	}
 
@@ -414,26 +414,26 @@ 
 	public function in_admin_header() {
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return;
 		}
 
 		// If you're not in the entity post edit page, return.
-		if ( self::TYPE_NAME !== get_current_screen()->id ) {
+		if (self::TYPE_NAME !== get_current_screen()->id) {
 			return;
 		}
 		// Retrieve the current global post
 		global $post;
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
+		$rating = $this->get_rating_for($post->ID, true);
 		// If there is at least 1 warning
-		if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
+		if (isset($rating['warnings']) && 0 < count($rating['warnings'])) {
 			// TODO - Pass Wordlift_Notice_Service trough the service constructor 
-			$this->notice_service->add_suggestion( $rating[ 'warnings' ] );
+			$this->notice_service->add_suggestion($rating['warnings']);
 		}
 		
 	}
@@ -447,19 +447,19 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function set_rating_for( $post_id ) {
+	public function set_rating_for($post_id) {
 
 		// Calculate rating for the given post
-		$rating = $this->calculate_rating_for( $post_id );
+		$rating = $this->calculate_rating_for($post_id);
 		// Store the rating on db as post meta
 		// Please notice that RATING_RAW_SCORE_META_KEY 
 		// is saved on a different meta to allow score sorting
 		// Both meta are managed as unique
 		// https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
+		update_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score']);
+		update_post_meta($post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings']);
 		
-		$this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
+		$this->log_service->trace(sprintf("Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score']));
 		
 		// Finally returns the rating 
 		return $rating;
@@ -474,27 +474,27 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+	public function get_rating_for($post_id, $force_reload = false) {
 		
 		// If forced reload is required or rating is missing ..
-		if ( $force_reload ) {
-			$this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
-			return $this->set_rating_for( $post_id );
+		if ($force_reload) {
+			$this->log_service->trace("Force rating reload [ post_id :: $post_id ]");
+			return $this->set_rating_for($post_id);
 		}
 		
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
+		$current_raw_score = get_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, true);  
 			
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-			return $this->set_rating_for( $post_id );
+		if ( ! is_numeric($current_raw_score)) {
+			$this->log_service->trace("Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]");
+			return $this->set_rating_for($post_id);
 		}
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
+		$current_warnings = get_post_meta($post_id, self::RATING_WARNINGS_META_KEY, true);  
 		
 		// Finally return score and warnings
 		return array( 
 			'raw_score'				=> $current_raw_score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
+			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light($current_raw_score),
+			'percentage_score'		=> $this->convert_raw_score_to_percentage($current_raw_score),
 			'warnings'				=> $current_warnings, 
 		);
 
@@ -519,44 +519,39 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function calculate_rating_for( $post_id ) {
+	public function calculate_rating_for($post_id) {
 		
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
+		if ( ! $this->is_entity($post_id)) {
 			return;
 		}
 		// Retrieve the post object
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 		// Rating value
 		$score = 0;
 		// Store warning messages
 		$warnings = array();
 
 		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score++ : 
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+		(0 < count(wl_core_get_related_post_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift'));
 		
 		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+		( ! empty($post->post_content)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift'));
 		
 		// Is the current entity related to at least 1 entity?
 		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+		(0 < count(wl_core_get_related_entity_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift'));
 		
 		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+		('publish' === get_post_status($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_IS_PUBLISHED, 'wordlift'));
 		
 		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+		(has_post_thumbnail($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift'));
 		
 		// Get all post meta keys for the current post		
 		global $wpdb;
@@ -566,30 +561,27 @@ 
 		
 		// Check intersection between available meta keys 
 		// and expected ones arrays to detect missing values
-		$available_meta_keys = $wpdb->get_col( $query );
+		$available_meta_keys = $wpdb->get_col($query);
 
 		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+		(in_array(Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_SAME_AS, 'wordlift'));
 		
-		$schema = wl_entity_type_taxonomy_get_type( $post_id );
+		$schema = wl_entity_type_taxonomy_get_type($post_id);
 
-		$expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
-			array() : 
-			array_keys( $schema[ 'custom_fields' ] );
+		$expected_meta_keys = (null === $schema['custom_fields']) ? 
+			array() : array_keys($schema['custom_fields']);
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+		$intersection = array_intersect($expected_meta_keys, $available_meta_keys);
 		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+		(count($intersection) === count($expected_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift'));
 		
 		// Finally return score and warnings
 		return array( 
 			'raw_score'				=> $score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
+			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light($score),
+			'percentage_score'		=> $this->convert_raw_score_to_percentage($score),
 			'warnings'				=> $warnings, 
 		);
 
@@ -604,12 +596,12 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
+	private function convert_raw_score_to_traffic_light($score) {
 		// RATING_MAX : $score = 3 : x 
 		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+		$rating = round(($score * 3) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP);
 		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating; 
+		return (0 == $rating) ? 1 : $rating; 
 
 	}
 
@@ -622,9 +614,9 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	public function convert_raw_score_to_percentage( $score ) {
+	public function convert_raw_score_to_percentage($score) {
 		// RATING_MAX : $score = 100 : x 
-		return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+		return round(($score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP);
 	}
 
 	/**
@@ -636,8 +628,8 @@ 
 	 *
 	 * @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/admin/WL_Metabox/WL_Metabox_Field_uri.php

Indentation +93 added lines, -93 removed lines

@@ -3,103 +3,103 @@ 
 
 class WL_Metabox_Field_uri extends WL_Metabox_Field {
 
-	/**
-	 * Only accept URIs or local entity IDs.
-	 * Build new entity if the user inputted a name that is not present in DB.
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		if ( empty( $value ) ) {
-			return null;
-		}
-
-		// Check that the inserted URI, ID or name does not point to a saved entity.
-		if ( is_numeric( $value ) ) {
-			$absent_from_db = is_null( get_post( $value ) );                           // search by ID
-		} else {
-			$absent_from_db =
-				is_null( Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $value ) ) &&                      // search by uri
-				is_null( get_page_by_title( $value, OBJECT, Wordlift_Entity_Service::TYPE_NAME ) );   // search by name
-		}
-
-		// Is it an URI?
-		$name_is_uri = strpos( $value, 'http' ) === 0;
-
-		// We create a new entity only if the entity is not present in the DB.
-		// In the case of an external uri, we just save the uri.
-		if ( $absent_from_db && ! $name_is_uri ) {
-
-			// ...we create a new entity!
-			$new_entity_id = wp_insert_post( array(
-				'post_status' => 'publish',
-				'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
-				'post_title'  => $value
-			) );
-			$new_entity    = get_post( $new_entity_id );
-
-			$type = 'http://schema.org/' . ( isset( $this->expected_uri_type ) ? $this->expected_uri_type[0] : 'Thing' );
-
-			wl_set_entity_main_type( $new_entity_id, $type );
-
-			// Build uri for this entity
-			$new_uri = wl_build_entity_uri( $new_entity_id );
-			wl_set_entity_uri( $new_entity_id, $new_uri );
-
-			wl_push_entity_post_to_redlink( $new_entity );
-
-			// Update the value that will be saved as meta
-			$value = $new_entity_id;
-		}
-
-		return $value;
-	}
-
-	public function html_wrapper_open() {
-
-		// The containing <div> contains info on cardinality and expected types
-		$html = "<div class='wl-field' data-cardinality='$this->cardinality'";
-
-		if ( isset( $this->expected_uri_type ) && ! is_null( $this->expected_uri_type ) ) {
-
-			if ( is_array( $this->expected_uri_type ) ) {
-				$html .= " data-expected-types='" . implode( ',', $this->expected_uri_type ) . "'";
-			} else {
-				$html .= " data-expected-types='$this->expected_uri_type'";
-			}
-		}
-
-		$html .= '>';
-
-		return $html;
-	}
-
-	public function html_input( $default_entity_identifier ) {
-
-		// The entity can be referenced as URI or ID.
-		if ( is_numeric( $default_entity_identifier ) ) {
-			$entity = get_post( $default_entity_identifier );
-		} else {
-			// It is an URI
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $default_entity_identifier );
-		}
-
-		if ( ! is_null( $entity ) ) {
-			$label = $entity->post_title;
-			$value = $entity->ID;
-		} else {
-			// No ID and no internal uri. Just leave as is.
-			$label = $default_entity_identifier;
-			$value = $default_entity_identifier;
-		}
-
-		/*
+    /**
+     * Only accept URIs or local entity IDs.
+     * Build new entity if the user inputted a name that is not present in DB.
+     */
+    public function sanitize_data_filter( $value ) {
+
+        if ( empty( $value ) ) {
+            return null;
+        }
+
+        // Check that the inserted URI, ID or name does not point to a saved entity.
+        if ( is_numeric( $value ) ) {
+            $absent_from_db = is_null( get_post( $value ) );                           // search by ID
+        } else {
+            $absent_from_db =
+                is_null( Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $value ) ) &&                      // search by uri
+                is_null( get_page_by_title( $value, OBJECT, Wordlift_Entity_Service::TYPE_NAME ) );   // search by name
+        }
+
+        // Is it an URI?
+        $name_is_uri = strpos( $value, 'http' ) === 0;
+
+        // We create a new entity only if the entity is not present in the DB.
+        // In the case of an external uri, we just save the uri.
+        if ( $absent_from_db && ! $name_is_uri ) {
+
+            // ...we create a new entity!
+            $new_entity_id = wp_insert_post( array(
+                'post_status' => 'publish',
+                'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
+                'post_title'  => $value
+            ) );
+            $new_entity    = get_post( $new_entity_id );
+
+            $type = 'http://schema.org/' . ( isset( $this->expected_uri_type ) ? $this->expected_uri_type[0] : 'Thing' );
+
+            wl_set_entity_main_type( $new_entity_id, $type );
+
+            // Build uri for this entity
+            $new_uri = wl_build_entity_uri( $new_entity_id );
+            wl_set_entity_uri( $new_entity_id, $new_uri );
+
+            wl_push_entity_post_to_redlink( $new_entity );
+
+            // Update the value that will be saved as meta
+            $value = $new_entity_id;
+        }
+
+        return $value;
+    }
+
+    public function html_wrapper_open() {
+
+        // The containing <div> contains info on cardinality and expected types
+        $html = "<div class='wl-field' data-cardinality='$this->cardinality'";
+
+        if ( isset( $this->expected_uri_type ) && ! is_null( $this->expected_uri_type ) ) {
+
+            if ( is_array( $this->expected_uri_type ) ) {
+                $html .= " data-expected-types='" . implode( ',', $this->expected_uri_type ) . "'";
+            } else {
+                $html .= " data-expected-types='$this->expected_uri_type'";
+            }
+        }
+
+        $html .= '>';
+
+        return $html;
+    }
+
+    public function html_input( $default_entity_identifier ) {
+
+        // The entity can be referenced as URI or ID.
+        if ( is_numeric( $default_entity_identifier ) ) {
+            $entity = get_post( $default_entity_identifier );
+        } else {
+            // It is an URI
+            $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $default_entity_identifier );
+        }
+
+        if ( ! is_null( $entity ) ) {
+            $label = $entity->post_title;
+            $value = $entity->ID;
+        } else {
+            // No ID and no internal uri. Just leave as is.
+            $label = $default_entity_identifier;
+            $value = $default_entity_identifier;
+        }
+
+        /*
 		 * Write saved value in page
 		 * The <input> tags host the meta value.
 		 * The visible <input> has the human readable value (i.e. entity name or uri)
 		 * and is accompained by an hidden <input> tag, passed to the server,
 		 * that contains the raw value (i.e. the uri or entity id).
 		 */
-		$html = <<<EOF
+        $html = <<<EOF
 			<div class="wl-input-wrapper wl-autocomplete-wrapper">
 				<input type="text" class="$this->meta_name wl-autocomplete" value="$label" style="width:88%" />
 				<input type="hidden" class="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$value" />
@@ -108,7 +108,7 @@ 
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 }
 

Spacing +24 added lines, -24 removed lines

@@ -7,45 +7,45 @@ 
 	 * Only accept URIs or local entity IDs.
 	 * Build new entity if the user inputted a name that is not present in DB.
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
-		if ( empty( $value ) ) {
+		if (empty($value)) {
 			return null;
 		}
 
 		// Check that the inserted URI, ID or name does not point to a saved entity.
-		if ( is_numeric( $value ) ) {
-			$absent_from_db = is_null( get_post( $value ) );                           // search by ID
+		if (is_numeric($value)) {
+			$absent_from_db = is_null(get_post($value)); // search by ID
 		} else {
 			$absent_from_db =
-				is_null( Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $value ) ) &&                      // search by uri
-				is_null( get_page_by_title( $value, OBJECT, Wordlift_Entity_Service::TYPE_NAME ) );   // search by name
+				is_null(Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($value)) && // search by uri
+				is_null(get_page_by_title($value, OBJECT, Wordlift_Entity_Service::TYPE_NAME)); // search by name
 		}
 
 		// Is it an URI?
-		$name_is_uri = strpos( $value, 'http' ) === 0;
+		$name_is_uri = strpos($value, 'http') === 0;
 
 		// We create a new entity only if the entity is not present in the DB.
 		// In the case of an external uri, we just save the uri.
-		if ( $absent_from_db && ! $name_is_uri ) {
+		if ($absent_from_db && ! $name_is_uri) {
 
 			// ...we create a new entity!
-			$new_entity_id = wp_insert_post( array(
+			$new_entity_id = wp_insert_post(array(
 				'post_status' => 'publish',
 				'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
 				'post_title'  => $value
-			) );
-			$new_entity    = get_post( $new_entity_id );
+			));
+			$new_entity = get_post($new_entity_id);
 
-			$type = 'http://schema.org/' . ( isset( $this->expected_uri_type ) ? $this->expected_uri_type[0] : 'Thing' );
+			$type = 'http://schema.org/'.(isset($this->expected_uri_type) ? $this->expected_uri_type[0] : 'Thing');
 
-			wl_set_entity_main_type( $new_entity_id, $type );
+			wl_set_entity_main_type($new_entity_id, $type);
 
 			// Build uri for this entity
-			$new_uri = wl_build_entity_uri( $new_entity_id );
-			wl_set_entity_uri( $new_entity_id, $new_uri );
+			$new_uri = wl_build_entity_uri($new_entity_id);
+			wl_set_entity_uri($new_entity_id, $new_uri);
 
-			wl_push_entity_post_to_redlink( $new_entity );
+			wl_push_entity_post_to_redlink($new_entity);
 
 			// Update the value that will be saved as meta
 			$value = $new_entity_id;
@@ -59,10 +59,10 @@ 
 		// The containing <div> contains info on cardinality and expected types
 		$html = "<div class='wl-field' data-cardinality='$this->cardinality'";
 
-		if ( isset( $this->expected_uri_type ) && ! is_null( $this->expected_uri_type ) ) {
+		if (isset($this->expected_uri_type) && ! is_null($this->expected_uri_type)) {
 
-			if ( is_array( $this->expected_uri_type ) ) {
-				$html .= " data-expected-types='" . implode( ',', $this->expected_uri_type ) . "'";
+			if (is_array($this->expected_uri_type)) {
+				$html .= " data-expected-types='".implode(',', $this->expected_uri_type)."'";
 			} else {
 				$html .= " data-expected-types='$this->expected_uri_type'";
 			}
@@ -73,17 +73,17 @@ 
 		return $html;
 	}
 
-	public function html_input( $default_entity_identifier ) {
+	public function html_input($default_entity_identifier) {
 
 		// The entity can be referenced as URI or ID.
-		if ( is_numeric( $default_entity_identifier ) ) {
-			$entity = get_post( $default_entity_identifier );
+		if (is_numeric($default_entity_identifier)) {
+			$entity = get_post($default_entity_identifier);
 		} else {
 			// It is an URI
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $default_entity_identifier );
+			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($default_entity_identifier);
 		}
 
-		if ( ! is_null( $entity ) ) {
+		if ( ! is_null($entity)) {
 			$label = $entity->post_title;
 			$value = $entity->ID;
 		} else {

src/modules/linked_data/wordlift_linked_data.php

Indentation +338 added lines, -338 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,123 +40,123 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		return;
-	}
-
-	// get the current post.
-	$post = get_post( $post_id );
-
-	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 ]" );
-
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
-	// Store classification box mapping
-	$entities_predicates_mapping = null;
-
-	// 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( "]" );
-
-		$entities_via_post = $_POST['wl_entities'];
-		$boxes_via_post    = $_POST['wl_boxes'];
-
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
-			// Local entities have a tmp uri with 'local-entity-'
-			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
-				// Build the proper uri
-				$uri = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $entity['label'] ) );
-				// Populate the mapping
-				$entities_uri_mapping[ $entity_uri ] = $uri;
-				// Override the entity obj
-				$entities_via_post[ $entity_uri ]['uri'] = $uri;
-			}
-		}
-
-		// Populate the $entities_predicates_mapping
-		// Local Redlink uris need to be used here
-		foreach ( $boxes_via_post as $predicate => $entity_uris ) {
-			foreach ( $entity_uris as $entity_uri ) {
-				// Retrieve the entity label needed to build the uri
-				// If the current uri is an internal uri, then entity uri is preserved:
-				// the current label could be an alternative label that has not to impact on entity uri
-				if ( 0 !== strrpos( $entity_uri, wl_configuration_get_redlink_dataset_uri() ) ) {	
-					$label	= $entities_via_post[ stripslashes( $entity_uri ) ]['label'];
-					$uri	= sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $label ) );
-				} else {			
-					$uri	= stripslashes( $entity_uri );
-				}
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        return;
+    }
+
+    // get the current post.
+    $post = get_post( $post_id );
+
+    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 ]" );
+
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
+    // Store classification box mapping
+    $entities_predicates_mapping = null;
+
+    // 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( "]" );
+
+        $entities_via_post = $_POST['wl_entities'];
+        $boxes_via_post    = $_POST['wl_boxes'];
+
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
+            // Local entities have a tmp uri with 'local-entity-'
+            // These uris need to be rewritten here and replaced in the content
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+                // Build the proper uri
+                $uri = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $entity['label'] ) );
+                // Populate the mapping
+                $entities_uri_mapping[ $entity_uri ] = $uri;
+                // Override the entity obj
+                $entities_via_post[ $entity_uri ]['uri'] = $uri;
+            }
+        }
+
+        // Populate the $entities_predicates_mapping
+        // Local Redlink uris need to be used here
+        foreach ( $boxes_via_post as $predicate => $entity_uris ) {
+            foreach ( $entity_uris as $entity_uri ) {
+                // Retrieve the entity label needed to build the uri
+                // If the current uri is an internal uri, then entity uri is preserved:
+                // the current label could be an alternative label that has not to impact on entity uri
+                if ( 0 !== strrpos( $entity_uri, wl_configuration_get_redlink_dataset_uri() ) ) {	
+                    $label	= $entities_via_post[ stripslashes( $entity_uri ) ]['label'];
+                    $uri	= sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $label ) );
+                } else {			
+                    $uri	= stripslashes( $entity_uri );
+                }
 				
-				$entities_predicates_mapping[ $uri ][] = $predicate;
+                $entities_predicates_mapping[ $uri ][] = $predicate;
 				
-			}
-		}
+            }
+        }
 		
-		// Save entities (properties included) and push them to Redlink
-		wl_save_entities( array_values( $entities_via_post ), $post_id );
-	}
-
-	// 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,
-	) );
-
-	// 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 );
-
-	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
-
-		if ( $entities_predicates_mapping ) {
-
-			// wl_write_log(" Going to manage relation instances according to the following mapping");
-
-			// Retrieve the entity uri
-			$referenced_entity_uri = wl_get_entity_uri( $referenced_entity_id );
-			// Retrieve predicates for the current uri
-			if ( isset( $entities_predicates_mapping[ $referenced_entity_uri ] ) ) {
-				foreach ( $entities_predicates_mapping[ $referenced_entity_uri ] as $predicate ) {
-					wl_write_log(" Going to add relation with predicate $predicate");
-					wl_core_add_relation_instance( $post_id, $predicate, $referenced_entity_id );
-				}
-			} else {
-				wl_write_log( "Entity uri $referenced_entity_uri missing in the mapping" );
-				wl_write_log( $entities_predicates_mapping );
-			}
-
-		} else {
-			// Just for unit tests
-			wl_core_add_relation_instance( $post_id, 'what', $referenced_entity_id );
-		}
-
-		// TODO Check if is needed
-		wl_linked_data_push_to_redlink( $referenced_entity_id );
-	}
-
-	// 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' );
+        // Save entities (properties included) and push them to Redlink
+        wl_save_entities( array_values( $entities_via_post ), $post_id );
+    }
+
+    // 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,
+    ) );
+
+    // 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 );
+
+    // Save relation instances
+    foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+
+        if ( $entities_predicates_mapping ) {
+
+            // wl_write_log(" Going to manage relation instances according to the following mapping");
+
+            // Retrieve the entity uri
+            $referenced_entity_uri = wl_get_entity_uri( $referenced_entity_id );
+            // Retrieve predicates for the current uri
+            if ( isset( $entities_predicates_mapping[ $referenced_entity_uri ] ) ) {
+                foreach ( $entities_predicates_mapping[ $referenced_entity_uri ] as $predicate ) {
+                    wl_write_log(" Going to add relation with predicate $predicate");
+                    wl_core_add_relation_instance( $post_id, $predicate, $referenced_entity_id );
+                }
+            } else {
+                wl_write_log( "Entity uri $referenced_entity_uri missing in the mapping" );
+                wl_write_log( $entities_predicates_mapping );
+            }
+
+        } else {
+            // Just for unit tests
+            wl_core_add_relation_instance( $post_id, 'what', $referenced_entity_id );
+        }
+
+        // TODO Check if is needed
+        wl_linked_data_push_to_redlink( $referenced_entity_id );
+    }
+
+    // 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' );
@@ -166,14 +166,14 @@ 
  */
 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 ) ) {
+    // 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' );
-	}
+        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
@@ -190,27 +190,27 @@ 
  */
 function wl_save_entities( $entities, $related_post_id = null ) {
 
-	// wl_write_log( "[ entities count :: " . count( $entities ) . " ][ related post id :: $related_post_id ]" );
+    // wl_write_log( "[ entities count :: " . count( $entities ) . " ][ related post id :: $related_post_id ]" );
 
-	// Prepare the return array.
-	$posts = array();
+    // Prepare the return array.
+    $posts = array();
 
-	// Save each entity and store the post id.
-	foreach ( $entities as $entity ) {
+    // Save each entity and store the post id.
+    foreach ( $entities as $entity ) {
 		
-		// Update entity data with related post
-		$entity['related_post_id'] = $related_post_id;
+        // Update entity data with related post
+        $entity['related_post_id'] = $related_post_id;
 	
-		// Save the entity.
-		$entity_post = wl_save_entity( $entity );
+        // Save the entity.
+        $entity_post = wl_save_entity( $entity );
 
-		// Store the post in the return array if successful.
-		if ( null !== $entity_post ) {
-			array_push( $posts, $entity_post );
-		}
-	}
+        // Store the post in the return array if successful.
+        if ( null !== $entity_post ) {
+            array_push( $posts, $entity_post );
+        }
+    }
 
-	return $posts;
+    return $posts;
 }
 
 /**
@@ -231,176 +231,176 @@ 
  */
 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();
-
-	// wl_write_log( "[ uri :: $uri ][ label :: $label ][ type uri :: $type_uri ]" );
-
-	// 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' => ''
-	);
-
-	// Check whether an entity already exists with the provided URI.
-	$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-
-	if ( null !== $post ) {
-		// We insert into the params the entity ID, so it will be updated and not inserted.
-		$params[ 'ID' ] = $post->ID;
-		// Preserve the current entity status
-		if ( 'public' === $post->post_status ) {
-			$params[ 'post_status' ] = $post->post_status;
-		}
-		// Preserve the current entity post_content.
-		$params['post_content'] = $post->post_content;
-		// Preserve the entity post_title to avoid de-synch between WP and RL
-		// See: https://github.com/insideout10/wordlift-plugin/issues/221
-		$params['post_title'] = $post->post_title;	 
-	}
-
-	// 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      = $wp_filter['save_post'];
-	$wp_filter['save_post'] = array();
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Restore all the existing filters.
-	$wp_filter['save_post'] = $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 );
+    $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();
+
+    // wl_write_log( "[ uri :: $uri ][ label :: $label ][ type uri :: $type_uri ]" );
+
+    // 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' => ''
+    );
+
+    // Check whether an entity already exists with the provided URI.
+    $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+
+    if ( null !== $post ) {
+        // We insert into the params the entity ID, so it will be updated and not inserted.
+        $params[ 'ID' ] = $post->ID;
+        // Preserve the current entity status
+        if ( 'public' === $post->post_status ) {
+            $params[ 'post_status' ] = $post->post_status;
+        }
+        // Preserve the current entity post_content.
+        $params['post_content'] = $post->post_content;
+        // Preserve the entity post_title to avoid de-synch between WP and RL
+        // See: https://github.com/insideout10/wordlift-plugin/issues/221
+        $params['post_title'] = $post->post_title;	 
+    }
+
+    // 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      = $wp_filter['save_post'];
+    $wp_filter['save_post'] = array();
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Restore all the existing filters.
+    $wp_filter['save_post'] = $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 );
-	}
+    // 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 );
+    // 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 ) . " ]" );
+    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 ) {
-			// Do nothing.
-			continue;
-		}
+        // 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 );
+        // 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;
-		}
+        // 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 );
+        // 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'];
+        // 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
-		);
+        $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 );
+        // 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 );
 }
 
 /**
@@ -414,41 +414,41 @@ 
  */
 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 );
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+    // 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 );
 
-		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;
 }
 
 /**
@@ -460,22 +460,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 ]" );
 
@@ -58,127 +58,127 @@ 
 	$entities_predicates_mapping = null;
 
 	// 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) {
 			// Local entities have a tmp uri with 'local-entity-'
 			// 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) {
 				// Build the proper uri
-				$uri = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $entity['label'] ) );
+				$uri = sprintf('%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path($entity['label']));
 				// Populate the mapping
-				$entities_uri_mapping[ $entity_uri ] = $uri;
+				$entities_uri_mapping[$entity_uri] = $uri;
 				// Override the entity obj
-				$entities_via_post[ $entity_uri ]['uri'] = $uri;
+				$entities_via_post[$entity_uri]['uri'] = $uri;
 			}
 		}
 
 		// Populate the $entities_predicates_mapping
 		// Local Redlink uris need to be used here
-		foreach ( $boxes_via_post as $predicate => $entity_uris ) {
-			foreach ( $entity_uris as $entity_uri ) {
+		foreach ($boxes_via_post as $predicate => $entity_uris) {
+			foreach ($entity_uris as $entity_uri) {
 				// Retrieve the entity label needed to build the uri
 				// If the current uri is an internal uri, then entity uri is preserved:
 				// the current label could be an alternative label that has not to impact on entity uri
-				if ( 0 !== strrpos( $entity_uri, wl_configuration_get_redlink_dataset_uri() ) ) {	
-					$label	= $entities_via_post[ stripslashes( $entity_uri ) ]['label'];
-					$uri	= sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $label ) );
+				if (0 !== strrpos($entity_uri, wl_configuration_get_redlink_dataset_uri())) {	
+					$label = $entities_via_post[stripslashes($entity_uri)]['label'];
+					$uri	= sprintf('%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path($label));
 				} else {			
-					$uri	= stripslashes( $entity_uri );
+					$uri	= stripslashes($entity_uri);
 				}
 				
-				$entities_predicates_mapping[ $uri ][] = $predicate;
+				$entities_predicates_mapping[$uri][] = $predicate;
 				
 			}
 		}
 		
 		// Save entities (properties included) and push them to Redlink
-		wl_save_entities( array_values( $entities_via_post ), $post_id );
+		wl_save_entities(array_values($entities_via_post), $post_id);
 	}
 
 	// 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) {
 
-		if ( $entities_predicates_mapping ) {
+		if ($entities_predicates_mapping) {
 
 			// wl_write_log(" Going to manage relation instances according to the following mapping");
 
 			// Retrieve the entity uri
-			$referenced_entity_uri = wl_get_entity_uri( $referenced_entity_id );
+			$referenced_entity_uri = wl_get_entity_uri($referenced_entity_id);
 			// Retrieve predicates for the current uri
-			if ( isset( $entities_predicates_mapping[ $referenced_entity_uri ] ) ) {
-				foreach ( $entities_predicates_mapping[ $referenced_entity_uri ] as $predicate ) {
+			if (isset($entities_predicates_mapping[$referenced_entity_uri])) {
+				foreach ($entities_predicates_mapping[$referenced_entity_uri] as $predicate) {
 					wl_write_log(" Going to add relation with predicate $predicate");
-					wl_core_add_relation_instance( $post_id, $predicate, $referenced_entity_id );
+					wl_core_add_relation_instance($post_id, $predicate, $referenced_entity_id);
 				}
 			} else {
-				wl_write_log( "Entity uri $referenced_entity_uri missing in the mapping" );
-				wl_write_log( $entities_predicates_mapping );
+				wl_write_log("Entity uri $referenced_entity_uri missing in the mapping");
+				wl_write_log($entities_predicates_mapping);
 			}
 
 		} else {
 			// Just for unit tests
-			wl_core_add_relation_instance( $post_id, 'what', $referenced_entity_id );
+			wl_core_add_relation_instance($post_id, 'what', $referenced_entity_id);
 		}
 
 		// TODO Check if is needed
-		wl_linked_data_push_to_redlink( $referenced_entity_id );
+		wl_linked_data_push_to_redlink($referenced_entity_id);
 	}
 
 	// 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 ) ) {
+	if ($entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null($entity_type)) {
 
-		wl_schema_set_types( $entity_id, 'Thing' );
+		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 entities to the local storage.
@@ -188,7 +188,7 @@ 
  *
  * @return array An array of posts.
  */
-function wl_save_entities( $entities, $related_post_id = null ) {
+function wl_save_entities($entities, $related_post_id = null) {
 
 	// wl_write_log( "[ entities count :: " . count( $entities ) . " ][ related post id :: $related_post_id ]" );
 
@@ -196,17 +196,17 @@ 
 	$posts = array();
 
 	// Save each entity and store the post id.
-	foreach ( $entities as $entity ) {
+	foreach ($entities as $entity) {
 		
 		// Update entity data with related post
 		$entity['related_post_id'] = $related_post_id;
 	
 		// Save the entity.
-		$entity_post = wl_save_entity( $entity );
+		$entity_post = wl_save_entity($entity);
 
 		// Store the post in the return array if successful.
-		if ( null !== $entity_post ) {
-			array_push( $posts, $entity_post );
+		if (null !== $entity_post) {
+			array_push($posts, $entity_post);
 		}
 	}
 
@@ -229,23 +229,23 @@ 
  *
  * @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();
 
 	// wl_write_log( "[ uri :: $uri ][ label :: $label ][ type uri :: $type_uri ]" );
 
 	// 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,
@@ -253,14 +253,14 @@ 
 	);
 
 	// Check whether an entity already exists with the provided URI.
-	$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+	$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
 
-	if ( null !== $post ) {
+	if (null !== $post) {
 		// We insert into the params the entity ID, so it will be updated and not inserted.
-		$params[ 'ID' ] = $post->ID;
+		$params['ID'] = $post->ID;
 		// Preserve the current entity status
-		if ( 'public' === $post->post_status ) {
-			$params[ 'post_status' ] = $post->post_status;
+		if ('public' === $post->post_status) {
+			$params['post_status'] = $post->post_status;
 		}
 		// Preserve the current entity post_content.
 		$params['post_content'] = $post->post_content;
@@ -275,12 +275,12 @@ 
 	// 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($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' ) );
+	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
@@ -294,78 +294,78 @@ 
 	$wp_filter['save_post'] = array();
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Restore all the existing filters.
 	$wp_filter['save_post'] = $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 (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 );
+	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' );
+	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'];
@@ -383,24 +383,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);
 }
 
 /**
@@ -412,10 +412,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';
@@ -426,8 +426,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();
 	}
@@ -436,12 +436,12 @@ 
 
 	// 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 );
+	foreach ($matches[1] as $uri) {
+		$uri_d  = html_entity_decode($uri);
+		$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);
 		}
 	}
 
@@ -458,24 +458,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();
 	}
 }

src/wordlift.php

Indentation +228 added lines, -228 removed lines

@@ -26,7 +26,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 // Include WordLift constants.
@@ -47,18 +47,18 @@ 
  */
 function wl_write_log( $log ) {
 
-	$handler = apply_filters( 'wl_write_log_handler', null );
+    $handler = apply_filters( 'wl_write_log_handler', null );
 
-	$callers         = debug_backtrace();
-	$caller_function = $callers[1]['function'];
+    $callers         = debug_backtrace();
+    $caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+    if ( is_null( $handler ) ) {
+        wl_write_log_handler( $log, $caller_function );
 
-		return;
-	}
+        return;
+    }
 
-	call_user_func( $handler, $log, $caller_function );
+    call_user_func( $handler, $log, $caller_function );
 }
 
 /**
@@ -71,20 +71,20 @@ 
  */
 function wl_write_log_handler( $log, $caller = null ) {
 
-	global $wl_logger;
+    global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+    if ( true === WP_DEBUG ) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+        $message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
+                    ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
-		} else {
-			error_log( $message );
-		}
+        if ( isset( $wl_logger ) ) {
+            $wl_logger->info( $message );
+        } else {
+            error_log( $message );
+        }
 
-	}
+    }
 
 }
 
@@ -99,7 +99,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -111,10 +111,10 @@ 
  */
 function wl_queue_sparql_update_query( $query ) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    file_put_contents( $filename, $query . "\n", FILE_APPEND );
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
 }
 
 /**
@@ -124,28 +124,28 @@ 
  */
 function wl_execute_saved_sparql_update_query( $request_id ) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+    $filename = WL_TEMP_DIR . $request_id . '.sparql';
 
-	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+    // If the file doesn't exist, exit.
+    if ( ! file_exists( $filename ) ) {
+        wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
 
-		return;
-	}
+        return;
+    }
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
 
-	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+    // Get the query saved in the file.
+    $query = file_get_contents( $filename );
 
-	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+    // Execute the SPARQL query.
+    rl_execute_sparql_update_query( $query, false );
 
-	// Reindex the triple store.
-	wordlift_reindex_triple_store();
+    // Reindex the triple store.
+    wordlift_reindex_triple_store();
 
-	// Delete the temporary file.
-	unlink( $filename );
+    // Delete the temporary file.
+    unlink( $filename );
 }
 
 add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
@@ -155,10 +155,10 @@ 
  */
 function wordlift_buttonhooks() {
 
-	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
-	}
+    // Only add hooks when the current user has permissions AND is in Rich Text editor mode
+    if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+        add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+    }
 }
 
 /**
@@ -170,10 +170,10 @@ 
  */
 function wordlift_register_tinymce_javascript( $plugin_array ) {
 
-	// add the wordlift plugin.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+    // add the wordlift plugin.
+    $plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
 
-	return $plugin_array;
+    return $plugin_array;
 }
 
 /**
@@ -181,21 +181,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array()
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array()
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // init process for button control
@@ -209,21 +209,21 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'angularjs', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
 
 }
 
 add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+    wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
 }
 
 add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
@@ -238,18 +238,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => true,
-			'itemtype'  => true,
-			'itemid'    => true,
-			'itemprop'  => true
-		)
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => true,
+            'itemtype'  => true,
+            'itemid'    => true,
+            'itemprop'  => true
+        )
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -263,15 +263,15 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
-	// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : ''
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
+    // "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : ''
+    );
 }
 
 /**
@@ -283,13 +283,13 @@ 
  */
 function wl_get_post_modified_time( $post ) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+    $date_modified = get_post_modified_time( 'c', true, $post );
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
-	}
+    if ( '-' === substr( $date_modified, 0, 1 ) ) {
+        return get_the_time( 'c', $post );
+    }
 
-	return $date_modified;
+    return $date_modified;
 }
 
 /**
@@ -301,34 +301,34 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
-		'post_parent'    => $post_id,
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image'
-	) );
+    $images = get_children( array(
+        'post_parent'    => $post_id,
+        'post_type'      => 'attachment',
+        'post_mime_type' => 'image'
+    ) );
 
-	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
-		return array();
-	}
+    // Return an empty array if no image is found.
+    if ( empty( $images ) ) {
+        return array();
+    }
 
-	// Prepare the return array.
-	$image_urls = array();
+    // Prepare the return array.
+    $image_urls = array();
 
-	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
-		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
-		}
-	}
+    // Collect the URLs.
+    foreach ( $images as $attachment_id => $attachment ) {
+        $image_url = wp_get_attachment_url( $attachment_id );
+        // Ensure the URL isn't collected already.
+        if ( ! in_array( $image_url, $image_urls ) ) {
+            array_push( $image_urls, $image_url );
+        }
+    }
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
 
-	return $image_urls;
+    return $image_urls;
 }
 
 /**
@@ -341,19 +341,19 @@ 
  */
 function wl_get_sparql_images( $uri, $post_id ) {
 
-	$sparql = '';
+    $sparql = '';
 
-	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+    // Get the escaped URI.
+    $uri_e = esc_html( $uri );
 
-	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
-		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
-	}
+    // Add SPARQL stmts to write the schema:image.
+    $image_urls = wl_get_image_urls( $post_id );
+    foreach ( $image_urls as $image_url ) {
+        $image_url_esc = wl_sparql_escape_uri( $image_url );
+        $sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
+    }
 
-	return $sparql;
+    return $sparql;
 }
 
 /**
@@ -366,24 +366,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return null;
+    // Return null.
+    return null;
 }
 
 /**
@@ -394,8 +394,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 
@@ -413,43 +413,43 @@ 
  */
 function wl_flush_rewrite_rules_hard( $hard ) {
 
-	// Get all published posts.
-	$posts = get_posts( array(
-		'posts_per_page' => - 1,
-		'post_type'      => 'any',
-		'post_status'    => 'publish'
-	) );
+    // Get all published posts.
+    $posts = get_posts( array(
+        'posts_per_page' => - 1,
+        'post_type'      => 'any',
+        'post_status'    => 'publish'
+    ) );
 
-	// Holds the delete part of the query.
-	$delete_query = rl_sparql_prefixes();
-	// Holds the insert part of the query.
-	$insert_query = 'INSERT DATA { ';
+    // Holds the delete part of the query.
+    $delete_query = rl_sparql_prefixes();
+    // Holds the insert part of the query.
+    $insert_query = 'INSERT DATA { ';
 
-	// Cycle in each post to build the query.
-	foreach ( $posts as $post ) {
+    // Cycle in each post to build the query.
+    foreach ( $posts as $post ) {
 
-		// Ignore revisions.
-		if ( wp_is_post_revision( $post->ID ) ) {
-			continue;
-		}
+        // Ignore revisions.
+        if ( wp_is_post_revision( $post->ID ) ) {
+            continue;
+        }
 
-		// Get the entity URI.
-		$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+        // Get the entity URI.
+        $uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
 
-		// Get the post URL.
-		$url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+        // Get the post URL.
+        $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
 
-		// Prepare the DELETE and INSERT commands.
-		$delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
-		$insert_query .= " <$uri> schema:url <$url> . \n";
+        // Prepare the DELETE and INSERT commands.
+        $delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
+        $insert_query .= " <$uri> schema:url <$url> . \n";
 
-		// wl_write_log( "[ uri :: $uri ][ url :: $url ]" );
-	}
+        // wl_write_log( "[ uri :: $uri ][ url :: $url ]" );
+    }
 
-	$insert_query .= ' };';
+    $insert_query .= ' };';
 
-	// Execute the query.
-	rl_execute_sparql_update_query( $delete_query . $insert_query );
+    // Execute the query.
+    rl_execute_sparql_update_query( $delete_query . $insert_query );
 }
 
 add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
@@ -466,15 +466,15 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	// wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
+    // wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
 
-	// According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
-	// ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-	// "$" | ","
-	// Plus the ' ' (space).
-	// TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
+    // According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
+    // ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+    // "$" | ","
+    // Plus the ' ' (space).
+    // TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
 
-	return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
+    return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
 }
 
 /**
@@ -486,11 +486,11 @@ 
  */
 function wl_force_to_array( $value ) {
 	
-	if ( ! is_array( $value ) ) {
-		return array( $value );
-	}
+    if ( ! is_array( $value ) ) {
+        return array( $value );
+    }
 	
-	return $value;
+    return $value;
 }
 
 /**
@@ -498,26 +498,26 @@ 
  */
 function wl_shutdown() {
 
-	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    // Get the filename to the temporary SPARQL file.
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
 
-	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+    // If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
+    if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
 
-		// The request ID.
-		$args = array( WL_REQUEST_ID );
+        // The request ID.
+        $args = array( WL_REQUEST_ID );
 
-		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+        // Schedule the execution of the SPARQL query with the request ID.
+        wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
 
-		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+        // Check that the request is scheduled.
+        $timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
 
-		// Spawn the cron.
-		spawn_cron();
+        // Spawn the cron.
+        spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
-	}
+        wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+    }
 }
 
 add_action( 'shutdown', 'wl_shutdown' );
@@ -531,45 +531,45 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	// wl_write_log( "wl_replace_item_id_with_uri" );
+    // wl_write_log( "wl_replace_item_id_with_uri" );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( null === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -648,8 +648,8 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
 }
 
 /**
@@ -657,8 +657,8 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
 }
 
 register_activation_hook( __FILE__, 'activate_wordlift' );
@@ -681,8 +681,8 @@ 
  */
 function run_wordlift() {
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
 }
 

Spacing +154 added lines, -154 removed lines

@@ -25,16 +25,16 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules
-require_once( 'modules/core/wordlift_core.php' );
-require_once( 'modules/configuration/wordlift_configuration.php' );
+require_once('modules/core/wordlift_core.php');
+require_once('modules/configuration/wordlift_configuration.php');
 
 /**
  * Log to the debug.log file.
@@ -45,20 +45,20 @@ 
  *
  * @param string|mixed $log The log data.
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	$handler = apply_filters( 'wl_write_log_handler', null );
+	$handler = apply_filters('wl_write_log_handler', null);
 
 	$callers         = debug_backtrace();
 	$caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+	if (is_null($handler)) {
+		wl_write_log_handler($log, $caller_function);
 
 		return;
 	}
 
-	call_user_func( $handler, $log, $caller_function );
+	call_user_func($handler, $log, $caller_function);
 }
 
 /**
@@ -69,19 +69,19 @@ 
  * @param string|array $log The log data.
  * @param string $caller The calling function.
  */
-function wl_write_log_handler( $log, $caller = null ) {
+function wl_write_log_handler($log, $caller = null) {
 
 	global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+	if (true === WP_DEBUG) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+		$message = (isset($caller) ? sprintf('[%-40.40s] ', $caller) : '').
+		           (is_array($log) || is_object($log) ? print_r($log, true) : wl_write_log_hide_key($log));
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
+		if (isset($wl_logger)) {
+			$wl_logger->info($message);
 		} else {
-			error_log( $message );
+			error_log($message);
 		}
 
 	}
@@ -97,9 +97,9 @@ 
  *
  * @return string A text with the key hidden.
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -109,12 +109,12 @@ 
  *
  * @param string $query A SPARQL query.
  */
-function wl_queue_sparql_update_query( $query ) {
+function wl_queue_sparql_update_query($query) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
+	file_put_contents($filename, $query."\n", FILE_APPEND);
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_queue_sparql_update_query [ filename :: $filename ]");
 }
 
 /**
@@ -122,33 +122,33 @@ 
  *
  * @param int $request_id The request ID.
  */
-function wl_execute_saved_sparql_update_query( $request_id ) {
+function wl_execute_saved_sparql_update_query($request_id) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+	$filename = WL_TEMP_DIR.$request_id.'.sparql';
 
 	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+	if ( ! file_exists($filename)) {
+		wl_write_log("wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]");
 
 		return;
 	}
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_execute_saved_sparql_update_query [ filename :: $filename ]");
 
 	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+	$query = file_get_contents($filename);
 
 	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+	rl_execute_sparql_update_query($query, false);
 
 	// Reindex the triple store.
 	wordlift_reindex_triple_store();
 
 	// Delete the temporary file.
-	unlink( $filename );
+	unlink($filename);
 }
 
-add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
+add_action('wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1);
 
 /**
  * Add buttons hook for the TinyMCE editor. This method is called by the WP init hook.
@@ -156,8 +156,8 @@ 
 function wordlift_buttonhooks() {
 
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
+		add_filter('mce_external_plugins', 'wordlift_register_tinymce_javascript');
 	}
 }
 
@@ -168,10 +168,10 @@ 
  *
  * @return array The modified plugins array.
  */
-function wordlift_register_tinymce_javascript( $plugin_array ) {
+function wordlift_register_tinymce_javascript($plugin_array) {
 
 	// add the wordlift plugin.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+	$plugin_array['wordlift'] = plugin_dir_url(__FILE__).'js/wordlift-reloaded.js';
 
 	return $plugin_array;
 }
@@ -183,7 +183,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -191,17 +191,17 @@ 
 		'itemid'    => array()
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // init process for button control
-add_action( 'init', 'wordlift_buttonhooks' );
+add_action('init', 'wordlift_buttonhooks');
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 
 /**
@@ -210,23 +210,23 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', plugin_dir_url(__FILE__).'bower_components/angular/angular.min.js');
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui', plugin_dir_url(__FILE__).'css/wordlift-ui.min.css');
 }
 
-add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
+add_action('wp_enqueue_scripts', 'wl_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -236,23 +236,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true
 		)
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -261,16 +261,16 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
 	// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : ''
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : ''
 	);
 }
 
@@ -281,12 +281,12 @@ 
  *
  * @return string A datetime.
  */
-function wl_get_post_modified_time( $post ) {
+function wl_get_post_modified_time($post) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+	$date_modified = get_post_modified_time('c', true, $post);
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
+	if ('-' === substr($date_modified, 0, 1)) {
+		return get_the_time('c', $post);
 	}
 
 	return $date_modified;
@@ -299,18 +299,18 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
+	$images = get_children(array(
 		'post_parent'    => $post_id,
 		'post_type'      => 'attachment',
 		'post_mime_type' => 'image'
-	) );
+	));
 
 	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
+	if (empty($images)) {
 		return array();
 	}
 
@@ -318,11 +318,11 @@ 
 	$image_urls = array();
 
 	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
+	foreach ($images as $attachment_id => $attachment) {
+		$image_url = wp_get_attachment_url($attachment_id);
 		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
+		if ( ! in_array($image_url, $image_urls)) {
+			array_push($image_urls, $image_url);
 		}
 	}
 
@@ -339,17 +339,17 @@ 
  *
  * @return string The SPARQL fragment.
  */
-function wl_get_sparql_images( $uri, $post_id ) {
+function wl_get_sparql_images($uri, $post_id) {
 
 	$sparql = '';
 
 	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+	$uri_e = esc_html($uri);
 
 	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
+	$image_urls = wl_get_image_urls($post_id);
+	foreach ($image_urls as $image_url) {
+		$image_url_esc = wl_sparql_escape_uri($image_url);
 		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
 	}
 
@@ -364,21 +364,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -392,10 +392,10 @@ 
  * @param int $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 
@@ -411,14 +411,14 @@ 
  *
  * @param bool $hard True if the rewrite involves configuration updates in Apache/IIS.
  */
-function wl_flush_rewrite_rules_hard( $hard ) {
+function wl_flush_rewrite_rules_hard($hard) {
 
 	// Get all published posts.
-	$posts = get_posts( array(
-		'posts_per_page' => - 1,
+	$posts = get_posts(array(
+		'posts_per_page' => -1,
 		'post_type'      => 'any',
 		'post_status'    => 'publish'
-	) );
+	));
 
 	// Holds the delete part of the query.
 	$delete_query = rl_sparql_prefixes();
@@ -426,18 +426,18 @@ 
 	$insert_query = 'INSERT DATA { ';
 
 	// Cycle in each post to build the query.
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 
 		// Ignore revisions.
-		if ( wp_is_post_revision( $post->ID ) ) {
+		if (wp_is_post_revision($post->ID)) {
 			continue;
 		}
 
 		// Get the entity URI.
-		$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+		$uri = wl_sparql_escape_uri(wl_get_entity_uri($post->ID));
 
 		// Get the post URL.
-		$url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+		$url = wl_sparql_escape_uri(get_permalink($post->ID));
 
 		// Prepare the DELETE and INSERT commands.
 		$delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
@@ -449,10 +449,10 @@ 
 	$insert_query .= ' };';
 
 	// Execute the query.
-	rl_execute_sparql_update_query( $delete_query . $insert_query );
+	rl_execute_sparql_update_query($delete_query.$insert_query);
 }
 
-add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
+add_filter('flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1);
 
 /**
  * Sanitizes an URI path by replacing the non allowed characters with an underscore.
@@ -464,7 +464,7 @@ 
  *
  * @return The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
 	// wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
 
@@ -474,7 +474,7 @@ 
 	// Plus the ' ' (space).
 	// TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
 
-	return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
+	return sanitize_title(preg_replace('/[;\/?:@&=+$,\s]/', $char, stripslashes($path)));
 }
 
 /**
@@ -484,10 +484,10 @@ 
  * 
  * @return array Array containing $value (if $value was not an array) 
  */
-function wl_force_to_array( $value ) {
+function wl_force_to_array($value) {
 	
-	if ( ! is_array( $value ) ) {
-		return array( $value );
+	if ( ! is_array($value)) {
+		return array($value);
 	}
 	
 	return $value;
@@ -499,28 +499,28 @@ 
 function wl_shutdown() {
 
 	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
 
 	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+	if (WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists($filename)) {
 
 		// The request ID.
-		$args = array( WL_REQUEST_ID );
+		$args = array(WL_REQUEST_ID);
 
 		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+		wp_schedule_single_event(time(), 'wl_execute_saved_sparql_update_query', $args);
 
 		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+		$timestamp = wp_next_scheduled('wl_execute_saved_sparql_update_query', $args);
 
 		// Spawn the cron.
 		spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+		wl_write_log("wl_shutdown [ request id :: ".WL_REQUEST_ID." ][ timestamp :: $timestamp ]");
 	}
 }
 
-add_action( 'shutdown', 'wl_shutdown' );
+add_action('shutdown', 'wl_shutdown');
 
 /**
  * Replaces the *itemid* attributes URIs with the WordLift URIs.
@@ -529,118 +529,118 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
 	// wl_write_log( "wl_replace_item_id_with_uri" );
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $item_id );
+			$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
-require_once( 'wordlift_entity_type_taxonomy.php' );
+require_once('wordlift_entity_type.php');
+require_once('wordlift_entity_type_taxonomy.php');
 
 // filters the post content when saving posts.
-require_once( 'wordlift_content_filter.php' );
+require_once('wordlift_content_filter.php');
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
-require_once( 'modules/caching/wordlift_caching.php' );
-require_once( 'modules/redirector/wordlift_redirector.php' );
-require_once( 'modules/freebase_image_proxy/wordlift_freebase_image_proxy.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
+require_once('modules/caching/wordlift_caching.php');
+require_once('modules/redirector/wordlift_redirector.php');
+require_once('modules/freebase_image_proxy/wordlift_freebase_image_proxy.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/wordlift_shortcode_blog_map.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/wordlift_shortcode_blog_map.php');
 
 // disable In-Depth Articles
 //require_once('wordlift_indepth_articles.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/wordlift_widget_chord.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/wordlift_widget_chord.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_sparql.php' );
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_sparql.php');
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 // Provide syncing features.
-require_once( 'admin/wordlift_admin_sync.php' );
+require_once('admin/wordlift_admin_sync.php');
 //}
 
 // load languages.
 // TODO: the following call gives for granted that the plugin is in the wordlift directory,
 //       we're currently doing this because wordlift is symbolic linked.
-load_plugin_textdomain( 'wordlift', false, '/wordlift/languages' );
+load_plugin_textdomain('wordlift', false, '/wordlift/languages');
 
 
 /**
@@ -648,7 +648,7 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 }
 
@@ -657,18 +657,18 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.

src/wordlift_content_filter.php

Indentation +159 added lines, -159 removed lines

@@ -10,7 +10,7 @@ 
  * @param string $uri Uri of the entity to search in the post content.
  */
 function wl_content_embed_build_regex_from_uri( $uri ) {
-	return '|<(\\w+)[^<]* itemid=\"' . esc_attr( $uri ) . '\"[^>]*>([^<]*)<\\/\\1>|i';
+    return '|<(\\w+)[^<]* itemid=\"' . esc_attr( $uri ) . '\"[^>]*>([^<]*)<\\/\\1>|i';
 }
 
 /**
@@ -22,8 +22,8 @@ 
  */
 function wl_content_embed_microdata( $content ) {
 
-	// Apply microdata only to single pages.
-	/*if ( ! is_single() ) {
+    // Apply microdata only to single pages.
+    /*if ( ! is_single() ) {
 		wl_write_log( "wl_content_embed_microdata : is not single" );
 
 		return $content;
@@ -31,7 +31,7 @@ 
 
 	global $post;
         */
-	return _wl_content_embed_microdata( get_the_ID(), $content );
+    return _wl_content_embed_microdata( get_the_ID(), $content );
 }
 
 /**
@@ -44,31 +44,31 @@ 
  */
 function _wl_content_embed_microdata( $post_id, $content ) {
 
-	// If it is an entity, add its own microdata to the content.
-	if ( get_post_type( $post_id ) == Wordlift_Entity_Service::TYPE_NAME ) {
-		$own_uri = wl_get_entity_uri( $post_id );
-		$content .= '<span itemid="' . $own_uri . '"></span>';
-	}
+    // If it is an entity, add its own microdata to the content.
+    if ( get_post_type( $post_id ) == Wordlift_Entity_Service::TYPE_NAME ) {
+        $own_uri = wl_get_entity_uri( $post_id );
+        $content .= '<span itemid="' . $own_uri . '"></span>';
+    }
 
-	// Now search in the text entity mentions
-	$regex   = '/<(\\w+)[^<]* itemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
-	$matches = array();
+    // Now search in the text entity mentions
+    $regex   = '/<(\\w+)[^<]* itemid=\"([^"]+)\"[^>]*>([^<]*)<\\/\\1>/i';
+    $matches = array();
 
-	// Return the content if not item IDs have been found.
-	if ( false === preg_match_all( $regex, $content, $matches, PREG_SET_ORDER ) ) {
-		return $content;
-	}
+    // Return the content if not item IDs have been found.
+    if ( false === preg_match_all( $regex, $content, $matches, PREG_SET_ORDER ) ) {
+        return $content;
+    }
 
-	// TODO: Retrieve here just one time entities type structure to avoid multiple queries.
-	foreach ( $matches as $match ) {
-		$item_id = $match[2];
+    // TODO: Retrieve here just one time entities type structure to avoid multiple queries.
+    foreach ( $matches as $match ) {
+        $item_id = $match[2];
 
-		// wl_write_log( "_wl_content_embed_microdata [ item ID :: $item_id ]" );
+        // wl_write_log( "_wl_content_embed_microdata [ item ID :: $item_id ]" );
 
-		$content = wl_content_embed_item_microdata( $content, $item_id );
-	}
+        $content = wl_content_embed_item_microdata( $content, $item_id );
+    }
 
-	return $content;
+    return $content;
 }
 
 /**
@@ -82,68 +82,68 @@ 
  */
 function wl_content_embed_item_microdata( $content, $uri, $itemprop = null, $recursion_level = 0 ) {
 
-	if ( $recursion_level > wl_config_get_recursion_depth() ) {
-		wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
+    if ( $recursion_level > wl_config_get_recursion_depth() ) {
+        wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
 
-		return '';
-	}
+        return '';
+    }
 
-	$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+    $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
 
-	// Entity not found or not published. Delete <span> tags but leave their content on page.
-	if ( null === $post || $post->post_status !== 'publish' ) {
+    // Entity not found or not published. Delete <span> tags but leave their content on page.
+    if ( null === $post || $post->post_status !== 'publish' ) {
 
-		// wl_write_log( "wl_content_embed_item_microdata : entity not found or not published [ uri :: $uri ]" );
+        // wl_write_log( "wl_content_embed_item_microdata : entity not found or not published [ uri :: $uri ]" );
 
-		// Replace the original tagging with the new tagging.
-		$regex   = wl_content_embed_build_regex_from_uri( $uri );
-		$content = preg_replace( $regex, '$2', $content );
+        // Replace the original tagging with the new tagging.
+        $regex   = wl_content_embed_build_regex_from_uri( $uri );
+        $content = preg_replace( $regex, '$2', $content );
 
-		return $content;
-	}
+        return $content;
+    }
 
-	// Get the entity URI and its escaped version for the regex.
-	$entity_uri = wl_get_entity_uri( $post->ID );
-	// Get the main type.
-	$main_type = wl_entity_type_taxonomy_get_type( $post->ID );
+    // Get the entity URI and its escaped version for the regex.
+    $entity_uri = wl_get_entity_uri( $post->ID );
+    // Get the main type.
+    $main_type = wl_entity_type_taxonomy_get_type( $post->ID );
 
-	// Set the item type if available.
-	$item_type = ( null === $main_type ? '' : ' itemtype="' . esc_attr( $main_type['uri'] ) . '"' );
+    // Set the item type if available.
+    $item_type = ( null === $main_type ? '' : ' itemtype="' . esc_attr( $main_type['uri'] ) . '"' );
 
-	// Define attribute itemprop if this entity is nested.
-	if ( ! is_null( $itemprop ) ) {
-		$itemprop = ' itemprop="' . $itemprop . '"';
-	}
+    // Define attribute itemprop if this entity is nested.
+    if ( ! is_null( $itemprop ) ) {
+        $itemprop = ' itemprop="' . $itemprop . '"';
+    }
 
-	// Get additional properties (this may imply a recursion of this method on a sub-entity).
-	$additional_properties = wl_content_embed_compile_microdata_template( $post->ID, $main_type, $recursion_level );
+    // Get additional properties (this may imply a recursion of this method on a sub-entity).
+    $additional_properties = wl_content_embed_compile_microdata_template( $post->ID, $main_type, $recursion_level );
 
-	$same_as = '';
-	// Get the array of sameAs uris.
-	$same_as_uris = wl_schema_get_value( $post->ID, 'sameAs' );
-	// Prepare the sameAs fragment.
-	foreach ( $same_as_uris as $same_as_uri ) {
-		$same_as .= "<link itemprop=\"sameAs\" href=\"$same_as_uri\">";
-	}
+    $same_as = '';
+    // Get the array of sameAs uris.
+    $same_as_uris = wl_schema_get_value( $post->ID, 'sameAs' );
+    // Prepare the sameAs fragment.
+    foreach ( $same_as_uris as $same_as_uri ) {
+        $same_as .= "<link itemprop=\"sameAs\" href=\"$same_as_uri\">";
+    }
 
-	// Get the entity URL.
-	$permalink = get_permalink( $post->ID );
-	$url       = '<link itemprop="url" href="' . $permalink . '" />';
+    // Get the entity URL.
+    $permalink = get_permalink( $post->ID );
+    $url       = '<link itemprop="url" href="' . $permalink . '" />';
 
-	// Replace the original tagging with the new tagging.
-	$regex   = wl_content_embed_build_regex_from_uri( $uri );
-	$content = preg_replace( $regex,
-		'<$1' . $itemprop . ' itemscope' . $item_type . ' itemid="' . esc_attr( $entity_uri ) . '">'
-		. $same_as
-		. $additional_properties
-		. $url
-		. '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>',    //Only print name inside <span> for top-level entities
-		$content
-	);
+    // Replace the original tagging with the new tagging.
+    $regex   = wl_content_embed_build_regex_from_uri( $uri );
+    $content = preg_replace( $regex,
+        '<$1' . $itemprop . ' itemscope' . $item_type . ' itemid="' . esc_attr( $entity_uri ) . '">'
+        . $same_as
+        . $additional_properties
+        . $url
+        . '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>',    //Only print name inside <span> for top-level entities
+        $content
+    );
 
-	// wl_write_log( "wl_content_embed_item_microdata [ uri :: $uri ][ regex :: $regex ]" );
+    // wl_write_log( "wl_content_embed_item_microdata [ uri :: $uri ][ regex :: $regex ]" );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'the_content', 'wl_content_embed_microdata' );
@@ -158,93 +158,93 @@ 
  * @return string The content with embedded microdata.
  */
 function wl_content_embed_compile_microdata_template( $entity_id, $entity_type, $recursion_level = 0 ) {
-	global $wl_logger;
-
-	if ( WP_DEBUG ) {
-		$wl_logger->trace( "Embedding microdata [ entity id :: $entity_id ][ entity type :: " . var_export( $entity_type, true ) . " ][ recursion level :: $recursion_level ]" );
-	}
-
-	$regex   = '/{{(.*?)}}/';
-	$matches = array();
-
-	if ( null === $entity_type ) {
-		return '';
-	}
-
-	$template = $entity_type['microdata_template'];
-	// Return empty string if template fields have not been found.
-	if ( false === preg_match_all( $regex, $template, $matches, PREG_SET_ORDER ) ) {
-		return '';
-	}
-
-	foreach ( $matches as $match ) {
-
-		$placeholder = $match[0];
-		$field_name  = $match[1];
-
-		// Get property value.
-		$meta_collection = wl_schema_get_value( $entity_id, $field_name );
-
-		// If no value is given, just remove the placeholder from the template
-		if ( null == $meta_collection ) {
-			$template = str_replace( $placeholder, '', $template );
-			continue;
-		}
-
-		// What kind of value is it?
-		// TODO: Performance issue here: meta type retrieving should be centralized
-		$expected_type = wl_get_meta_type( $field_name );
-
-		if ( WP_DEBUG ) {
-			$wl_logger->trace( "Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: " . ( is_array( $meta_collection ) ? var_export( $meta_collection, true ) : $meta_collection ) . " ][ expected type :: $expected_type ]" );
-		}
-
-		foreach ( $meta_collection as $field_value ) {
-
-			// Quick and dirty patch for #163:
-			//  - only apply to URIs, i.e. to properties pointing to another post ( $field_value should be a post ID ),
-			//  - check that $field_value is actually a number,
-			//  - check that the referenced post is published.
-			//  OR
-			//  - if the value is empty then we don't display it.
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric( $field_value ) && 'publish' !== ( $post_status = get_post_status( $field_value ) )
-			     || empty( $field_value )
-			) {
-
-				if ( WP_DEBUG ) {
-					$wl_logger->trace( "Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]" );
-				}
-
-				// Remove the placeholder.
-				$template = str_replace( $placeholder, '', $template );
-				continue;
-			}
-
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type ) {
-				// If is a numeric value we assume it is an ID referencing for an internal entity.
-				if ( is_numeric( $field_value ) ) {
-					// Found id, get uri.
-					$field_value = wl_get_entity_uri( $field_value );
-				}
-				// Just if the linked entity does exist I can go further with template compiling
-				$nested_entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $field_value );
-				if ( ! is_null( $nested_entity ) ) {
-					$content           = '<span itemid="' . esc_attr( $field_value ) . '">' . $nested_entity->post_title . '</span>';
-					$compiled_template = wl_content_embed_item_microdata( $content, $field_value, $field_name, ++ $recursion_level );
-					$template          = str_replace( $placeholder, $compiled_template, $template );
-				} else {
-					$template = str_replace( $placeholder, '', $template );
-				}
-				continue;
-			}
-
-			// Standard condition: field containing a raw value
-			// For non visible test, schema.org dictates to use the *meta* tag.
-			// see http://schema.org/docs/gs.html#advanced_missing
-			$value    = '<meta itemprop="' . esc_attr( $field_name ) . '" content="' . esc_attr( $field_value ) . '" />';
-			$template = str_replace( $placeholder, $value, $template );
-		}
-	}
-
-	return $template;
+    global $wl_logger;
+
+    if ( WP_DEBUG ) {
+        $wl_logger->trace( "Embedding microdata [ entity id :: $entity_id ][ entity type :: " . var_export( $entity_type, true ) . " ][ recursion level :: $recursion_level ]" );
+    }
+
+    $regex   = '/{{(.*?)}}/';
+    $matches = array();
+
+    if ( null === $entity_type ) {
+        return '';
+    }
+
+    $template = $entity_type['microdata_template'];
+    // Return empty string if template fields have not been found.
+    if ( false === preg_match_all( $regex, $template, $matches, PREG_SET_ORDER ) ) {
+        return '';
+    }
+
+    foreach ( $matches as $match ) {
+
+        $placeholder = $match[0];
+        $field_name  = $match[1];
+
+        // Get property value.
+        $meta_collection = wl_schema_get_value( $entity_id, $field_name );
+
+        // If no value is given, just remove the placeholder from the template
+        if ( null == $meta_collection ) {
+            $template = str_replace( $placeholder, '', $template );
+            continue;
+        }
+
+        // What kind of value is it?
+        // TODO: Performance issue here: meta type retrieving should be centralized
+        $expected_type = wl_get_meta_type( $field_name );
+
+        if ( WP_DEBUG ) {
+            $wl_logger->trace( "Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: " . ( is_array( $meta_collection ) ? var_export( $meta_collection, true ) : $meta_collection ) . " ][ expected type :: $expected_type ]" );
+        }
+
+        foreach ( $meta_collection as $field_value ) {
+
+            // Quick and dirty patch for #163:
+            //  - only apply to URIs, i.e. to properties pointing to another post ( $field_value should be a post ID ),
+            //  - check that $field_value is actually a number,
+            //  - check that the referenced post is published.
+            //  OR
+            //  - if the value is empty then we don't display it.
+            if ( Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric( $field_value ) && 'publish' !== ( $post_status = get_post_status( $field_value ) )
+                 || empty( $field_value )
+            ) {
+
+                if ( WP_DEBUG ) {
+                    $wl_logger->trace( "Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]" );
+                }
+
+                // Remove the placeholder.
+                $template = str_replace( $placeholder, '', $template );
+                continue;
+            }
+
+            if ( Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type ) {
+                // If is a numeric value we assume it is an ID referencing for an internal entity.
+                if ( is_numeric( $field_value ) ) {
+                    // Found id, get uri.
+                    $field_value = wl_get_entity_uri( $field_value );
+                }
+                // Just if the linked entity does exist I can go further with template compiling
+                $nested_entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $field_value );
+                if ( ! is_null( $nested_entity ) ) {
+                    $content           = '<span itemid="' . esc_attr( $field_value ) . '">' . $nested_entity->post_title . '</span>';
+                    $compiled_template = wl_content_embed_item_microdata( $content, $field_value, $field_name, ++ $recursion_level );
+                    $template          = str_replace( $placeholder, $compiled_template, $template );
+                } else {
+                    $template = str_replace( $placeholder, '', $template );
+                }
+                continue;
+            }
+
+            // Standard condition: field containing a raw value
+            // For non visible test, schema.org dictates to use the *meta* tag.
+            // see http://schema.org/docs/gs.html#advanced_missing
+            $value    = '<meta itemprop="' . esc_attr( $field_name ) . '" content="' . esc_attr( $field_value ) . '" />';
+            $template = str_replace( $placeholder, $value, $template );
+        }
+    }
+
+    return $template;
 }
\ No newline at end of file

Spacing +62 added lines, -62 removed lines

@@ -9,8 +9,8 @@ 
  *
  * @param string $uri Uri of the entity to search in the post content.
  */
-function wl_content_embed_build_regex_from_uri( $uri ) {
-	return '|<(\\w+)[^<]* itemid=\"' . esc_attr( $uri ) . '\"[^>]*>([^<]*)<\\/\\1>|i';
+function wl_content_embed_build_regex_from_uri($uri) {
+	return '|<(\\w+)[^<]* itemid=\"'.esc_attr($uri).'\"[^>]*>([^<]*)<\\/\\1>|i';
 }
 
 /**
@@ -20,7 +20,7 @@ 
  *
  * @return string The updated post content.
  */
-function wl_content_embed_microdata( $content ) {
+function wl_content_embed_microdata($content) {
 
 	// Apply microdata only to single pages.
 	/*if ( ! is_single() ) {
@@ -31,7 +31,7 @@ 
 
 	global $post;
         */
-	return _wl_content_embed_microdata( get_the_ID(), $content );
+	return _wl_content_embed_microdata(get_the_ID(), $content);
 }
 
 /**
@@ -42,12 +42,12 @@ 
  *
  * @return string The updated post content.
  */
-function _wl_content_embed_microdata( $post_id, $content ) {
+function _wl_content_embed_microdata($post_id, $content) {
 
 	// If it is an entity, add its own microdata to the content.
-	if ( get_post_type( $post_id ) == Wordlift_Entity_Service::TYPE_NAME ) {
-		$own_uri = wl_get_entity_uri( $post_id );
-		$content .= '<span itemid="' . $own_uri . '"></span>';
+	if (get_post_type($post_id) == Wordlift_Entity_Service::TYPE_NAME) {
+		$own_uri = wl_get_entity_uri($post_id);
+		$content .= '<span itemid="'.$own_uri.'"></span>';
 	}
 
 	// Now search in the text entity mentions
@@ -55,17 +55,17 @@ 
 	$matches = array();
 
 	// Return the content if not item IDs have been found.
-	if ( false === preg_match_all( $regex, $content, $matches, PREG_SET_ORDER ) ) {
+	if (false === preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
 		return $content;
 	}
 
 	// TODO: Retrieve here just one time entities type structure to avoid multiple queries.
-	foreach ( $matches as $match ) {
+	foreach ($matches as $match) {
 		$item_id = $match[2];
 
 		// wl_write_log( "_wl_content_embed_microdata [ item ID :: $item_id ]" );
 
-		$content = wl_content_embed_item_microdata( $content, $item_id );
+		$content = wl_content_embed_item_microdata($content, $item_id);
 	}
 
 	return $content;
@@ -80,64 +80,64 @@ 
  *
  * @return string The content with embedded microdata.
  */
-function wl_content_embed_item_microdata( $content, $uri, $itemprop = null, $recursion_level = 0 ) {
+function wl_content_embed_item_microdata($content, $uri, $itemprop = null, $recursion_level = 0) {
 
-	if ( $recursion_level > wl_config_get_recursion_depth() ) {
-		wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
+	if ($recursion_level > wl_config_get_recursion_depth()) {
+		wl_write_log("recursion depth limit exceeded [ level :: $recursion_level ][ max :: ".wl_config_get_recursion_depth()." ]");
 
 		return '';
 	}
 
-	$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+	$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
 
 	// Entity not found or not published. Delete <span> tags but leave their content on page.
-	if ( null === $post || $post->post_status !== 'publish' ) {
+	if (null === $post || $post->post_status !== 'publish') {
 
 		// wl_write_log( "wl_content_embed_item_microdata : entity not found or not published [ uri :: $uri ]" );
 
 		// Replace the original tagging with the new tagging.
-		$regex   = wl_content_embed_build_regex_from_uri( $uri );
-		$content = preg_replace( $regex, '$2', $content );
+		$regex   = wl_content_embed_build_regex_from_uri($uri);
+		$content = preg_replace($regex, '$2', $content);
 
 		return $content;
 	}
 
 	// Get the entity URI and its escaped version for the regex.
-	$entity_uri = wl_get_entity_uri( $post->ID );
+	$entity_uri = wl_get_entity_uri($post->ID);
 	// Get the main type.
-	$main_type = wl_entity_type_taxonomy_get_type( $post->ID );
+	$main_type = wl_entity_type_taxonomy_get_type($post->ID);
 
 	// Set the item type if available.
-	$item_type = ( null === $main_type ? '' : ' itemtype="' . esc_attr( $main_type['uri'] ) . '"' );
+	$item_type = (null === $main_type ? '' : ' itemtype="'.esc_attr($main_type['uri']).'"');
 
 	// Define attribute itemprop if this entity is nested.
-	if ( ! is_null( $itemprop ) ) {
-		$itemprop = ' itemprop="' . $itemprop . '"';
+	if ( ! is_null($itemprop)) {
+		$itemprop = ' itemprop="'.$itemprop.'"';
 	}
 
 	// Get additional properties (this may imply a recursion of this method on a sub-entity).
-	$additional_properties = wl_content_embed_compile_microdata_template( $post->ID, $main_type, $recursion_level );
+	$additional_properties = wl_content_embed_compile_microdata_template($post->ID, $main_type, $recursion_level);
 
 	$same_as = '';
 	// Get the array of sameAs uris.
-	$same_as_uris = wl_schema_get_value( $post->ID, 'sameAs' );
+	$same_as_uris = wl_schema_get_value($post->ID, 'sameAs');
 	// Prepare the sameAs fragment.
-	foreach ( $same_as_uris as $same_as_uri ) {
+	foreach ($same_as_uris as $same_as_uri) {
 		$same_as .= "<link itemprop=\"sameAs\" href=\"$same_as_uri\">";
 	}
 
 	// Get the entity URL.
-	$permalink = get_permalink( $post->ID );
-	$url       = '<link itemprop="url" href="' . $permalink . '" />';
+	$permalink = get_permalink($post->ID);
+	$url       = '<link itemprop="url" href="'.$permalink.'" />';
 
 	// Replace the original tagging with the new tagging.
-	$regex   = wl_content_embed_build_regex_from_uri( $uri );
-	$content = preg_replace( $regex,
-		'<$1' . $itemprop . ' itemscope' . $item_type . ' itemid="' . esc_attr( $entity_uri ) . '">'
+	$regex   = wl_content_embed_build_regex_from_uri($uri);
+	$content = preg_replace($regex,
+		'<$1'.$itemprop.' itemscope'.$item_type.' itemid="'.esc_attr($entity_uri).'">'
 		. $same_as
 		. $additional_properties
 		. $url
-		. '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>',    //Only print name inside <span> for top-level entities
+		. '<a class="wl-entity-page-link" href="'.$permalink.'" itemprop="name" content="'.$post->post_title.'">'.(is_null($itemprop) ? '$2' : '').'</a></$1>', //Only print name inside <span> for top-level entities
 		$content
 	);
 
@@ -146,7 +146,7 @@ 
 	return $content;
 }
 
-add_filter( 'the_content', 'wl_content_embed_microdata' );
+add_filter('the_content', 'wl_content_embed_microdata');
 
 /**
  * Fills up the microdata_template with entity's values.
@@ -157,49 +157,49 @@ 
  *
  * @return string The content with embedded microdata.
  */
-function wl_content_embed_compile_microdata_template( $entity_id, $entity_type, $recursion_level = 0 ) {
+function wl_content_embed_compile_microdata_template($entity_id, $entity_type, $recursion_level = 0) {
 	global $wl_logger;
 
-	if ( WP_DEBUG ) {
-		$wl_logger->trace( "Embedding microdata [ entity id :: $entity_id ][ entity type :: " . var_export( $entity_type, true ) . " ][ recursion level :: $recursion_level ]" );
+	if (WP_DEBUG) {
+		$wl_logger->trace("Embedding microdata [ entity id :: $entity_id ][ entity type :: ".var_export($entity_type, true)." ][ recursion level :: $recursion_level ]");
 	}
 
 	$regex   = '/{{(.*?)}}/';
 	$matches = array();
 
-	if ( null === $entity_type ) {
+	if (null === $entity_type) {
 		return '';
 	}
 
 	$template = $entity_type['microdata_template'];
 	// Return empty string if template fields have not been found.
-	if ( false === preg_match_all( $regex, $template, $matches, PREG_SET_ORDER ) ) {
+	if (false === preg_match_all($regex, $template, $matches, PREG_SET_ORDER)) {
 		return '';
 	}
 
-	foreach ( $matches as $match ) {
+	foreach ($matches as $match) {
 
 		$placeholder = $match[0];
 		$field_name  = $match[1];
 
 		// Get property value.
-		$meta_collection = wl_schema_get_value( $entity_id, $field_name );
+		$meta_collection = wl_schema_get_value($entity_id, $field_name);
 
 		// If no value is given, just remove the placeholder from the template
-		if ( null == $meta_collection ) {
-			$template = str_replace( $placeholder, '', $template );
+		if (null == $meta_collection) {
+			$template = str_replace($placeholder, '', $template);
 			continue;
 		}
 
 		// What kind of value is it?
 		// TODO: Performance issue here: meta type retrieving should be centralized
-		$expected_type = wl_get_meta_type( $field_name );
+		$expected_type = wl_get_meta_type($field_name);
 
-		if ( WP_DEBUG ) {
-			$wl_logger->trace( "Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: " . ( is_array( $meta_collection ) ? var_export( $meta_collection, true ) : $meta_collection ) . " ][ expected type :: $expected_type ]" );
+		if (WP_DEBUG) {
+			$wl_logger->trace("Embedding microdata [ placeholder :: $placeholder ][ field name :: $field_name ][ meta collection :: ".(is_array($meta_collection) ? var_export($meta_collection, true) : $meta_collection)." ][ expected type :: $expected_type ]");
 		}
 
-		foreach ( $meta_collection as $field_value ) {
+		foreach ($meta_collection as $field_value) {
 
 			// Quick and dirty patch for #163:
 			//  - only apply to URIs, i.e. to properties pointing to another post ( $field_value should be a post ID ),
@@ -207,33 +207,33 @@ 
 			//  - check that the referenced post is published.
 			//  OR
 			//  - if the value is empty then we don't display it.
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric( $field_value ) && 'publish' !== ( $post_status = get_post_status( $field_value ) )
-			     || empty( $field_value )
+			if (Wordlift_Schema_Service::DATA_TYPE_URI === $expected_type && is_numeric($field_value) && 'publish' !== ($post_status = get_post_status($field_value))
+			     || empty($field_value)
 			) {
 
-				if ( WP_DEBUG ) {
-					$wl_logger->trace( "Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]" );
+				if (WP_DEBUG) {
+					$wl_logger->trace("Microdata refers to a non-published post [ field value :: $field_value ][ post status :: $post_status ]");
 				}
 
 				// Remove the placeholder.
-				$template = str_replace( $placeholder, '', $template );
+				$template = str_replace($placeholder, '', $template);
 				continue;
 			}
 
-			if ( Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type ) {
+			if (Wordlift_Schema_Service::DATA_TYPE_URI == $expected_type) {
 				// If is a numeric value we assume it is an ID referencing for an internal entity.
-				if ( is_numeric( $field_value ) ) {
+				if (is_numeric($field_value)) {
 					// Found id, get uri.
-					$field_value = wl_get_entity_uri( $field_value );
+					$field_value = wl_get_entity_uri($field_value);
 				}
 				// Just if the linked entity does exist I can go further with template compiling
-				$nested_entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $field_value );
-				if ( ! is_null( $nested_entity ) ) {
-					$content           = '<span itemid="' . esc_attr( $field_value ) . '">' . $nested_entity->post_title . '</span>';
-					$compiled_template = wl_content_embed_item_microdata( $content, $field_value, $field_name, ++ $recursion_level );
-					$template          = str_replace( $placeholder, $compiled_template, $template );
+				$nested_entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($field_value);
+				if ( ! is_null($nested_entity)) {
+					$content           = '<span itemid="'.esc_attr($field_value).'">'.$nested_entity->post_title.'</span>';
+					$compiled_template = wl_content_embed_item_microdata($content, $field_value, $field_name, ++ $recursion_level);
+					$template          = str_replace($placeholder, $compiled_template, $template);
 				} else {
-					$template = str_replace( $placeholder, '', $template );
+					$template = str_replace($placeholder, '', $template);
 				}
 				continue;
 			}
@@ -241,8 +241,8 @@ 
 			// Standard condition: field containing a raw value
 			// For non visible test, schema.org dictates to use the *meta* tag.
 			// see http://schema.org/docs/gs.html#advanced_missing
-			$value    = '<meta itemprop="' . esc_attr( $field_name ) . '" content="' . esc_attr( $field_value ) . '" />';
-			$template = str_replace( $placeholder, $value, $template );
+			$value    = '<meta itemprop="'.esc_attr($field_name).'" content="'.esc_attr($field_value).'" />';
+			$template = str_replace($placeholder, $value, $template);
 		}
 	}
 

src/wordlift_entity_functions.php

Indentation +139 added lines, -139 removed lines

@@ -13,35 +13,35 @@ 
 function wl_get_entity_post_ids_by_uris( $uris ) {
 
 
-	if ( empty( $uris ) ) {
-		return array();
-	}
-
-	$query = new WP_Query( array(
-			'fields'      => 'ids',
-			'post_status' => 'any',
-			'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
-			'meta_query'  => array(
-				'relation' => 'OR',
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-					'value'   => $uris,
-					'compare' => 'IN'
-				),
-				array(
-					'key'     => 'entity_url',
-					'value'   => $uris,
-					'compare' => 'IN'
-				)
-			)
-		)
-	);
-
-	// Get the matching entity posts.
-	$posts = $query->get_posts();
-
-	// Return the array
-	return $posts;
+    if ( empty( $uris ) ) {
+        return array();
+    }
+
+    $query = new WP_Query( array(
+            'fields'      => 'ids',
+            'post_status' => 'any',
+            'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
+            'meta_query'  => array(
+                'relation' => 'OR',
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                    'value'   => $uris,
+                    'compare' => 'IN'
+                ),
+                array(
+                    'key'     => 'entity_url',
+                    'value'   => $uris,
+                    'compare' => 'IN'
+                )
+            )
+        )
+    );
+
+    // Get the matching entity posts.
+    $posts = $query->get_posts();
+
+    // Return the array
+    return $posts;
 }
 
 /**
@@ -56,30 +56,30 @@ 
  */
 function wl_build_entity_uri( $post_id ) {
 
-	// Get the post.
-	$post = get_post( $post_id );
+    // Get the post.
+    $post = get_post( $post_id );
 
-	if ( null === $post ) {
+    if ( null === $post ) {
 
-		wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
+        wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
 
-		return null;
-	}
+        return null;
+    }
 
-	// Create an ID given the title.
-	$path = wl_sanitize_uri_path( $post->post_title );
+    // Create an ID given the title.
+    $path = wl_sanitize_uri_path( $post->post_title );
 
-	// If the path is empty, i.e. there's no title, use the post ID as path.
-	if ( empty( $path ) ) {
-		$path = "id/$post->ID";
-	}
+    // If the path is empty, i.e. there's no title, use the post ID as path.
+    if ( empty( $path ) ) {
+        $path = "id/$post->ID";
+    }
 
-	// Create the URL (dataset base URI has a trailing slash).
-	$url = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), $post->post_type, $path );
+    // Create the URL (dataset base URI has a trailing slash).
+    $url = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), $post->post_type, $path );
 
-	// wl_write_log( "wl_build_entity_uri [ post_id :: $post->ID ][ type :: $post->post_type ][ title :: $post->post_title ][ url :: $url ]" );
+    // wl_write_log( "wl_build_entity_uri [ post_id :: $post->ID ][ type :: $post->post_type ][ title :: $post->post_title ][ url :: $url ]" );
 
-	return $url;
+    return $url;
 }
 
 /**
@@ -94,21 +94,21 @@ 
  */
 function wl_get_entity_uri( $post_id ) {
 
-	$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+    $uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
 
-	// If the dataset uri is not properly configured, null is returned
-	if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
-		return null;
-	}
+    // If the dataset uri is not properly configured, null is returned
+    if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
+        return null;
+    }
 
-	// Set the URI if it isn't set yet.
-	$post_status = get_post_status( $post_id );
-	if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
-		$uri = wl_build_entity_uri( $post_id ); //  "http://data.redlink.io/$user_id/$dataset_id/post/$post->ID";
-		wl_set_entity_uri( $post_id, $uri );
-	}
+    // Set the URI if it isn't set yet.
+    $post_status = get_post_status( $post_id );
+    if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
+        $uri = wl_build_entity_uri( $post_id ); //  "http://data.redlink.io/$user_id/$dataset_id/post/$post->ID";
+        wl_set_entity_uri( $post_id, $uri );
+    }
 
-	return $uri;
+    return $uri;
 }
 
 /**
@@ -121,9 +121,9 @@ 
  */
 function wl_set_entity_uri( $post_id, $uri ) {
 
-	// wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
+    // wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
 
-	return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
+    return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
 }
 
 
@@ -137,7 +137,7 @@ 
  * @return array An array of terms.
  */
 function wl_get_entity_rdf_types( $post_id ) {
-	return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+    return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
 }
 
 /**
@@ -148,21 +148,21 @@ 
  */
 function wl_set_entity_rdf_types( $post_id, $type_uris = array() ) {
 
-	// Avoid errors because of null values.
-	if ( is_null( $type_uris ) ) {
-		$type_uris = array();
-	}
-
-	// Ensure there are no duplicates.
-	$type_uris = array_unique( $type_uris );
-
-	delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
-	foreach ( $type_uris as $type_uri ) {
-		if ( empty( $type_uri ) ) {
-			continue;
-		}
-		add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
-	}
+    // Avoid errors because of null values.
+    if ( is_null( $type_uris ) ) {
+        $type_uris = array();
+    }
+
+    // Ensure there are no duplicates.
+    $type_uris = array_unique( $type_uris );
+
+    delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+    foreach ( $type_uris as $type_uri ) {
+        if ( empty( $type_uri ) ) {
+            continue;
+        }
+        add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
+    }
 }
 
 /**
@@ -175,33 +175,33 @@ 
  */
 function wl_get_meta_type( $property_name ) {
 
-	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
-		return null;
-	}
+    // Property name must be defined.
+    if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+        return null;
+    }
 
-	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // store eventual schema name in  different variable
+    $property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Loop over custom_fields
-	$entity_terms = wl_entity_taxonomy_get_custom_fields();
+    // Loop over custom_fields
+    $entity_terms = wl_entity_taxonomy_get_custom_fields();
 
-	foreach ( $entity_terms as $term ) {
+    foreach ( $entity_terms as $term ) {
 
-		foreach ( $term as $wl_constant => $field ) {
+        foreach ( $term as $wl_constant => $field ) {
 
-			// Is this the predicate we are searching for?
-			if ( isset( $field['type'] ) ) {
-				$found_predicate = isset( $field['predicate'] ) && ( $field['predicate'] == $property_schema_name );
-				$found_constant  = ( $wl_constant == $property_name );
-				if ( $found_predicate || $found_constant ) {
-					return $field['type'];
-				}
-			}
-		}
-	}
+            // Is this the predicate we are searching for?
+            if ( isset( $field['type'] ) ) {
+                $found_predicate = isset( $field['predicate'] ) && ( $field['predicate'] == $property_schema_name );
+                $found_constant  = ( $wl_constant == $property_name );
+                if ( $found_predicate || $found_constant ) {
+                    return $field['type'];
+                }
+            }
+        }
+    }
 
-	return null;
+    return null;
 }
 
 /**
@@ -214,31 +214,31 @@ 
  */
 function wl_get_meta_constraints( $property_name ) {
 
-	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
-		return null;
-	}
-
-	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
-
-	// Get WL taxonomy mapping.
-	$types = wl_entity_taxonomy_get_custom_fields();
-
-	// Loop over types
-	foreach ( $types as $type ) {
-		// Loop over custom fields of this type
-		foreach ( $type as $property => $field ) {
-			if ( isset( $field['constraints'] ) && ! empty( $field['constraints'] ) ) {
-				// Is this the property we are searhing for?
-				if ( ( $property == $property_name ) || ( $field['predicate'] == $property_schema_name ) ) {
-					return $field['constraints'];
-				}
-			}
-		}
-	}
-
-	return null;
+    // Property name must be defined.
+    if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+        return null;
+    }
+
+    // store eventual schema name in  different variable
+    $property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+
+    // Get WL taxonomy mapping.
+    $types = wl_entity_taxonomy_get_custom_fields();
+
+    // Loop over types
+    foreach ( $types as $type ) {
+        // Loop over custom fields of this type
+        foreach ( $type as $property => $field ) {
+            if ( isset( $field['constraints'] ) && ! empty( $field['constraints'] ) ) {
+                // Is this the property we are searhing for?
+                if ( ( $property == $property_name ) || ( $field['predicate'] == $property_schema_name ) ) {
+                    return $field['constraints'];
+                }
+            }
+        }
+    }
+
+    return null;
 }
 
 /**
@@ -250,30 +250,30 @@ 
  */
 function wl_entity_taxonomy_get_custom_fields( $entity_id = null ) {
 
-	if ( is_null( $entity_id ) ) {
+    if ( is_null( $entity_id ) ) {
 
-		// Return all custom fields.
-		// Get taxonomy terms
-		$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array( 'hide_empty' => 0 ) );
+        // Return all custom fields.
+        // Get taxonomy terms
+        $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array( 'hide_empty' => 0 ) );
 
-		if ( is_wp_error( $terms ) ) {
-			return null;
-		}
+        if ( is_wp_error( $terms ) ) {
+            return null;
+        }
 
-		$custom_fields = array();
-		foreach ( $terms as $term ) {
-			// Get custom_fields
-			$term_options                          = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
-			$custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
-		}
+        $custom_fields = array();
+        foreach ( $terms as $term ) {
+            // Get custom_fields
+            $term_options                          = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+            $custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
+        }
 
-		return $custom_fields;
+        return $custom_fields;
 
-	}
+    }
 
-	// Return custom fields for this specific entity's type.
-	$type = wl_entity_type_taxonomy_get_type( $entity_id );
+    // Return custom fields for this specific entity's type.
+    $type = wl_entity_type_taxonomy_get_type( $entity_id );
 
-	return $type['custom_fields'];
+    return $type['custom_fields'];
 
 }

Spacing +52 added lines, -52 removed lines

@@ -10,14 +10,14 @@ 
  *
  * @return array A WP_Post instance or null if not found.
  */
-function wl_get_entity_post_ids_by_uris( $uris ) {
+function wl_get_entity_post_ids_by_uris($uris) {
 
 
-	if ( empty( $uris ) ) {
+	if (empty($uris)) {
 		return array();
 	}
 
-	$query = new WP_Query( array(
+	$query = new WP_Query(array(
 			'fields'      => 'ids',
 			'post_status' => 'any',
 			'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
@@ -54,28 +54,28 @@ 
  *
  * @return string The URI of the entity
  */
-function wl_build_entity_uri( $post_id ) {
+function wl_build_entity_uri($post_id) {
 
 	// Get the post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if ( null === $post ) {
+	if (null === $post) {
 
-		wl_write_log( "wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]" );
+		wl_write_log("wl_build_entity_uri : error [ post ID :: $post_id ][ post :: null ]");
 
 		return null;
 	}
 
 	// Create an ID given the title.
-	$path = wl_sanitize_uri_path( $post->post_title );
+	$path = wl_sanitize_uri_path($post->post_title);
 
 	// If the path is empty, i.e. there's no title, use the post ID as path.
-	if ( empty( $path ) ) {
+	if (empty($path)) {
 		$path = "id/$post->ID";
 	}
 
 	// Create the URL (dataset base URI has a trailing slash).
-	$url = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), $post->post_type, $path );
+	$url = sprintf('%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), $post->post_type, $path);
 
 	// wl_write_log( "wl_build_entity_uri [ post_id :: $post->ID ][ type :: $post->post_type ][ title :: $post->post_title ][ url :: $url ]" );
 
@@ -92,20 +92,20 @@ 
  *
  * @return string|null The URI of the entity or null if not configured.
  */
-function wl_get_entity_uri( $post_id ) {
+function wl_get_entity_uri($post_id) {
 
-	$uri = get_post_meta( $post_id, WL_ENTITY_URL_META_NAME, true );
+	$uri = get_post_meta($post_id, WL_ENTITY_URL_META_NAME, true);
 
 	// If the dataset uri is not properly configured, null is returned
-	if ( '' === wl_configuration_get_redlink_dataset_uri() ) {
+	if ('' === wl_configuration_get_redlink_dataset_uri()) {
 		return null;
 	}
 
 	// Set the URI if it isn't set yet.
-	$post_status = get_post_status( $post_id );
-	if ( empty( $uri ) && 'auto-draft' !== $post_status && 'revision' !== $post_status ) {
-		$uri = wl_build_entity_uri( $post_id ); //  "http://data.redlink.io/$user_id/$dataset_id/post/$post->ID";
-		wl_set_entity_uri( $post_id, $uri );
+	$post_status = get_post_status($post_id);
+	if (empty($uri) && 'auto-draft' !== $post_status && 'revision' !== $post_status) {
+		$uri = wl_build_entity_uri($post_id); //  "http://data.redlink.io/$user_id/$dataset_id/post/$post->ID";
+		wl_set_entity_uri($post_id, $uri);
 	}
 
 	return $uri;
@@ -119,11 +119,11 @@ 
  *
  * @return bool True if successful, otherwise false.
  */
-function wl_set_entity_uri( $post_id, $uri ) {
+function wl_set_entity_uri($post_id, $uri) {
 
 	// wl_write_log( "wl_set_entity_uri [ post id :: $post_id ][ uri :: $uri ]" );
 
-	return update_post_meta( $post_id, WL_ENTITY_URL_META_NAME, $uri );
+	return update_post_meta($post_id, WL_ENTITY_URL_META_NAME, $uri);
 }
 
 
@@ -136,8 +136,8 @@ 
  *
  * @return array An array of terms.
  */
-function wl_get_entity_rdf_types( $post_id ) {
-	return get_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
+function wl_get_entity_rdf_types($post_id) {
+	return get_post_meta($post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE);
 }
 
 /**
@@ -146,22 +146,22 @@ 
  * @param int $post_id The entity post ID.
  * @param array $type_uris An array of type URIs.
  */
-function wl_set_entity_rdf_types( $post_id, $type_uris = array() ) {
+function wl_set_entity_rdf_types($post_id, $type_uris = array()) {
 
 	// Avoid errors because of null values.
-	if ( is_null( $type_uris ) ) {
+	if (is_null($type_uris)) {
 		$type_uris = array();
 	}
 
 	// Ensure there are no duplicates.
-	$type_uris = array_unique( $type_uris );
+	$type_uris = array_unique($type_uris);
 
-	delete_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE );
-	foreach ( $type_uris as $type_uri ) {
-		if ( empty( $type_uri ) ) {
+	delete_post_meta($post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE);
+	foreach ($type_uris as $type_uri) {
+		if (empty($type_uri)) {
 			continue;
 		}
-		add_post_meta( $post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri );
+		add_post_meta($post_id, Wordlift_Schema_Service::FIELD_ENTITY_TYPE, $type_uri);
 	}
 }
 
@@ -173,28 +173,28 @@ 
  *
  * @return array containing type(s) or null (in case of error or no types).
  */
-function wl_get_meta_type( $property_name ) {
+function wl_get_meta_type($property_name) {
 
 	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+	if ( ! isset($property_name) || is_null($property_name)) {
 		return null;
 	}
 
 	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_schema_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Loop over custom_fields
 	$entity_terms = wl_entity_taxonomy_get_custom_fields();
 
-	foreach ( $entity_terms as $term ) {
+	foreach ($entity_terms as $term) {
 
-		foreach ( $term as $wl_constant => $field ) {
+		foreach ($term as $wl_constant => $field) {
 
 			// Is this the predicate we are searching for?
-			if ( isset( $field['type'] ) ) {
-				$found_predicate = isset( $field['predicate'] ) && ( $field['predicate'] == $property_schema_name );
-				$found_constant  = ( $wl_constant == $property_name );
-				if ( $found_predicate || $found_constant ) {
+			if (isset($field['type'])) {
+				$found_predicate = isset($field['predicate']) && ($field['predicate'] == $property_schema_name);
+				$found_constant  = ($wl_constant == $property_name);
+				if ($found_predicate || $found_constant) {
 					return $field['type'];
 				}
 			}
@@ -212,26 +212,26 @@ 
  *
  * @return array containing constraint(s) or null (in case of error or no constraint).
  */
-function wl_get_meta_constraints( $property_name ) {
+function wl_get_meta_constraints($property_name) {
 
 	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+	if ( ! isset($property_name) || is_null($property_name)) {
 		return null;
 	}
 
 	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_schema_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Get WL taxonomy mapping.
 	$types = wl_entity_taxonomy_get_custom_fields();
 
 	// Loop over types
-	foreach ( $types as $type ) {
+	foreach ($types as $type) {
 		// Loop over custom fields of this type
-		foreach ( $type as $property => $field ) {
-			if ( isset( $field['constraints'] ) && ! empty( $field['constraints'] ) ) {
+		foreach ($type as $property => $field) {
+			if (isset($field['constraints']) && ! empty($field['constraints'])) {
 				// Is this the property we are searhing for?
-				if ( ( $property == $property_name ) || ( $field['predicate'] == $property_schema_name ) ) {
+				if (($property == $property_name) || ($field['predicate'] == $property_schema_name)) {
 					return $field['constraints'];
 				}
 			}
@@ -248,23 +248,23 @@ 
  *
  * @return array|null if $entity_id was specified, return custom_fields for that entity's type. Otherwise returns all custom_fields
  */
-function wl_entity_taxonomy_get_custom_fields( $entity_id = null ) {
+function wl_entity_taxonomy_get_custom_fields($entity_id = null) {
 
-	if ( is_null( $entity_id ) ) {
+	if (is_null($entity_id)) {
 
 		// Return all custom fields.
 		// Get taxonomy terms
-		$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array( 'hide_empty' => 0 ) );
+		$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array('hide_empty' => 0));
 
-		if ( is_wp_error( $terms ) ) {
+		if (is_wp_error($terms)) {
 			return null;
 		}
 
 		$custom_fields = array();
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 			// Get custom_fields
-			$term_options                          = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
-			$custom_fields[ $term_options['uri'] ] = $term_options['custom_fields'];
+			$term_options                          = Wordlift_Schema_Service::get_instance()->get_schema($term->slug);
+			$custom_fields[$term_options['uri']] = $term_options['custom_fields'];
 		}
 
 		return $custom_fields;
@@ -272,7 +272,7 @@ 
 	}
 
 	// Return custom fields for this specific entity's type.
-	$type = wl_entity_type_taxonomy_get_type( $entity_id );
+	$type = wl_entity_type_taxonomy_get_type($entity_id);
 
 	return $type['custom_fields'];
 

src/modules/core/wordlift_core_install.php

Indentation +118 added lines, -118 removed lines

@@ -5,99 +5,99 @@ 
  */
 function wl_core_install_entity_type_data() {
 
-	// global $wl_logger;
-	// $wl_logger->trace( 'Installing entity type data...' );
-
-	// Ensure the custom type and the taxonomy are registered.
-	wl_entity_type_register();
-	wl_entity_type_taxonomy_register();
-
-	// Set the taxonomy data.
-	// Note: parent types must be defined before child types.
-	$terms = array(
-		'thing'         => array(
-			'label'       => 'Thing',
-			'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
-		),
-		'creative-work' => array(
-			'label'       => 'CreativeWork',
-			'description' => 'A creative work (or a Music Album).',
-			'parents'     => array( 'thing' ), // give term slug as parent
-		),
-		'event'         => array(
-			'label'       => 'Event',
-			'description' => 'An event.',
-			'parents'     => array( 'thing' ),
-		),
-		'organization'  => array(
-			'label'       => 'Organization',
-			'description' => 'An organization, including a government or a newspaper.',
-			'parents'     => array( 'thing' ),
-		),
-		'person'        => array(
-			'label'       => 'Person',
-			'description' => 'A person (or a music artist).',
-			'parents'     => array( 'thing' ),
-		),
-		'place'         => array(
-			'label'       => 'Place',
-			'description' => 'A place.',
-			'parents'     => array( 'thing' ),
-		),
-		'localbusiness' => array(
-			'label'       => 'LocalBusiness',
-			'description' => 'A local business.',
-			'parents'     => array( 'place', 'organization' ),
-		),
-	);
-
-	foreach ( $terms as $slug => $term ) {
-
-		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( $term_id == 0 || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		} else {
-			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
-		}
-
-		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
-			continue;
-		}
-
-		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
-			$term['parents'] = array();
-		}
-
-		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
-		}
-
-		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
-			// No parent
-			$parent_id = 0;
-		} else {
-			// Get first parent
-			$parent_id = $parent_ids[0];
-		}
-
-		// Update term with description, slug and parent
-		wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-			'name'        => $term['label'],
-			'slug'        => $slug,
-			'description' => $term['description'],
-			'parent'      => $parent_id   // We give to WP taxonomy just one parent. TODO: see if can give more than one
-		) );
-
-	}
+    // global $wl_logger;
+    // $wl_logger->trace( 'Installing entity type data...' );
+
+    // Ensure the custom type and the taxonomy are registered.
+    wl_entity_type_register();
+    wl_entity_type_taxonomy_register();
+
+    // Set the taxonomy data.
+    // Note: parent types must be defined before child types.
+    $terms = array(
+        'thing'         => array(
+            'label'       => 'Thing',
+            'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
+        ),
+        'creative-work' => array(
+            'label'       => 'CreativeWork',
+            'description' => 'A creative work (or a Music Album).',
+            'parents'     => array( 'thing' ), // give term slug as parent
+        ),
+        'event'         => array(
+            'label'       => 'Event',
+            'description' => 'An event.',
+            'parents'     => array( 'thing' ),
+        ),
+        'organization'  => array(
+            'label'       => 'Organization',
+            'description' => 'An organization, including a government or a newspaper.',
+            'parents'     => array( 'thing' ),
+        ),
+        'person'        => array(
+            'label'       => 'Person',
+            'description' => 'A person (or a music artist).',
+            'parents'     => array( 'thing' ),
+        ),
+        'place'         => array(
+            'label'       => 'Place',
+            'description' => 'A place.',
+            'parents'     => array( 'thing' ),
+        ),
+        'localbusiness' => array(
+            'label'       => 'LocalBusiness',
+            'description' => 'A local business.',
+            'parents'     => array( 'place', 'organization' ),
+        ),
+    );
+
+    foreach ( $terms as $slug => $term ) {
+
+        // Create the term if it does not exist, then get its ID
+        $term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( $term_id == 0 || is_null( $term_id ) ) {
+            $result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+        } else {
+            $term_id = $term_id['term_id'];
+            $result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+        }
+
+        // Check for errors.
+        if ( is_wp_error( $result ) ) {
+            wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+            continue;
+        }
+
+        // Check if 'parent' corresponds to an actual term and get its ID.
+        if ( ! isset( $term['parents'] ) ) {
+            $term['parents'] = array();
+        }
+
+        $parent_ids = array();
+        foreach ( $term['parents'] as $parent_slug ) {
+            $parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+        }
+
+        // Define a parent in the WP taxonomy style (not important for WL)
+        if ( empty( $parent_ids ) ) {
+            // No parent
+            $parent_id = 0;
+        } else {
+            // Get first parent
+            $parent_id = $parent_ids[0];
+        }
+
+        // Update term with description, slug and parent
+        wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+            'name'        => $term['label'],
+            'slug'        => $slug,
+            'description' => $term['description'],
+            'parent'      => $parent_id   // We give to WP taxonomy just one parent. TODO: see if can give more than one
+        ) );
+
+    }
 
 }
 
@@ -106,16 +106,16 @@ 
  */
 function wl_core_install_create_relation_instance_table() {
 
-	global $wpdb;
-	// global $wl_db_version;
-	$installed_version = get_option( "wl_db_version" );
+    global $wpdb;
+    // global $wl_db_version;
+    $installed_version = get_option( "wl_db_version" );
 
-	if ( $installed_version != WL_DB_VERSION ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$charset_collate = $wpdb->get_charset_collate();
+    if ( $installed_version != WL_DB_VERSION ) {
+        $table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+        $charset_collate = $wpdb->get_charset_collate();
 
-		// Sql statement for the relation instances custom table
-		$sql = <<<EOF
+        // Sql statement for the relation instances custom table
+        $sql = <<<EOF
 			CREATE TABLE $table_name (
   				id int(11) NOT NULL AUTO_INCREMENT,
   				subject_id int(11) NOT NULL,
@@ -127,14 +127,14 @@ 
 			) $charset_collate;
 EOF;
 
-		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+        // @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        $results = dbDelta( $sql );
 
-		wl_write_log( $results );
+        wl_write_log( $results );
 
-		update_option( "wl_db_version", WL_DB_VERSION );
-	}
+        update_option( "wl_db_version", WL_DB_VERSION );
+    }
 }
 
 /**
@@ -142,15 +142,15 @@ 
  */
 function wl_core_install() {
 
-	// Create a blank application key if there is none
-	$key = wl_configuration_get_key();
-	if ( empty( $key ) ) {
-		wl_configuration_set_key( '' );
-	}
+    // Create a blank application key if there is none
+    $key = wl_configuration_get_key();
+    if ( empty( $key ) ) {
+        wl_configuration_set_key( '' );
+    }
 
-	wl_core_install_entity_type_data();
-	wl_core_install_create_relation_instance_table();
-	flush_rewrite_rules();
+    wl_core_install_entity_type_data();
+    wl_core_install_create_relation_instance_table();
+    flush_rewrite_rules();
 }
 
 // Installation Hook
@@ -158,9 +158,9 @@ 
 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
-	if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
-		wl_core_install_create_relation_instance_table();
-	}
+    if ( get_site_option( 'wl_db_version' ) != WL_DB_VERSION ) {
+        wl_core_install_create_relation_instance_table();
+    }
 }
 
 add_action( 'plugins_loaded', 'wl_core_update_db_check' );

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

Doc Comments +7 added lines, -1 removed lines

@@ -198,7 +198,7 @@ 
 	 * Calculate the avarage entities rating
 	 * @since 3.4.0
 	 *
-	 * @return int Avarage entities rating.
+	 * @return double Avarage entities rating.
 	 */
 	public function avarage_entities_rating() {
 		
@@ -254,6 +254,9 @@ 
 		return (int) FALSE;
 	}
 
+	/**
+	 * @param string $query
+	 */
 	private function rl_sparql_select( $query ) {
 
 		// Prepare the SPARQL statement by prepending the default namespaces.
@@ -266,6 +269,9 @@ 
 		return wp_remote_get( $url, $args );
 	}
 
+	/**
+	 * @param string $param
+	 */
 	private function render_stat_param( $param ) {
 
 		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';

Indentation +191 added lines, -191 removed lines

@@ -14,83 +14,83 @@ 
 class Wordlift_Dashboard_Service {
 	
 
-	/**
-	 * Transient Name
-	 * 
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_NAME = 'wl_dashboard_stats';
+    /**
+     * Transient Name
+     * 
+     * @since  3.4.0
+     */
+    const TRANSIENT_NAME = 'wl_dashboard_stats';
 
-	/**
-	 * Transient Expiration (in seconds)
-	 * 
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_EXPIRATION = 86400;
+    /**
+     * Transient Expiration (in seconds)
+     * 
+     * @since  3.4.0
+     */
+    const TRANSIENT_EXPIRATION = 86400;
 
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.4.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
+    /**
+     * The Entity service.
+     *
+     * @since 3.4.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
 
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	public function __construct( $entity_service ) {
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.4.0
+     *
+     * @param \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    public function __construct( $entity_service ) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Dashboard_Service' );
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Dashboard_Service' );
 
-		$this->entity_service = $entity_service;
+        $this->entity_service = $entity_service;
 
-	}
+    }
 
-	/**
-	 * Return stats layout
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string Dashboard widget html markup
-	 */
-	public function dashboard_widget_callback( $post ) {
+    /**
+     * Return stats layout
+     *
+     * @since 3.4.0
+     *
+     * @return string Dashboard widget html markup
+     */
+    public function dashboard_widget_callback( $post ) {
 
-		$enriched_posts_title = __( 'enriched posts', 'wordlift' ); 
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'annotated_posts_percentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'posts' ),
-			$this->render_stat_param( 'annotated_posts' )  
-		); 
+        $enriched_posts_title = __( 'enriched posts', 'wordlift' ); 
+        $enriched_posts_caption = sprintf( wp_kses(
+            __( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ), 
+            array(  'a' => array( 'href' => array() ) ) ), 
+            $this->render_stat_param( 'annotated_posts_percentage' ),
+            esc_url( admin_url( 'edit.php' ) ),
+            $this->render_stat_param( 'posts' ),
+            $this->render_stat_param( 'annotated_posts' )  
+        ); 
 
-		$rating_title = __( 'avarage entity rating', 'wordlift' ); 
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
-		); 
+        $rating_title = __( 'avarage entity rating', 'wordlift' ); 
+        $rating_caption = sprintf( wp_kses(
+            __( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift' ), 
+            array(  'a' => array( 'href' => array() ) ) ), 
+            $this->render_stat_param( 'entities' ),
+            esc_url( admin_url( 'edit.php?post_type=entity' ) ),
+            $this->render_stat_param( 'rating' )
+        ); 
 
-		$graph_title = __( 'triples in your graph', 'wordlift' ); 
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
-		); 
+        $graph_title = __( 'triples in your graph', 'wordlift' ); 
+        $graph_caption = sprintf( wp_kses(
+            __( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ), 
+            array(  'a' => array( 'href' => array() ) ) ), 
+            $this->render_stat_param( 'wikidata' ),
+            esc_url( 'https://www.wikidata.org/' )
+        ); 
 
-		$triples_label = __( 'triples', 'wordlift' ); 
+        $triples_label = __( 'triples', 'wordlift' ); 
 		
-		echo <<<EOF
+        echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
 		<div class="wl-stat-card">
 			<div class="wl-stat-graph-wrapper">
@@ -119,156 +119,156 @@ 
 	</div>
 EOF;
 
-	}
+    }
 
-	/**
-	 * Return stats
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string markup
-	 */
-	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array( $this, 'dashboard_widget_callback' ) );
-	}
+    /**
+     * Return stats
+     *
+     * @since 3.4.0
+     *
+     * @return string markup
+     */
+    public function add_dashboard_widgets() {
+        wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array( $this, 'dashboard_widget_callback' ) );
+    }
 
-	/**
-	 * Return stats
-	 * @uses https://codex.wordpress.org/Function_Reference/set_transient
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string JSON obj with all available stats.
-	 */
-	public function ajax_get_stats() {
+    /**
+     * Return stats
+     * @uses https://codex.wordpress.org/Function_Reference/set_transient
+     *
+     * @since 3.4.0
+     *
+     * @return string JSON obj with all available stats.
+     */
+    public function ajax_get_stats() {
 		
-		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
+        // Try to retrieve the transient
+        $stats = get_transient( self::TRANSIENT_NAME );
 
-		if ( !$stats ) {
-			// Calculate stats
-			$stats = array(
-				'entities'	=>	$this->count_entities(),
-				'posts'	=>	$this->count_posts(),
-				'annotated_posts'	=>	$this->count_annotated_posts(),
-				'triples'	=> $this->count_triples(),
-				'rating' => $this->avarage_entities_rating(),
-			);	
-			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
-		}
-		// Return stats as json object
-		wl_core_send_json( $stats );
-	}
+        if ( !$stats ) {
+            // Calculate stats
+            $stats = array(
+                'entities'	=>	$this->count_entities(),
+                'posts'	=>	$this->count_posts(),
+                'annotated_posts'	=>	$this->count_annotated_posts(),
+                'triples'	=> $this->count_triples(),
+                'rating' => $this->avarage_entities_rating(),
+            );	
+            // Cache stats results trough transient
+            set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+        }
+        // Return stats as json object
+        wl_core_send_json( $stats );
+    }
 
-	/**
-	 * Calculate total number of published posts
-	 * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of published posts.
-	 */
-	public function count_posts() {
+    /**
+     * Calculate total number of published posts
+     * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of published posts.
+     */
+    public function count_posts() {
 		
-		return (int) wp_count_posts()->publish;		
-	}
+        return (int) wp_count_posts()->publish;		
+    }
 
-	/**
-	 * Calculate total number of annotated published posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of annotated published posts.
-	 */
-	public function count_annotated_posts() {
+    /**
+     * Calculate total number of annotated published posts
+     * @since 3.4.0
+     *
+     * @return int Total number of annotated published posts.
+     */
+    public function count_annotated_posts() {
 		
-		// Prepare interaction with db
-    	global $wpdb;
-    	// Retrieve Wordlift relation instances table name
-    	$table_name = wl_core_get_relation_instances_table_name();
-    	// Calculate sql statement
-		$sql_statement = <<<EOF
+        // Prepare interaction with db
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+        // Calculate sql statement
+        $sql_statement = <<<EOF
     		SELECT COUNT(*) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 EOF;
-		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement ); 
+        // Perform the query
+        return (int) $wpdb->get_var( $sql_statement ); 
 		
-	}
+    }
 
-	/**
-	 * Calculate the avarage entities rating
-	 * @since 3.4.0
-	 *
-	 * @return int Avarage entities rating.
-	 */
-	public function avarage_entities_rating() {
+    /**
+     * Calculate the avarage entities rating
+     * @since 3.4.0
+     *
+     * @return int Avarage entities rating.
+     */
+    public function avarage_entities_rating() {
 		
-		// Prepare interaction with db
-    	global $wpdb;
-		$query = $wpdb->prepare( 
-			"SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
-   			Wordlift_Entity_Service::RATING_RAW_SCORE_META_KEY
-			);
-		// Perform the query
-		return $this->entity_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) ); 	
-	}
+        // Prepare interaction with db
+        global $wpdb;
+        $query = $wpdb->prepare( 
+            "SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
+                Wordlift_Entity_Service::RATING_RAW_SCORE_META_KEY
+            );
+        // Perform the query
+        return $this->entity_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) ); 	
+    }
 
-	/**
-	 * Calculate total number of published entities
-	 * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of posts.
-	 */
-	public function count_entities() {
+    /**
+     * Calculate total number of published entities
+     * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of posts.
+     */
+    public function count_entities() {
 		
-		return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;		
-	}
+        return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;		
+    }
 
-	/**
-	 * Calculate total number of published rdf triples
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of triples.
-	 */
-	public function count_triples() {
+    /**
+     * Calculate total number of published rdf triples
+     * @since 3.4.0
+     *
+     * @return int Total number of triples.
+     */
+    public function count_triples() {
 		
-		// Set the SPARQL query.
-		$sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
-		// Send the request.
-		$response = $this->rl_sparql_select( $sparql );
+        // Set the SPARQL query.
+        $sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
+        // Send the request.
+        $response = $this->rl_sparql_select( $sparql );
 
-		// Return the error in case of failure.
-		if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
-			return (int) FALSE;
-		}
+        // Return the error in case of failure.
+        if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+            return (int) FALSE;
+        }
 
-		// Get the body.
-		$body = $response['body'];
-		// Get the values.
-		$matches = array();
-		if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
-			// Return the counts.
-			return (int) $matches[1];
-		}
+        // Get the body.
+        $body = $response['body'];
+        // Get the values.
+        $matches = array();
+        if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
+            // Return the counts.
+            return (int) $matches[1];
+        }
 		
-		return (int) FALSE;
-	}
+        return (int) FALSE;
+    }
 
-	private function rl_sparql_select( $query ) {
+    private function rl_sparql_select( $query ) {
 
-		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
-		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
-		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+        // Prepare the SPARQL statement by prepending the default namespaces.
+        $sparql = rl_sparql_prefixes() . "\n" . $query;
+        // Get the SPARQL SELECT URL.
+        $url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+        // Prepare the request.
+        $args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
 
-		return wp_remote_get( $url, $args );
-	}
+        return wp_remote_get( $url, $args );
+    }
 
-	private function render_stat_param( $param ) {
+    private function render_stat_param( $param ) {
 
-		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
-	}
+        return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -44,9 +44,9 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Dashboard_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Dashboard_Service');
 
 		$this->entity_service = $entity_service;
 
@@ -59,36 +59,36 @@ 
 	 *
 	 * @return string Dashboard widget html markup
 	 */
-	public function dashboard_widget_callback( $post ) {
+	public function dashboard_widget_callback($post) {
 
-		$enriched_posts_title = __( 'enriched posts', 'wordlift' ); 
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'annotated_posts_percentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'posts' ),
-			$this->render_stat_param( 'annotated_posts' )  
+		$enriched_posts_title = __('enriched posts', 'wordlift'); 
+		$enriched_posts_caption = sprintf(wp_kses(
+			__('%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift'), 
+			array('a' => array('href' => array())) ), 
+			$this->render_stat_param('annotated_posts_percentage'),
+			esc_url(admin_url('edit.php')),
+			$this->render_stat_param('posts'),
+			$this->render_stat_param('annotated_posts')  
 		); 
 
-		$rating_title = __( 'avarage entity rating', 'wordlift' ); 
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
+		$rating_title = __('avarage entity rating', 'wordlift'); 
+		$rating_caption = sprintf(wp_kses(
+			__('You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift'), 
+			array('a' => array('href' => array())) ), 
+			$this->render_stat_param('entities'),
+			esc_url(admin_url('edit.php?post_type=entity')),
+			$this->render_stat_param('rating')
 		); 
 
-		$graph_title = __( 'triples in your graph', 'wordlift' ); 
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
+		$graph_title = __('triples in your graph', 'wordlift'); 
+		$graph_caption = sprintf(wp_kses(
+			__('Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift'), 
+			array('a' => array('href' => array())) ), 
+			$this->render_stat_param('wikidata'),
+			esc_url('https://www.wikidata.org/')
 		); 
 
-		$triples_label = __( 'triples', 'wordlift' ); 
+		$triples_label = __('triples', 'wordlift'); 
 		
 		echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
@@ -129,7 +129,7 @@ 
 	 * @return string markup
 	 */
 	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array( $this, 'dashboard_widget_callback' ) );
+		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array($this, 'dashboard_widget_callback'));
 	}
 
 	/**
@@ -143,9 +143,9 @@ 
 	public function ajax_get_stats() {
 		
 		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
+		$stats = get_transient(self::TRANSIENT_NAME);
 
-		if ( !$stats ) {
+		if ( ! $stats) {
 			// Calculate stats
 			$stats = array(
 				'entities'	=>	$this->count_entities(),
@@ -155,10 +155,10 @@ 
 				'rating' => $this->avarage_entities_rating(),
 			);	
 			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+			set_transient(self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION);
 		}
 		// Return stats as json object
-		wl_core_send_json( $stats );
+		wl_core_send_json($stats);
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
     		SELECT COUNT(*) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 EOF;
 		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement ); 
+		return (int) $wpdb->get_var($sql_statement); 
 		
 	}
 
@@ -209,7 +209,7 @@ 
    			Wordlift_Entity_Service::RATING_RAW_SCORE_META_KEY
 			);
 		// Perform the query
-		return $this->entity_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) ); 	
+		return $this->entity_service->convert_raw_score_to_percentage($wpdb->get_var($query)); 	
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function count_entities() {
 		
-		return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;		
+		return (int) wp_count_posts(Wordlift_Entity_Service::TYPE_NAME)->publish;		
 	}
 
 	/**
@@ -235,10 +235,10 @@ 
 		// Set the SPARQL query.
 		$sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
 		// Send the request.
-		$response = $this->rl_sparql_select( $sparql );
+		$response = $this->rl_sparql_select($sparql);
 
 		// Return the error in case of failure.
-		if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+		if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 			return (int) FALSE;
 		}
 
@@ -246,7 +246,7 @@ 
 		$body = $response['body'];
 		// Get the values.
 		$matches = array();
-		if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
+		if (1 === preg_match('/(\d+)/im', $body, $matches) && 2 === count($matches)) {
 			// Return the counts.
 			return (int) $matches[1];
 		}
@@ -254,21 +254,21 @@ 
 		return (int) FALSE;
 	}
 
-	private function rl_sparql_select( $query ) {
+	private function rl_sparql_select($query) {
 
 		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
+		$sparql = rl_sparql_prefixes()."\n".$query;
 		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+		$url = wl_configuration_get_query_select_url('csv').urlencode($sparql);
 		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+		$args = unserialize(WL_REDLINK_API_HTTP_OPTIONS);
 
-		return wp_remote_get( $url, $args );
+		return wp_remote_get($url, $args);
 	}
 
-	private function render_stat_param( $param ) {
+	private function render_stat_param($param) {
 
-		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
+		return '<span id="wl-dashboard-widget-'.$param.'" class="wl-stat-value"></span>';
 	}
 
 }