insideout10 / wordlift-plugin

src/shortcodes/wordlift_shortcode_chord.php

Indentation +177 added lines, -177 removed lines

@@ -8,33 +8,33 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 posts by post date.
-	// For each post get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => 'post',
-		'fields'      => 'ids', //only get post IDs
-		'post_status' => 'published',
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return null;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 posts by post date.
+    // For each post get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => 'post',
+        'fields'      => 'ids', //only get post IDs
+        'post_status' => 'published',
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return null;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -52,59 +52,59 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null,  $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
-
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
-
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array()
-		);
-	}
-
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish'
-	) );
-
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish'
-		) ) :
-		array();
-
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
+
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array()
+        );
+    }
+
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish'
+    ) );
+
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish'
+        ) ) :
+        array();
+
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 	
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 		
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -118,56 +118,56 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = wl_entity_type_taxonomy_get_type( $item );
-
-		wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' )
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] )
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = wl_entity_type_taxonomy_get_type( $item );
+
+        wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = null;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( false !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' )
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] )
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -178,13 +178,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id = $_REQUEST['post_id'];
-	$depth   = $_REQUEST['depth'];
+    $post_id = $_REQUEST['post_id'];
+    $depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
@@ -202,54 +202,54 @@ 
  */
 function wl_shortcode_chord( $atts ) {
 
-	//extract attributes and set default values
-	$chord_atts = shortcode_atts( array(
-		'width'      => '100%',
-		'height'     => '500px',
-		'main_color' => '000',
-		'depth'      => 2,
-		'global'     => false
-	), $atts );
-
-	if ( $chord_atts['global'] ) {
-		$post_id = wl_shortcode_chord_most_referenced_entity_id();
-		if ( $post_id == null ) {
-			return "WordLift Chord: no entities found.";
-		}
-		$widget_id            = 'wl_chord_global';
-		$chord_atts['height'] = '200px';
-	} else {
-		$post_id   = get_the_ID();
-		$widget_id = 'wl_chord_' . $post_id;
-	}
-
-	// Adding css
-	wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-
-	// Adding javascript code
-	wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
-
-	wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array( 'jquery' ) );
-
-	wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
-			'action'   => 'wl_chord'
-		)
-	);
-
-	// Escaping atts.
-	$esc_class  = esc_attr( 'wl-chord' );
-	$esc_id     = esc_attr( $widget_id );
-	$esc_width  = esc_attr( $chord_atts['width'] );
-	$esc_height = esc_attr( $chord_atts['height'] );
-
-	$esc_post_id    = esc_attr( $post_id );
-	$esc_depth      = esc_attr( $chord_atts['depth'] );
-	$esc_main_color = esc_attr( $chord_atts['main_color'] );
-
-	// Building template.
-	// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
-	return <<<EOF
+    //extract attributes and set default values
+    $chord_atts = shortcode_atts( array(
+        'width'      => '100%',
+        'height'     => '500px',
+        'main_color' => '000',
+        'depth'      => 2,
+        'global'     => false
+    ), $atts );
+
+    if ( $chord_atts['global'] ) {
+        $post_id = wl_shortcode_chord_most_referenced_entity_id();
+        if ( $post_id == null ) {
+            return "WordLift Chord: no entities found.";
+        }
+        $widget_id            = 'wl_chord_global';
+        $chord_atts['height'] = '200px';
+    } else {
+        $post_id   = get_the_ID();
+        $widget_id = 'wl_chord_' . $post_id;
+    }
+
+    // Adding css
+    wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+
+    // Adding javascript code
+    wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
+
+    wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array( 'jquery' ) );
+
+    wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ),
+            'action'   => 'wl_chord'
+        )
+    );
+
+    // Escaping atts.
+    $esc_class  = esc_attr( 'wl-chord' );
+    $esc_id     = esc_attr( $widget_id );
+    $esc_width  = esc_attr( $chord_atts['width'] );
+    $esc_height = esc_attr( $chord_atts['height'] );
+
+    $esc_post_id    = esc_attr( $post_id );
+    $esc_depth      = esc_attr( $chord_atts['depth'] );
+    $esc_main_color = esc_attr( $chord_atts['main_color'] );
+
+    // Building template.
+    // TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
+    return <<<EOF
 <div class="$esc_class" 
 	id="$esc_id"
 	data-post-id="$esc_post_id"
@@ -269,7 +269,7 @@ 
  * Registers the *wl_chord* shortcode.
  */
 function wl_shortcode_chord_register() {
-	add_shortcode( 'wl_chord', 'wl_shortcode_chord' );
+    add_shortcode( 'wl_chord', 'wl_shortcode_chord' );
 }
 
 add_action( 'init', 'wl_shortcode_chord_register' );

Spacing +71 added lines, -72 removed lines

@@ -10,28 +10,28 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 posts by post date.
 	// For each post get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => 'post',
 		'fields'      => 'ids', //only get post IDs
 		'post_status' => 'published',
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return null;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -50,56 +50,55 @@ 
  *
  * @return array
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null,  $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = null, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array()
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish'
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish'
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 	
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 		
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -116,51 +115,51 @@ 
  *
  * @return mixed|string|void
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = wl_entity_type_taxonomy_get_type( $item );
+		$term = wl_entity_type_taxonomy_get_type($item);
 
-		wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+		wl_write_log("wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: ".var_export($term, true)." ]");
 
 		// TODO: get all images
 		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (false !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' )
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : '')
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] )
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1])
 		);
 
 		$item = $relation;
@@ -181,14 +180,14 @@ 
 	$post_id = $_REQUEST['post_id'];
 	$depth   = $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');
 
 
 /**
@@ -200,52 +199,52 @@ 
  *
  * @return string
  */
