insideout10 / wordlift-plugin

src/admin/wordlift_admin.php

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'));
 }

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,22 +43,22 @@ 
  */
 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 ); 
-	}
-	return $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 ); 
+    }
+    return $data;
 }
 
 add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
@@ -74,5 +74,5 @@ 
  */
 function wl_admin_metaboxes_add_css_class( $classes = array() ){
 	
-	return array_merge( $classes, array( 'wl-metabox' ) );
+    return array_merge( $classes, array( 'wl-metabox' ) );
 }

src/modules/core/wordlift_core_constants.php

Spacing +21 added lines, -21 removed lines

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

src/wordlift_content_filter.php

Indentation +170 added lines, -170 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,80 +82,80 @@ 
  */
 function wl_content_embed_item_microdata( $content, $uri, $itemprop = NULL, $recursion_level = 0 ) {
 
-	// The recursion level is set by `wl_content_embed_compile_microdata_template`
-	// which is loading referenced entities and calling again this function to print
-	// additional properties. By default WordLift doesn't print more than 3 nested
-	// entities.
-	if ( $recursion_level > wl_config_get_recursion_depth() ) {
-		wl_write_log( "recursion depth limit exceeded [ level :: $recursion_level ][ max :: " . wl_config_get_recursion_depth() . " ]" );
+    // The recursion level is set by `wl_content_embed_compile_microdata_template`
+    // which is loading referenced entities and calling again this function to print
+    // additional properties. By default WordLift doesn't print more than 3 nested
+    // entities.
+    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 . '" />';
 
 
-	// If entity is nested, we do not show a link, but a hidden meta.
-	// See https://github.com/insideout10/wordlift-plugin/issues/348
-	$name = ! is_null( $itemprop )
-		? "<meta itemprop='name' content='$post->post_title' /></$1>"
-		: '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>';
+    // If entity is nested, we do not show a link, but a hidden meta.
+    // See https://github.com/insideout10/wordlift-plugin/issues/348
+    $name = ! is_null( $itemprop )
+        ? "<meta itemprop='name' content='$post->post_title' /></$1>"
+        : '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>';
 
-	// 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
-		. $name,
-		$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
+        . $name,
+        $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' );
@@ -170,94 +170,94 @@ 
  * @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 ][ 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 ][ 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 +63 added lines, -63 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,72 +80,72 @@ 
  *
  * @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) {
 
 	// The recursion level is set by `wl_content_embed_compile_microdata_template`
 	// which is loading referenced entities and calling again this function to print
 	// additional properties. By default WordLift doesn't print more than 3 nested
 	// entities.
-	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 );
+	                               ->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.'" />';
 
 
 	// If entity is nested, we do not show a link, but a hidden meta.
 	// See https://github.com/insideout10/wordlift-plugin/issues/348
-	$name = ! is_null( $itemprop )
+	$name = ! is_null($itemprop)
 		? "<meta itemprop='name' content='$post->post_title' /></$1>"
-		: '<a class="wl-entity-page-link" href="' . $permalink . '" itemprop="name" content="' . $post->post_title . '">' . ( is_null( $itemprop ) ? '$2' : '' ) . '</a></$1>';
+		: '<a class="wl-entity-page-link" href="'.$permalink.'" itemprop="name" content="'.$post->post_title.'">'.(is_null($itemprop) ? '$2' : '').'</a></$1>';
 
 	// 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
@@ -158,7 +158,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.
@@ -169,49 +169,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 ][ recursion level :: $recursion_level ]" );
+	if (WP_DEBUG) {
+		$wl_logger->trace("Embedding microdata [ entity id :: $entity_id ][ 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 ),
@@ -219,34 +219,34 @@ 
 			//  - 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 );
+				                                        ->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;
 			}
@@ -254,8 +254,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);
 		}
 	}