-function wl_shortcode_chord( $atts ) {
+function wl_shortcode_chord($atts) {
 
 	//extract attributes and set default values
-	$chord_atts = shortcode_atts( array(
+	$chord_atts = shortcode_atts(array(
 		'width'      => '100%',
 		'height'     => '500px',
 		'main_color' => '000',
 		'depth'      => 2,
 		'global'     => false
-	), $atts );
+	), $atts);
 
-	if ( $chord_atts['global'] ) {
+	if ($chord_atts['global']) {
 		$post_id = wl_shortcode_chord_most_referenced_entity_id();
-		if ( $post_id == null ) {
+		if ($post_id == null) {
 			return "WordLift Chord: no entities found.";
 		}
 		$widget_id            = 'wl_chord_global';
 		$chord_atts['height'] = '200px';
 	} else {
 		$post_id   = get_the_ID();
-		$widget_id = 'wl_chord_' . $post_id;
+		$widget_id = 'wl_chord_'.$post_id;
 	}
 
 	// Adding css
-	wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-ui.min.css');
 
 	// Adding javascript code
-	wp_enqueue_script( 'd3', dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/d3/d3.min.js' );
+	wp_enqueue_script('d3', dirname(plugin_dir_url(__FILE__)).'/bower_components/d3/d3.min.js');
 
-	wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array( 'jquery' ) );
+	wp_enqueue_script('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-ui.min.js', array('jquery'));
 
-	wp_localize_script( 'wordlift-ui', 'wl_chord_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),
+	wp_localize_script('wordlift-ui', 'wl_chord_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'),
 			'action'   => 'wl_chord'
 		)
 	);
 
 	// Escaping atts.
-	$esc_class  = esc_attr( 'wl-chord' );
-	$esc_id     = esc_attr( $widget_id );
-	$esc_width  = esc_attr( $chord_atts['width'] );
-	$esc_height = esc_attr( $chord_atts['height'] );
+	$esc_class  = esc_attr('wl-chord');
+	$esc_id     = esc_attr($widget_id);
+	$esc_width  = esc_attr($chord_atts['width']);
+	$esc_height = esc_attr($chord_atts['height']);
 
-	$esc_post_id    = esc_attr( $post_id );
-	$esc_depth      = esc_attr( $chord_atts['depth'] );
-	$esc_main_color = esc_attr( $chord_atts['main_color'] );
+	$esc_post_id    = esc_attr($post_id);
+	$esc_depth      = esc_attr($chord_atts['depth']);
+	$esc_main_color = esc_attr($chord_atts['main_color']);
 
 	// Building template.
 	// TODO: in the HTML code there are static CSS rules. Move them to the CSS file.
@@ -269,7 +268,7 @@ 
  * Registers the *wl_chord* shortcode.
  */
 function wl_shortcode_chord_register() {
-	add_shortcode( 'wl_chord', 'wl_shortcode_chord' );
+	add_shortcode('wl_chord', 'wl_shortcode_chord');
 }
 
-add_action( 'init', 'wl_shortcode_chord_register' );
+add_action('init', 'wl_shortcode_chord_register');

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

Indentation +49 added lines, -49 removed lines

@@ -10,54 +10,54 @@
  */
 class Wordlift_Page_Service {
 
-	/**
-	 * Hook to wp_head and create a response buffer.
-	 *
-	 * @since 3.5.3
-	 */
-	public function wp_head() {
-
-		// When the buffer is flushed, have the handler markup the content.
-		ob_start( array( $this, 'handler' ) );
-
-	}
-
-	/**
-	 * Hook to wp_footer and flush the response buffer.
-	 *
-	 * @since 3.5.3
-	 */
-	public function wp_footer() {
-
-		ob_end_flush();
-
-	}
-
-	/**
-	 * Handle the buffer, by inserting schema.org microdata markup with itemscope/itemtype/itemprop.
-	 *
-	 * @since 3.5.3
-	 *
-	 * @param string $buffer The output buffer.
-	 *
-	 * @return string The processed output buffer.
-	 */
-	public function handler( $buffer ) {
-
-		// Look for the following regexs.
-		$regexs = array(
-			'/<article ([^>]*)class="([^"]*)type-post([^"]*)"([^>]*)/i',
-			'/<h1 ([^>]*)class="([^"]*)entry-title([^"]*)"([^>]*)/i',
-		);
-
-		// Replacements.
-		$replacements = array(
-			'<article itemscope itemtype="http://schema.org/Article" ${1}class="${2}type-post${3}"${4}',
-			'<h1 itemprop="name" ${1}class="${2}entry-title${3}"${4}',
-		);
-
-		// Perform the replacements in the buffer.
-		return preg_replace( $regexs, $replacements, $buffer );
-	}
+    /**
+     * Hook to wp_head and create a response buffer.
+     *
+     * @since 3.5.3
+     */
+    public function wp_head() {
+
+        // When the buffer is flushed, have the handler markup the content.
+        ob_start( array( $this, 'handler' ) );
+
+    }
+
+    /**
+     * Hook to wp_footer and flush the response buffer.
+     *
+     * @since 3.5.3
+     */
+    public function wp_footer() {
+
+        ob_end_flush();
+
+    }
+
+    /**
+     * Handle the buffer, by inserting schema.org microdata markup with itemscope/itemtype/itemprop.
+     *
+     * @since 3.5.3
+     *
+     * @param string $buffer The output buffer.
+     *
+     * @return string The processed output buffer.
+     */
+    public function handler( $buffer ) {
+
+        // Look for the following regexs.
+        $regexs = array(
+            '/<article ([^>]*)class="([^"]*)type-post([^"]*)"([^>]*)/i',
+            '/<h1 ([^>]*)class="([^"]*)entry-title([^"]*)"([^>]*)/i',
+        );
+
+        // Replacements.
+        $replacements = array(
+            '<article itemscope itemtype="http://schema.org/Article" ${1}class="${2}type-post${3}"${4}',
+            '<h1 itemprop="name" ${1}class="${2}entry-title${3}"${4}',
+        );
+
+        // Perform the replacements in the buffer.
+        return preg_replace( $regexs, $replacements, $buffer );
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 	public function wp_head() {
 
 		// When the buffer is flushed, have the handler markup the content.
-		ob_start( array( $this, 'handler' ) );
+		ob_start(array($this, 'handler'));
 
 	}
 
@@ -42,7 +42,7 @@ 
 	 *
 	 * @return string The processed output buffer.
 	 */
-	public function handler( $buffer ) {
+	public function handler($buffer) {
 
 		// Look for the following regexs.
 		$regexs = array(
@@ -57,7 +57,7 @@ 
 		);
 
 		// Perform the replacements in the buffer.
-		return preg_replace( $regexs, $replacements, $buffer );
+		return preg_replace($regexs, $replacements, $buffer);
 	}
 
 }

src/includes/class-wordlift-sanitizer.php

Indentation +14 added lines, -14 removed lines

@@ -4,22 +4,22 @@
  */
 class Wordlift_Sanitizer {
 
-	/**
-	 * Only accept URIs
-	 */
-	public static function sanitize_url( $value ) {
+    /**
+     * Only accept URIs
+     */
+    public static function sanitize_url( $value ) {
 
-		// Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
-		// but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
-		// to do proper url encoding when requesting the URL.
-		//
-		// see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
+        // Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
+        // but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
+        // to do proper url encoding when requesting the URL.
+        //
+        // see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
 
-		if ( ! is_null( $value ) && $value !== '' ) {
-			return $value;
-		}
+        if ( ! is_null( $value ) && $value !== '' ) {
+            return $value;
+        }
 
-		return null;
-	}
+        return null;
+    }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 	/**
 	 * Only accept URIs
 	 */
-	public static function sanitize_url( $value ) {
+	public static function sanitize_url($value) {
 
 		// Initially this function used also filter_var( $value, FILTER_VALIDATE_URL )
 		// but URLs with UTF-8 characters are not valid. We store those anyway in the DB as it's up to the browser
@@ -15,7 +15,7 @@ 
 		//
 		// see also http://stackoverflow.com/questions/2137080/php-filter-var-filter-validate-url
 
-		if ( ! is_null( $value ) && $value !== '' ) {
+		if ( ! is_null($value) && $value !== '') {
 			return $value;
 		}
 

src/modules/linked_data/wordlift_linked_data.php

Indentation +320 added lines, -320 removed lines

@@ -14,19 +14,19 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		return;
-	}
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        return;
+    }
 
-	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+    // unhook this function so it doesn't loop infinitely
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
 
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
 
-	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    // re-hook this function
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -40,143 +40,143 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		return;
-	}
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        return;
+    }
 
-	// get the current post.
-	$post = get_post( $post_id );
+    // get the current post.
+    $post = get_post( $post_id );
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
 
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( json_encode( $_POST['wl_entities'] ) );
+        wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
+        wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
+        wl_write_log( "]" );
 
-		$entities_via_post = $_POST['wl_entities'];
-		$boxes_via_post    = $_POST['wl_boxes'];
+        $entities_via_post = $_POST['wl_entities'];
+        $boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
 
-			// Only if the current entity is created from scratch let's avoid to create 
-			// more than one entity with same label & entity type
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
-				$entity[ 'main_type' ] : NULL;
+            // Only if the current entity is created from scratch let's avoid to create 
+            // more than one entity with same label & entity type
+            $entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+                $entity[ 'main_type' ] : NULL;
 
-			// Look if current entity uri matchs an internal existing entity, meaning:
-			// 1. when $entity_uri is an internal uri 
-			// 2. when $entity_uri is an external uri used as sameAs of an internal entity	
-			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
+            // Look if current entity uri matchs an internal existing entity, meaning:
+            // 1. when $entity_uri is an internal uri 
+            // 2. when $entity_uri is an external uri used as sameAs of an internal entity	
+            $ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
 
-			// Detect the uri depending if is an existing or a new entity
-			$uri = ( NULL === $ie ) ?
-				Wordlift_Entity_Service::get_instance()->build_uri(
-					$entity[ 'label' ],
-					Wordlift_Entity_Service::TYPE_NAME,
-					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+            // Detect the uri depending if is an existing or a new entity
+            $uri = ( NULL === $ie ) ?
+                Wordlift_Entity_Service::get_instance()->build_uri(
+                    $entity[ 'label' ],
+                    Wordlift_Entity_Service::TYPE_NAME,
+                    $entity_type
+                ) : wl_get_entity_uri( $ie->ID );
 
-			wl_write_log("Map $entity_uri on $uri");
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+            wl_write_log("Map $entity_uri on $uri");
+            $entities_uri_mapping[ $entity_uri ] = $uri;
 
-			// Local entities have a tmp uri with 'local-entity-' prefix
-			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
-				// Override the entity obj
-				$entity[ 'uri' ] = $uri;
-			}
+            // Local entities have a tmp uri with 'local-entity-' prefix
+            // These uris need to be rewritten here and replaced in the content
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+                // Override the entity obj
+                $entity[ 'uri' ] = $uri;
+            }
 
-			// Update entity data with related post
-			$entity[ 'related_post_id' ] = $post_id;
+            // Update entity data with related post
+            $entity[ 'related_post_id' ] = $post_id;
 
-			// Save the entity if is a new entity
-			if ( NULL === $ie ) {
-				wl_save_entity( $entity );
-			}
+            // Save the entity if is a new entity
+            if ( NULL === $ie ) {
+                wl_save_entity( $entity );
+            }
 
-		}
+        }
 
-	}
+    }
 
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
-	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-	}
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+    // Save each entity and store the post id.
+    foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+        $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+    }
 
-	// Update the post content
-	wp_update_post( array(
-		'ID'           => $post->ID,
-		'post_content' => $updated_post_content,
-	) );
+    // Update the post content
+    wp_update_post( array(
+        'ID'           => $post->ID,
+        'post_content' => $updated_post_content,
+    ) );
 
-	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+    // Extract related/referenced entities from text.
+    $disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
 
-	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+    // Reset previously saved instances
+    wl_core_delete_relation_instances( $post_id );
 
-	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+    // Save relation instances
+    foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
 
-		wl_core_add_relation_instance(
-			$post_id,
-			Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
-			$referenced_entity_id
-		);
+        wl_core_add_relation_instance(
+            $post_id,
+            Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
+            $referenced_entity_id
+        );
 
-	}
+    }
 
     if ( isset( $_POST['wl_entities'] ) ) {
-		// Save post metadata if available
-		$metadata_via_post    =  ( isset( $_POST['wl_metadata'] ) ) ?
-			$_POST['wl_metadata'] : array();
-
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri 	= ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	// Push the post to Redlink.
-	wl_linked_data_push_to_redlink( $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+        // Save post metadata if available
+        $metadata_via_post    =  ( isset( $_POST['wl_metadata'] ) ) ?
+            $_POST['wl_metadata'] : array();
+
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri 	= ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    // Push the post to Redlink.
+    wl_linked_data_push_to_redlink( $post->ID );
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -186,13 +186,13 @@ 
  */
 function wordlift_save_post_add_default_schema_type( $entity_id ) {
 
-	$entity      = get_post( $entity_id );
-	$entity_type = wl_schema_get_types( $entity_id );
+    $entity      = get_post( $entity_id );
+    $entity_type = wl_schema_get_types( $entity_id );
 
-	// Assign type 'Thing' if we are dealing with an entity without type
-	if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
-		wl_schema_set_types( $entity_id, 'Thing' );
-	}
+    // Assign type 'Thing' if we are dealing with an entity without type
+    if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
+        wl_schema_set_types( $entity_id, 'Thing' );
+    }
 
 }
 
@@ -218,166 +218,166 @@ 
  */
 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 ) {
-		return $post;
-	}
-
-	// 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 );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	wl_write_log( "[ post id :: $post_id ][ uri :: $uri ][ label :: $label ][ wl uri :: $wl_uri ][ types :: " . implode( ',', $entity_types ) . " ][ images count :: " . count( $images ) . " ][ same_as count :: " . count( $same_as ) . " ]" );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = wl_save_image( $image_remote_url );
-
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
-
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type
-		);
+    $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 ) {
+        return $post;
+    }
+
+    // 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 );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    wl_write_log( "[ post id :: $post_id ][ uri :: $uri ][ label :: $label ][ wl uri :: $wl_uri ][ types :: " . implode( ',', $entity_types ) . " ][ images count :: " . count( $images ) . " ][ same_as count :: " . count( $same_as ) . " ]" );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = wl_save_image( $image_remote_url );
+
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
+
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type
+        );
 
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+        // 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 );
 }
 
 /**
@@ -391,42 +391,42 @@ 
  */
 function wl_linked_data_content_get_embedded_entities( $content ) {
 
-	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+    // Remove quote escapes.
+    $content = str_replace( '\\"', '"', $content );
 
-	// Match all itemid attributes.
-	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
+    // Match all itemid attributes.
+    $pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
 
-	//	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
+    //	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
 
-	// Remove the pattern while it is found (match nested annotations).
-	$matches = array();
+    // Remove the pattern while it is found (match nested annotations).
+    $matches = array();
 
-	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+    // In case of errors, return an empty array.
+    if ( false === preg_match_all( $pattern, $content, $matches ) ) {
+        wl_write_log( "Found no entities embedded in content" );
 
-		return array();
-	}
+        return array();
+    }
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	// Collect the entities.
-	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d  = html_entity_decode( $uri );
+    // Collect the entities.
+    $entities = array();
+    foreach ( $matches[1] as $uri ) {
+        $uri_d  = html_entity_decode( $uri );
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
-		}
-	}
+        if ( null !== $entity ) {
+            array_push( $entities, $entity->ID );
+        }
+    }
 
-	// $count = sizeof( $entities );
-	// wl_write_log( "Found $count entities embedded in content" );
+    // $count = sizeof( $entities );
+    // wl_write_log( "Found $count entities embedded in content" );
 
-	return $entities;
+    return $entities;
 }
 
 /**
@@ -438,22 +438,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 +119 added lines, -119 removed lines

@@ -3,7 +3,7 @@ 
  * The Linked Data module provides synchronization of local WordPress data with the remote Linked Data store.
  */
 
-require_once( 'wordlift_linked_data_images.php' );
+require_once('wordlift_linked_data_images.php');
 
 /**
  * Receive events from post saves, and split them according to the post type.
@@ -12,24 +12,24 @@ 
  *
  * @param int $post_id The post id.
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
 		return;
 	}
 
 	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -38,17 +38,17 @@ 
  *
  * @param int $post_id The post id being saved.
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -56,54 +56,54 @@ 
 	$entities_uri_mapping = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 		$boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
 			// Only if the current entity is created from scratch let's avoid to create 
 			// more than one entity with same label & entity type
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
-				$entity[ 'main_type' ] : NULL;
+			$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
+				$entity['main_type'] : NULL;
 
 			// Look if current entity uri matchs an internal existing entity, meaning:
 			// 1. when $entity_uri is an internal uri 
 			// 2. when $entity_uri is an external uri used as sameAs of an internal entity	
-			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
+			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($entity_uri);
 
 			// Detect the uri depending if is an existing or a new entity
-			$uri = ( NULL === $ie ) ?
+			$uri = (NULL === $ie) ?
 				Wordlift_Entity_Service::get_instance()->build_uri(
-					$entity[ 'label' ],
+					$entity['label'],
 					Wordlift_Entity_Service::TYPE_NAME,
 					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+				) : wl_get_entity_uri($ie->ID);
 
 			wl_write_log("Map $entity_uri on $uri");
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 			// Local entities have a tmp uri with 'local-entity-' prefix
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Override the entity obj
-				$entity[ 'uri' ] = $uri;
+				$entity['uri'] = $uri;
 			}
 
 			// Update entity data with related post
-			$entity[ 'related_post_id' ] = $post_id;
+			$entity['related_post_id'] = $post_id;
 
 			// Save the entity if is a new entity
-			if ( NULL === $ie ) {
-				wl_save_entity( $entity );
+			if (NULL === $ie) {
+				wl_save_entity($entity);
 			}
 
 		}
@@ -113,36 +113,36 @@ 
 	// Replace tmp uris in content post if needed
 	$updated_post_content = $post->post_content;
 	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+	foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+		$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 	}
 
 	// Update the post content
-	wp_update_post( array(
+	wp_update_post(array(
 		'ID'           => $post->ID,
 		'post_content' => $updated_post_content,
-	) );
+	));
 
 	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+	$disambiguated_entities = wl_linked_data_content_get_embedded_entities($updated_post_content);
 
 	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+	foreach (array_unique($disambiguated_entities) as $referenced_entity_id) {
 
 		wl_core_add_relation_instance(
 			$post_id,
-			Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
+			Wordlift_Entity_Service::get_instance()->get_classification_scope_for($referenced_entity_id),
 			$referenced_entity_id
 		);
 
 	}
 
-    if ( isset( $_POST['wl_entities'] ) ) {
+    if (isset($_POST['wl_entities'])) {
 		// Save post metadata if available
-		$metadata_via_post    =  ( isset( $_POST['wl_metadata'] ) ) ?
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ?
 			$_POST['wl_metadata'] : array();
 
 		$fields = array(
@@ -151,54 +151,54 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri 	= ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if ($field === Wordlift_Schema_Service::FIELD_TOPIC) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
 	// Push the post to Redlink.
-	wl_linked_data_push_to_redlink( $post->ID );
+	wl_linked_data_push_to_redlink($post->ID);
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Adds default schema type "Thing" as soon as an entity is created.
  */
-function wordlift_save_post_add_default_schema_type( $entity_id ) {
+function wordlift_save_post_add_default_schema_type($entity_id) {
 
-	$entity      = get_post( $entity_id );
-	$entity_type = wl_schema_get_types( $entity_id );
+	$entity      = get_post($entity_id);
+	$entity_type = wl_schema_get_types($entity_id);
 
 	// Assign type 'Thing' if we are dealing with an entity without type
-	if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
-		wl_schema_set_types( $entity_id, 'Thing' );
+	if ($entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null($entity_type)) {
+		wl_schema_set_types($entity_id, 'Thing');
 	}
 
 }
 
 // Priority 1 (default is 10) because we want the default type to be set as soon as possible
 // Attatched to save_post because *wl_linked_data_save_post* does not always fire
-add_action( 'save_post', 'wordlift_save_post_add_default_schema_type', 1 );
+add_action('save_post', 'wordlift_save_post_add_default_schema_type', 1);
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -216,23 +216,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,
@@ -240,9 +240,9 @@ 
 	);
 
 	// 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) {
 		return $post;
 	}
 
@@ -252,12 +252,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
@@ -271,78 +271,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'];
@@ -360,24 +360,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);
 }
 
 /**
@@ -389,10 +389,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';
@@ -403,8 +403,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();
 	}
@@ -413,13 +413,13 @@ 
 
 	// Collect the entities.
 	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d  = html_entity_decode( $uri );
+	foreach ($matches[1] as $uri) {
+		$uri_d  = html_entity_decode($uri);
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri_d);
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
+		if (null !== $entity) {
+			array_push($entities, $entity->ID);
 		}
 	}
 
@@ -436,24 +436,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/modules/core/wordlift_core_schema_api.php

Indentation +115 added lines, -115 removed lines

@@ -10,28 +10,28 @@ 
  */
 function wl_schema_reset_value( $post_id, $property_name ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
-		return false;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
+        return false;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			delete_post_meta( $post_id, $wl_constant );
+            delete_post_meta( $post_id, $wl_constant );
 
-			return true;
-		}
-	}
+            return true;
+        }
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -44,34 +44,34 @@ 
  */
 function wl_schema_get_value( $post_id, $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 );
-
-	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-			return null;
-		}
-	}
-
-	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
-	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
-		}
-	}
-
-	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 );
+
+    // Establish entity id.
+    if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+        $post_id = get_the_ID();
+        if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+            return null;
+        }
+    }
+
+    // Get custom fields.
+    $term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Search for the required meta value (by constant name or schema name)
+    foreach ( $term_mapping as $wl_constant => $property_info ) {
+        $found_constant  = ( $wl_constant == $property_name );
+        $found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
+        if ( $found_constant || $found_predicate ) {
+            return get_post_meta( $post_id, $wl_constant );
+        }
+    }
+
+    return null;
 }
 
 /**
@@ -85,15 +85,15 @@ 
  */
 function wl_schema_add_value( $post_id, $property_name, $property_value ) {
 
-	if ( ! is_array( $property_value ) ) {
-		$property_value = array( $property_value );
-	}
+    if ( ! is_array( $property_value ) ) {
+        $property_value = array( $property_value );
+    }
 
-	$old_values = wl_schema_get_value( $post_id, $property_name );
+    $old_values = wl_schema_get_value( $post_id, $property_name );
 
-	$merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
+    $merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
 
-	wl_schema_set_value( $post_id, $property_name, $merged_property_value );
+    wl_schema_set_value( $post_id, $property_name, $merged_property_value );
 }
 
 /**
@@ -107,38 +107,38 @@ 
  */
 function wl_schema_set_value( $post_id, $property_name, $property_value ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
-		return false;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+        return false;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
-			}
+            // Deal with single values
+            if ( ! is_array( $property_value ) ) {
+                $property_value = array( $property_value );
+            }
 
-			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+            // Delete present meta
+            delete_post_meta( $post_id, $wl_constant );
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
-			}
+            foreach ( $property_value as $value ) {
+                add_post_meta( $post_id, $wl_constant, $value );
+            }
 
-			return true;
-		}
-	}
+            return true;
+        }
+    }
 
-	return false;
+    return false;
 }
 
 
@@ -152,18 +152,18 @@ 
  */
 function wl_schema_get_types( $post_id ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
-		return null;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) ) {
+        return null;
+    }
 
-	$type = wl_entity_type_taxonomy_get_type( $post_id );
+    $type = wl_entity_type_taxonomy_get_type( $post_id );
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
-	}
+    if ( isset( $type['uri'] ) ) {
+        return array( $type['uri'] );
+    }
 
-	return null;
+    return null;
 }
 
 /**
@@ -176,23 +176,23 @@ 
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
-		return null;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+        return null;
+    }
 
-	// TODO: support more than one type
-	if ( is_array( $type_names ) ) {
-		$type_names = $type_names[0];
-	}
+    // TODO: support more than one type
+    if ( is_array( $type_names ) ) {
+        $type_names = $type_names[0];
+    }
 
-	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+    // Get the schema URI (e.g. http://schema.org/Thing)
+    $type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
 
-	Wordlift_Log_Service::get_logger('wl_schema_set_types')->debug("[ type names :: $type_names ]");
+    Wordlift_Log_Service::get_logger('wl_schema_set_types')->debug("[ type names :: $type_names ]");
 
-	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+    // Actually sets the taxonomy type
+    wl_set_entity_main_type( $post_id, $type_names );
 
 }
 
@@ -208,24 +208,24 @@ 
  */
 function wl_schema_get_type_properties( $type_name ) {
 
-	// Build full schema uri if necessary
-	$type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
+    // Build full schema uri if necessary
+    $type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
 
-	// Get all custom fields
-	$all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
+    // Get all custom fields
+    $all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
 
-	$schema_root_address = 'http://schema.org/';
-	$type_properties     = array();
+    $schema_root_address = 'http://schema.org/';
+    $type_properties     = array();
 
-	// Search for the entity type which has the requested name as uri
-	if ( isset( $all_types_and_fields[ $type_name ] ) ) {
-		foreach ( $all_types_and_fields[ $type_name ] as $field ) {
-			// Convert to schema slug and store in array
-			$type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
-		}
-	}
+    // Search for the entity type which has the requested name as uri
+    if ( isset( $all_types_and_fields[ $type_name ] ) ) {
+        foreach ( $all_types_and_fields[ $type_name ] as $field ) {
+            // Convert to schema slug and store in array
+            $type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
+        }
+    }
 
-	return $type_properties;
+    return $type_properties;
 }
 
 /**
@@ -237,11 +237,11 @@ 
  */
 function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
 
-	$schema_root_address = 'http://schema.org/';
+    $schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
-	}
+    if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
+        $schema_name = $schema_root_address . $schema_name;
+    }
 
-	return $schema_name;
+    return $schema_name;
 }
\ No newline at end of file

src/admin/WL_Metabox/WL_Metabox_Field_sameas.php

Indentation +10 added lines, -10 removed lines

@@ -2,16 +2,16 @@
 
 class WL_Metabox_Field_sameas extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
-		parent::__construct( $args['sameas'] );
-	}
+    public function __construct( $args ) {
+        parent::__construct( $args['sameas'] );
+    }
 
-	/**
-	 * Only accept URIs
-	 */
-	public function sanitize_data_filter( $value ) {
+    /**
+     * Only accept URIs
+     */
+    public function sanitize_data_filter( $value ) {
 
-		// Call our sanitizer helper.
-		return Wordlift_Sanitizer::sanitize_url( $value );
-	}
+        // Call our sanitizer helper.
+        return Wordlift_Sanitizer::sanitize_url( $value );
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -2,16 +2,16 @@
 
 class WL_Metabox_Field_sameas extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
-		parent::__construct( $args['sameas'] );
+	public function __construct($args) {
+		parent::__construct($args['sameas']);
 	}
 
 	/**
 	 * Only accept URIs
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// Call our sanitizer helper.
-		return Wordlift_Sanitizer::sanitize_url( $value );
+		return Wordlift_Sanitizer::sanitize_url($value);
 	}
 }

src/wordlift_entity_type.php

Indentation +61 added lines, -61 removed lines

@@ -10,42 +10,42 @@ 
 
 //	wl_write_log( "wl_set_entity_main_type [ post id :: $post_id ][ type uri :: $type_uri ]" );
 
-	// If the type URI is empty we remove the type.
-	if ( empty( $type_uri ) ) {
-		wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		return;
-	}
-
-	// Get all the terms bound to the wl_entity_type taxonomy.
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-		'hide_empty' => false,
-		// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
-		// An issue has been opened with the AAM plugin author as well.
-		//
-		// see https://github.com/insideout10/wordlift-plugin/issues/334
-		// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
-		'fields'     => 'all'
-	) );
-
-	// Check which term matches the specified URI.
-	foreach ( $terms as $term ) {
-
-		$term_id   = $term->term_id;
-		$term_slug = $term->slug;
-
-		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
-		// Set the related term ID.
-		if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
-
-			Wordlift_Log_Service::get_logger( 'wl_set_entity_main_type' )->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]" );
-
-			wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-	}
+    // If the type URI is empty we remove the type.
+    if ( empty( $type_uri ) ) {
+        wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        return;
+    }
+
+    // Get all the terms bound to the wl_entity_type taxonomy.
+    $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+        'hide_empty' => false,
+        // Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
+        // An issue has been opened with the AAM plugin author as well.
+        //
+        // see https://github.com/insideout10/wordlift-plugin/issues/334
+        // see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
+        'fields'     => 'all'
+    ) );
+
+    // Check which term matches the specified URI.
+    foreach ( $terms as $term ) {
+
+        $term_id   = $term->term_id;
+        $term_slug = $term->slug;
+
+        // Load the type data.
+        $type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
+        // Set the related term ID.
+        if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
+
+            Wordlift_Log_Service::get_logger( 'wl_set_entity_main_type' )->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]" );
+
+            wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+    }
 }
 
 /**
@@ -53,46 +53,46 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-		'hide_empty' => false
-	) );
+    $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+        'hide_empty' => false
+    ) );
 
-	echo <<<EOF
+    echo <<<EOF
     <script type="text/javascript">
         (function() {
         var t = [];
 
 EOF;
 
-	// Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
-	// to be used by the JavaScript client library.
-	foreach ( $terms as $term ) {
+    // Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
+    // to be used by the JavaScript client library.
+    foreach ( $terms as $term ) {
 
-		$term_name = $term->name;
+        $term_name = $term->name;
 
-		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+        // Load the type data.
+        $type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
 
-		// Skip types that are not defined.
-		if ( ! empty( $type['uri'] ) ) {
+        // Skip types that are not defined.
+        if ( ! empty( $type['uri'] ) ) {
 
-			// Prepare the JSON output then print it to the browser.
-			$json = json_encode( array(
-				'label'     => $term_name,
-				'uri'       => $type['uri'],
-				'css'       => $type['css_class'],
-				'sameAs'    => $type['same_as'],
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			) );
+            // Prepare the JSON output then print it to the browser.
+            $json = json_encode( array(
+                'label'     => $term_name,
+                'uri'       => $type['uri'],
+                'css'       => $type['css_class'],
+                'sameAs'    => $type['same_as'],
+                'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+            ) );
 
-			// Output the type data.
-			echo "t.push($json);\n";
+            // Output the type data.
+            echo "t.push($json);\n";
 
-		}
+        }
 
-	}
+    }
 
-	echo <<<EOF
+    echo <<<EOF
             if ('undefined' == typeof window.wordlift) {
                 window.wordlift = {}
             }

Spacing +20 added lines, -20 removed lines

@@ -6,19 +6,19 @@ 
  * @param int $post_id The numeric post ID.
  * @param string $type_uri A type URI.
  */
-function wl_set_entity_main_type( $post_id, $type_uri ) {
+function wl_set_entity_main_type($post_id, $type_uri) {
 
 //	wl_write_log( "wl_set_entity_main_type [ post id :: $post_id ][ type uri :: $type_uri ]" );
 
 	// If the type URI is empty we remove the type.
-	if ( empty( $type_uri ) ) {
-		wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+	if (empty($type_uri)) {
+		wp_set_object_terms($post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 		return;
 	}
 
 	// Get all the terms bound to the wl_entity_type taxonomy.
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+	$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 		'hide_empty' => false,
 		// Because of #334 (and the AAM plugin) we changed fields from 'id=>slug' to 'all'.
 		// An issue has been opened with the AAM plugin author as well.
@@ -26,22 +26,22 @@ 
 		// see https://github.com/insideout10/wordlift-plugin/issues/334
 		// see https://wordpress.org/support/topic/idslug-not-working-anymore?replies=1#post-8806863
 		'fields'     => 'all'
-	) );
+	));
 
 	// Check which term matches the specified URI.
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 
 		$term_id   = $term->term_id;
 		$term_slug = $term->slug;
 
 		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
+		$type = Wordlift_Schema_Service::get_instance()->get_schema($term_slug);
 		// Set the related term ID.
-		if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
+		if ($type_uri === $type['uri'] || $type_uri === $type['css_class']) {
 
-			Wordlift_Log_Service::get_logger( 'wl_set_entity_main_type' )->debug( "Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]" );
+			Wordlift_Log_Service::get_logger('wl_set_entity_main_type')->debug("Setting entity type [ post id :: $post_id ][ term id :: $term_id ][ term slug :: $term_slug ][ type uri :: {$type['uri']} ][ type css class :: {$type['css_class']} ]");
 
-			wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+			wp_set_object_terms($post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
@@ -53,9 +53,9 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+	$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 		'hide_empty' => false
-	) );
+	));
 
 	echo <<<EOF
     <script type="text/javascript">
@@ -66,24 +66,24 @@ 
 
 	// Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
 	// to be used by the JavaScript client library.
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 
 		$term_name = $term->name;
 
 		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+		$type = Wordlift_Schema_Service::get_instance()->get_schema($term->slug);
 
 		// Skip types that are not defined.
-		if ( ! empty( $type['uri'] ) ) {
+		if ( ! empty($type['uri'])) {
 
 			// Prepare the JSON output then print it to the browser.
-			$json = json_encode( array(
+			$json = json_encode(array(
 				'label'     => $term_name,
 				'uri'       => $type['uri'],
 				'css'       => $type['css_class'],
 				'sameAs'    => $type['same_as'],
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			) );
+				'templates' => (isset($type['templates']) ? $type['templates'] : array()),
+			));
 
 			// Output the type data.
 			echo "t.push($json);\n";
@@ -104,6 +104,6 @@ 
 
 }
 
-add_action( 'admin_print_scripts', 'wl_print_entity_type_inline_js' );
+add_action('admin_print_scripts', 'wl_print_entity_type_inline_js');
 
-add_action( 'init', 'wl_entity_type_taxonomy_register', 0 );
+add_action('init', 'wl_entity_type_taxonomy_register', 0);

src/includes/class-wordlift.php

Indentation +529 added lines, -529 removed lines

@@ -29,571 +29,571 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since 3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	private $schema_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The Topic Taxonomy service.
-	 *
-	 * @since 3.5.0
-	 * @access private
-	 * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
-	 */
-	private $topic_taxonomy_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	private $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Redirect service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
-	 */
-	private $redirect_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The Entity list customization.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_List_Service $entity_list_service The Entity list service.
-	 */
-	private $entity_list_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * The ShareThis service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
-	 */
-	private $sharethis_service;
-
-	/**
-	 * The PrimaShop adapter.
-	 *
-	 * @since 3.2.3
-	 * @access private
-	 * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
-	 */
-	private $primashop_adapter;
-
-	/**
-	 * The WordLift Dashboard adapter.
-	 *
-	 * @since 3.4.0
-	 * @access private
-	 * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
-	 */
-	private $dashboard_service;
-
-	/**
-	 * The entity type service.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service
-	 */
-	private $entity_type_service;
-
-	/**
-	 * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
-	 *
-	 * @since 3.6.0
-	 * @access private
-	 * @var \Wordlift_Entity_Link_Service
-	 */
-	private $entity_link_service;
-
-	/**
-	 * The page service instance which processes the page output in order to insert schema.org microdata to export the
-	 * correct page title to Google+.
-	 *
-	 * @since 3.5.3
-	 * @access private
-	 * @var \Wordlift_Page_Service
-	 */
-	private $page_service;
-
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.6.0-dev';
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * Provide support functions to sanitize data.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
-
-		/**
-		 * The Redirect service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The entity post type service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
-
-		/**
-		 * The entity link service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The UI service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The Topic Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
-
-
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-page-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The class to customize the entity list admin page.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The Notice service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since 3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The UI service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    private $schema_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The Topic Taxonomy service.
+     *
+     * @since 3.5.0
+     * @access private
+     * @var \Wordlift_Topic_Taxonomy_Service The Topic Taxonomy service.
+     */
+    private $topic_taxonomy_service;
+
+    /**
+     * The User service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    private $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Redirect service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_Redirect_Service $redirect_service The Redirect service.
+     */
+    private $redirect_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The Entity list customization.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_List_Service $entity_list_service The Entity list service.
+     */
+    private $entity_list_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * The ShareThis service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_ShareThis_Service $sharethis_service The ShareThis service.
+     */
+    private $sharethis_service;
+
+    /**
+     * The PrimaShop adapter.
+     *
+     * @since 3.2.3
+     * @access private
+     * @var \Wordlift_PrimaShop_Adapter $primashop_adapter The PrimaShop adapter.
+     */
+    private $primashop_adapter;
+
+    /**
+     * The WordLift Dashboard adapter.
+     *
+     * @since 3.4.0
+     * @access private
+     * @var \Wordlift_Dashboard_Service $dashboard_service The WordLift Dashboard service;
+     */
+    private $dashboard_service;
+
+    /**
+     * The entity type service.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service
+     */
+    private $entity_type_service;
+
+    /**
+     * The entity link service used to mangle links to entities with a custom slug or even w/o a slug.
+     *
+     * @since 3.6.0
+     * @access private
+     * @var \Wordlift_Entity_Link_Service
+     */
+    private $entity_link_service;
+
+    /**
+     * The page service instance which processes the page output in order to insert schema.org microdata to export the
+     * correct page title to Google+.
+     *
+     * @since 3.5.3
+     * @access private
+     * @var \Wordlift_Page_Service
+     */
+    private $page_service;
+
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.6.0-dev';
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * Provide support functions to sanitize data.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+
+        /**
+         * The Redirect service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The entity post type service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+
+        /**
+         * The entity link service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The UI service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The Topic Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+
+
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-page-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The class to customize the entity list admin page.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The Notice service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
 
-		/**
-		 * The PrimaShop adapter.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+        /**
+         * The PrimaShop adapter.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
 
-		/**
-		 * The WordLift Dashboard service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+        /**
+         * The WordLift Dashboard service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
 
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
 
-		/**
-		 * The ShareThis service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+        /**
+         * The ShareThis service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
 
-		$this->loader = new Wordlift_Loader();
+        $this->loader = new Wordlift_Loader();
 
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
 
-		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG );
+        // Create an entity type service instance. It'll be later bound to the init action.
+        $this->entity_type_service = new Wordlift_Entity_Type_Service( Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG );
 
-		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_type_service, WL_ENTITY_TYPE_SLUG );
+        // Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
+        $this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_type_service, WL_ENTITY_TYPE_SLUG );
 
-		// Create an instance of the UI service.
-		$this->ui_service = new Wordlift_UI_Service();
+        // Create an instance of the UI service.
+        $this->ui_service = new Wordlift_UI_Service();
 
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
 
-		// Create an instance of the Schema service.
-		$this->schema_service = new Wordlift_Schema_Service();
+        // Create an instance of the Schema service.
+        $this->schema_service = new Wordlift_Schema_Service();
 
-		// Create an instance of the Notice service.
-		$this->notice_service = new Wordlift_Notice_Service();
+        // Create an instance of the Notice service.
+        $this->notice_service = new Wordlift_Notice_Service();
 
-		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
+        // Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
+        $this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
 
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
 
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
 
-		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
+        // Create a new instance of the Redirect service.
+        $this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
 
-		// Create an instance of the Timeline shortcode.
-		new Wordlift_Timeline_Shortcode();
+        // Create an instance of the Timeline shortcode.
+        new Wordlift_Timeline_Shortcode();
 
-		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
+        // Create entity list customization (wp-admin/edit.php)
+        $this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
 
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
-		$this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
+        $this->topic_taxonomy_service = new Wordlift_Topic_Taxonomy_Service();
 
-		// Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
-		$this->sharethis_service = new Wordlift_ShareThis_Service();
+        // Create an instance of the ShareThis service, later we hook it to the_content and the_excerpt filters.
+        $this->sharethis_service = new Wordlift_ShareThis_Service();
 
-		// Create an instance of the PrimaShop adapter.
-		$this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
+        // Create an instance of the PrimaShop adapter.
+        $this->primashop_adapter = new Wordlift_PrimaShop_Adapter();
 
-		$this->page_service = new Wordlift_Page_Service();
-	}
+        $this->page_service = new Wordlift_Page_Service();
+    }
 
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
 
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
 
-	}
+    }
 
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+        $plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
 
-		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+        // Hook the init action to the Topic Taxonomy service.
+        $this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
 
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
 
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+        // Hook the updated_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
 
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
 
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
-		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
-
-		// Hook save_post to the entity service to update custom fields (such as alternate labels).
-		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
-
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
-
-		// Entity listing customization (wp-admin/edit.php)
-		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
-		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
-
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-
-		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
-		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_type_service, 'register' );
-
-		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
-
-		$this->loader->add_action( 'wp_head', $this->page_service, 'wp_head', PHP_INT_MAX );
-		$this->loader->add_action( 'wp_footer', $this->page_service, 'wp_head', -PHP_INT_MAX );
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Register custom allowed redirect hosts.
+        $this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+        // Hook the AJAX wordlift_redirect action to the Redirect service.
+        $this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+
+        // Hook save_post to the entity service to update custom fields (such as alternate labels).
+        // We have a priority of 9 because we want to be executed before data is sent to Redlink.
+        $this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
+        $this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
+
+        $this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+        $this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
+
+        // Entity listing customization (wp-admin/edit.php)
+        // Add custom columns
+        $this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
+        $this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+        // Add 4W selection
+        $this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
+        $this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+
+        // Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
+        // entities.
+        $this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        // Register the entity post type.
+        $this->loader->add_action( 'init', $this->entity_type_service, 'register' );
+
+        // Bind the link generation and handling hooks to the entity link service.
+        $this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
+        $this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
+        $this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        // Hook the ShareThis service.
+        $this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
+        $this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+
+        $this->loader->add_action( 'wp_head', $this->page_service, 'wp_head', PHP_INT_MAX );
+        $this->loader->add_action( 'wp_footer', $this->page_service, 'wp_head', -PHP_INT_MAX );
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

Spacing +72 added lines, -72 removed lines

@@ -254,144 +254,144 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * Provide support functions to sanitize data.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-sanitizer.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-sanitizer.php';
 
 		/**
 		 * The Redirect service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-redirect-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-redirect-service.php';
 
 		/**
 		 * The Log service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The entity post type service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-type-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-type-service.php';
 
 		/**
 		 * The entity link service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-link-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-link-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The Topic Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-topic-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-topic-taxonomy-service.php';
 
 
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-page-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-page-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The class to customize the entity list admin page.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-entity-list.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-entity-list.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The PrimaShop adapter.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-primashop-adapter.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-primashop-adapter.php';
 
 		/**
 		 * The WordLift Dashboard service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an entity type service instance. It'll be later bound to the init action.
-		$this->entity_type_service = new Wordlift_Entity_Type_Service( Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG );
+		$this->entity_type_service = new Wordlift_Entity_Type_Service(Wordlift_Entity_Service::TYPE_NAME, WL_ENTITY_TYPE_SLUG);
 
 		// Create an entity link service instance. It'll be later bound to the post_type_link and pre_get_posts actions.
-		$this->entity_link_service = new Wordlift_Entity_Link_Service( $this->entity_type_service, WL_ENTITY_TYPE_SLUG );
+		$this->entity_link_service = new Wordlift_Entity_Link_Service($this->entity_type_service, WL_ENTITY_TYPE_SLUG);
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -406,25 +406,25 @@ 
 		$this->notice_service = new Wordlift_Notice_Service();
 
 		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service, $this->schema_service, $this->notice_service );
+		$this->entity_service = new Wordlift_Entity_Service($this->ui_service, $this->schema_service, $this->notice_service);
 
 		// Create an instance of the User service.
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create a new instance of the Redirect service.
-		$this->redirect_service = new Wordlift_Redirect_Service( $this->entity_service );
+		$this->redirect_service = new Wordlift_Redirect_Service($this->entity_service);
 
 		// Create a new instance of the Redirect service.
-		$this->dashboard_service = new Wordlift_Dashboard_Service( $this->entity_service );
+		$this->dashboard_service = new Wordlift_Dashboard_Service($this->entity_service);
 
 		// Create an instance of the Timeline shortcode.
 		new Wordlift_Timeline_Shortcode();
 
 		// Create entity list customization (wp-admin/edit.php)
-		$this->entity_list_service = new Wordlift_Entity_List_Service( $this->entity_service );
+		$this->entity_list_service = new Wordlift_Entity_List_Service($this->entity_service);
 
 		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
 
@@ -451,9 +451,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -466,59 +466,59 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Wordlift_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the init action to the Topic Taxonomy service.
-		$this->loader->add_action( 'init', $this->topic_taxonomy_service, 'init', 0 );
+		$this->loader->add_action('init', $this->topic_taxonomy_service, 'init', 0);
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook the updated_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4 );
+		$this->loader->add_action('updated_post_meta', $this->thumbnail_service, 'added_or_updated_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Register custom allowed redirect hosts.
-		$this->loader->add_filter( 'allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts' );
+		$this->loader->add_filter('allowed_redirect_hosts', $this->redirect_service, 'allowed_redirect_hosts');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect' );
+		$this->loader->add_action('wp_ajax_wordlift_redirect', $this->redirect_service, 'ajax_redirect');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats' );
+		$this->loader->add_action('wp_ajax_wordlift_get_stats', $this->dashboard_service, 'ajax_get_stats');
 		// Hook the AJAX wordlift_redirect action to the Redirect service.
-		$this->loader->add_action( 'wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets' );
+		$this->loader->add_action('wp_dashboard_setup', $this->dashboard_service, 'add_dashboard_widgets');
 
 		// Hook save_post to the entity service to update custom fields (such as alternate labels).
 		// We have a priority of 9 because we want to be executed before data is sent to Redlink.
-		$this->loader->add_action( 'save_post', $this->entity_service, 'save_post', 9, 3 );
-		$this->loader->add_action( 'save_post_entity', $this->entity_service, 'set_rating_for', 10, 1 );
+		$this->loader->add_action('save_post', $this->entity_service, 'save_post', 9, 3);
+		$this->loader->add_action('save_post_entity', $this->entity_service, 'set_rating_for', 10, 1);
 
-		$this->loader->add_action( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
-		$this->loader->add_action( 'in_admin_header', $this->entity_service, 'in_admin_header' );
+		$this->loader->add_action('edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1);
+		$this->loader->add_action('in_admin_header', $this->entity_service, 'in_admin_header');
 
 		// Entity listing customization (wp-admin/edit.php)
 		// Add custom columns
-		$this->loader->add_filter( 'manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns' );
-		$this->loader->add_filter( 'manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2 );
+		$this->loader->add_filter('manage_entity_posts_columns', $this->entity_list_service, 'register_custom_columns');
+		$this->loader->add_filter('manage_entity_posts_custom_column', $this->entity_list_service, 'render_custom_columns', 10, 2);
 		// Add 4W selection
-		$this->loader->add_action( 'restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope' );
-		$this->loader->add_filter( 'posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope' );
+		$this->loader->add_action('restrict_manage_posts', $this->entity_list_service, 'restrict_manage_posts_classification_scope');
+		$this->loader->add_filter('posts_clauses', $this->entity_list_service, 'posts_clauses_classification_scope');
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 		// Hook the PrimaShop adapter to <em>prima_metabox_entity_header_args</em> in order to add header support for
 		// entities.
-		$this->loader->add_filter( 'prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2 );
+		$this->loader->add_filter('prima_metabox_entity_header_args', $this->primashop_adapter, 'prima_metabox_entity_header_args', 10, 2);
 	}
 
 	/**
@@ -530,29 +530,29 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
 		// Register the entity post type.
-		$this->loader->add_action( 'init', $this->entity_type_service, 'register' );
+		$this->loader->add_action('init', $this->entity_type_service, 'register');
 
 		// Bind the link generation and handling hooks to the entity link service.
-		$this->loader->add_filter( 'post_type_link', $this->entity_link_service, 'post_type_link', 10, 4 );
-		$this->loader->add_action( 'pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3 );
-		$this->loader->add_filter( 'wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4 );
+		$this->loader->add_filter('post_type_link', $this->entity_link_service, 'post_type_link', 10, 4);
+		$this->loader->add_action('pre_get_posts', $this->entity_link_service, 'pre_get_posts', 10, 1);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_flat_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_flat_slug', 10, 3);
+		$this->loader->add_filter('wp_unique_post_slug_is_bad_hierarchical_slug', $this->entity_link_service, 'wp_unique_post_slug_is_bad_hierarchical_slug', 10, 4);
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 
-		$this->loader->add_action( 'wp_head', $this->page_service, 'wp_head', PHP_INT_MAX );
-		$this->loader->add_action( 'wp_footer', $this->page_service, 'wp_head', -PHP_INT_MAX );
+		$this->loader->add_action('wp_head', $this->page_service, 'wp_head', PHP_INT_MAX);
+		$this->loader->add_action('wp_footer', $this->page_service, 'wp_head', -PHP_INT_MAX);
 
 	}