insideout10 / wordlift-plugin

src/modules/linked_data/wordlift_linked_data.php

Indentation +383 added lines, -383 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,121 +40,121 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		return;
-	}
-
-	// get the current post.
-	$post = get_post( $post_id );
-
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
-
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
-
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
-	// Store classification box mapping
-	$entities_predicates_mapping = null;
-
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
-
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
-
-		$entities_via_post = $_POST['wl_entities'];
-		$boxes_via_post    = $_POST['wl_boxes'];
-
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
-			// Local entities have a tmp uri with 'local-entity-'
-			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
-				// Build the proper uri
-				$uri = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $entity['label'] ) );
-				// Populate the mapping
-				$entities_uri_mapping[ $entity_uri ] = $uri;
-				// Override the entity obj
-				$entities_via_post[ $entity_uri ]['uri'] = $uri;
-			}
-		}
-
-		// Populate the $entities_predicates_mapping
-		// Local Redlink uris need to be used here
-		foreach ( $boxes_via_post as $predicate => $entity_uris ) {
-			foreach ( $entity_uris as $entity_uri ) {
-				// wl_write_log("Going to map predicates for uri $entity_uri ");
-				// Retrieve the entity label needed to build the uri
-				$label = $entities_via_post[ stripslashes( $entity_uri ) ]['label'];
-				$uri   = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $label ) );
-				// wl_write_log("Going to map predicate $predicate to uri $uri ");
-				$entities_predicates_mapping[ $uri ][] = $predicate;
-			}
-		}
-
-		// Save entities and push them to Redlink
-		// TODO: pass also latitude, longitude, etc.
-		wl_save_entities( array_values( $entities_via_post ), $post_id );
-
-	}
-
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
-	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-	}
-	// Update the post content
-	wp_update_post( array(
-		'ID'           => $post->ID,
-		'post_content' => $updated_post_content,
-	) );
-
-	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
-
-	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
-
-	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
-
-		// wl_write_log(" Going to manage relation between Post $post_id and $referenced_entity_id");
-
-		if ( $entities_predicates_mapping ) {
-
-			// wl_write_log(" Going to manage relation instances according to the following mapping");
-
-			// Retrieve the entity uri
-			$referenced_entity_uri = wl_get_entity_uri( $referenced_entity_id );
-			// Retrieve predicates for the current uri
-			if ( isset( $entities_predicates_mapping[ $referenced_entity_uri ] ) ) {
-				foreach ( $entities_predicates_mapping[ $referenced_entity_uri ] as $predicate ) {
-					// wl_write_log(" Going to add relation with predicate $predicate");
-					wl_core_add_relation_instance( $post_id, $predicate, $referenced_entity_id );
-				}
-			} else {
-				wl_write_log( "Entity uri $referenced_entity_uri missing in the mapping" );
-				wl_write_log( $entities_predicates_mapping );
-			}
-
-		} else {
-			// Just for unit tests
-			wl_core_add_relation_instance( $post_id, 'what', $referenced_entity_id );
-		}
-
-		// TODO Check if is needed
-		wl_linked_data_push_to_redlink( $referenced_entity_id );
-	}
-
-	// Push the post to Redlink.
-	wl_linked_data_push_to_redlink( $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        return;
+    }
+
+    // get the current post.
+    $post = get_post( $post_id );
+
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
+    // Store classification box mapping
+    $entities_predicates_mapping = null;
+
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( json_encode( $_POST['wl_entities'] ) );
+        wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
+        wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
+        wl_write_log( "]" );
+
+        $entities_via_post = $_POST['wl_entities'];
+        $boxes_via_post    = $_POST['wl_boxes'];
+
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
+            // Local entities have a tmp uri with 'local-entity-'
+            // These uris need to be rewritten here and replaced in the content
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+                // Build the proper uri
+                $uri = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $entity['label'] ) );
+                // Populate the mapping
+                $entities_uri_mapping[ $entity_uri ] = $uri;
+                // Override the entity obj
+                $entities_via_post[ $entity_uri ]['uri'] = $uri;
+            }
+        }
+
+        // Populate the $entities_predicates_mapping
+        // Local Redlink uris need to be used here
+        foreach ( $boxes_via_post as $predicate => $entity_uris ) {
+            foreach ( $entity_uris as $entity_uri ) {
+                // wl_write_log("Going to map predicates for uri $entity_uri ");
+                // Retrieve the entity label needed to build the uri
+                $label = $entities_via_post[ stripslashes( $entity_uri ) ]['label'];
+                $uri   = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $label ) );
+                // wl_write_log("Going to map predicate $predicate to uri $uri ");
+                $entities_predicates_mapping[ $uri ][] = $predicate;
+            }
+        }
+
+        // Save entities and push them to Redlink
+        // TODO: pass also latitude, longitude, etc.
+        wl_save_entities( array_values( $entities_via_post ), $post_id );
+
+    }
+
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+    // Save each entity and store the post id.
+    foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+        $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+    }
+    // Update the post content
+    wp_update_post( array(
+        'ID'           => $post->ID,
+        'post_content' => $updated_post_content,
+    ) );
+
+    // Extract related/referenced entities from text.
+    $disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+
+    // Reset previously saved instances
+    wl_core_delete_relation_instances( $post_id );
+
+    // Save relation instances
+    foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+
+        // wl_write_log(" Going to manage relation between Post $post_id and $referenced_entity_id");
+
+        if ( $entities_predicates_mapping ) {
+
+            // wl_write_log(" Going to manage relation instances according to the following mapping");
+
+            // Retrieve the entity uri
+            $referenced_entity_uri = wl_get_entity_uri( $referenced_entity_id );
+            // Retrieve predicates for the current uri
+            if ( isset( $entities_predicates_mapping[ $referenced_entity_uri ] ) ) {
+                foreach ( $entities_predicates_mapping[ $referenced_entity_uri ] as $predicate ) {
+                    // wl_write_log(" Going to add relation with predicate $predicate");
+                    wl_core_add_relation_instance( $post_id, $predicate, $referenced_entity_id );
+                }
+            } else {
+                wl_write_log( "Entity uri $referenced_entity_uri missing in the mapping" );
+                wl_write_log( $entities_predicates_mapping );
+            }
+
+        } else {
+            // Just for unit tests
+            wl_core_add_relation_instance( $post_id, 'what', $referenced_entity_id );
+        }
+
+        // TODO Check if is needed
+        wl_linked_data_push_to_redlink( $referenced_entity_id );
+    }
+
+    // Push the post to Redlink.
+    wl_linked_data_push_to_redlink( $post->ID );
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -164,14 +164,14 @@ 
  */
 function wordlift_save_post_add_default_schema_type( $entity_id ) {
 
-	$entity      = get_post( $entity_id );
-	$entity_type = wl_schema_get_types( $entity_id );
+    $entity      = get_post( $entity_id );
+    $entity_type = wl_schema_get_types( $entity_id );
 
-	// Assign type 'Thing' if we are dealing with an entity without type
-	if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
+    // Assign type 'Thing' if we are dealing with an entity without type
+    if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
 
-		wl_schema_set_types( $entity_id, 'Thing' );
-	}
+        wl_schema_set_types( $entity_id, 'Thing' );
+    }
 }
 
 // Priority 1 (default is 10) because we want the default type to be set as soon as possible
@@ -188,59 +188,59 @@ 
  */
 function wl_save_entities( $entities, $related_post_id = null ) {
 
-	// wl_write_log( "[ entities count :: " . count( $entities ) . " ][ related post id :: $related_post_id ]" );
-
-	// Prepare the return array.
-	$posts = array();
-
-	// Save each entity and store the post id.
-	foreach ( $entities as $entity ) {
-
-		$uri   = $entity['uri'];
-		$label = $entity['label'];
-
-		// This is the main type URI.
-		$main_type_uri = $entity['main_type'];
-
-		// the preferred type.
-		$type_uris = ( isset( $entity['type'] ) ?
-			$entity['type'] :
-			array() );
-
-		$description = $entity['description'];
-		$images      = ( isset( $entity['image'] ) ?
-			( is_array( $entity['image'] )
-				? $entity['image']
-				: array( $entity['image'] ) )
-			: array() );
-		$same_as     = ( isset( $entity['sameas'] ) ?
-			( is_array( $entity['sameas'] )
-				? $entity['sameas']
-				: array( $entity['sameas'] ) )
-			: array() );
-
-		// Bring properties inside an associative array
-		$entity_properties = array(
-			'uri'             => $uri,
-			'label'           => $label,
-			'main_type_uri'   => $main_type_uri,
-			'description'     => $description,
-			'type_uris'       => $type_uris,
-			'images'          => $images,
-			'related_post_id' => $related_post_id,
-			'same_as'         => $same_as
-		);
-
-		// Save the entity.
-		$entity_post = wl_save_entity( $entity_properties );
-
-		// Store the post in the return array if successful.
-		if ( null !== $entity_post ) {
-			array_push( $posts, $entity_post );
-		}
-	}
-
-	return $posts;
+    // wl_write_log( "[ entities count :: " . count( $entities ) . " ][ related post id :: $related_post_id ]" );
+
+    // Prepare the return array.
+    $posts = array();
+
+    // Save each entity and store the post id.
+    foreach ( $entities as $entity ) {
+
+        $uri   = $entity['uri'];
+        $label = $entity['label'];
+
+        // This is the main type URI.
+        $main_type_uri = $entity['main_type'];
+
+        // the preferred type.
+        $type_uris = ( isset( $entity['type'] ) ?
+            $entity['type'] :
+            array() );
+
+        $description = $entity['description'];
+        $images      = ( isset( $entity['image'] ) ?
+            ( is_array( $entity['image'] )
+                ? $entity['image']
+                : array( $entity['image'] ) )
+            : array() );
+        $same_as     = ( isset( $entity['sameas'] ) ?
+            ( is_array( $entity['sameas'] )
+                ? $entity['sameas']
+                : array( $entity['sameas'] ) )
+            : array() );
+
+        // Bring properties inside an associative array
+        $entity_properties = array(
+            'uri'             => $uri,
+            'label'           => $label,
+            'main_type_uri'   => $main_type_uri,
+            'description'     => $description,
+            'type_uris'       => $type_uris,
+            'images'          => $images,
+            'related_post_id' => $related_post_id,
+            'same_as'         => $same_as
+        );
+
+        // Save the entity.
+        $entity_post = wl_save_entity( $entity_properties );
+
+        // Store the post in the return array if successful.
+        if ( null !== $entity_post ) {
+            array_push( $posts, $entity_post );
+        }
+    }
+
+    return $posts;
 }
 
 /**
@@ -261,172 +261,172 @@ 
  */
 function wl_save_entity( $entity_properties ) {
 
-	$uri             = $entity_properties['uri'];
-	$label           = $entity_properties['label'];
-	$type_uri        = $entity_properties['main_type_uri'];
-	$description     = $entity_properties['description'];
-	$entity_types    = $entity_properties['type_uris'];
-	$images          = $entity_properties['images'];
-	$related_post_id = $entity_properties['related_post_id'];
-	$same_as         = $entity_properties['same_as'];
-
-	// Avoid errors due to null.
-	if ( is_null( $entity_types ) ) {
-		$entity_types = 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 = wl_get_entity_post_by_uri( $uri );
-
-	if ( null !== $post ) {
-		// We insert into the params the entity ID, so it will be updated and not inserted.
-		$params['ID'] = $post->ID;
-		// Preserve the current entity status
-		if ( 'public' == $post->post_status ) {
-			$params['post_status'] = $post->post_status;
-		}
-		// Preserve the current entity content. Hotfix for issue #152
-		$params['post_content'] = $post->post_content;
-	}
-
-	// 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 );
-
-	// 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_properties['uri'];
+    $label           = $entity_properties['label'];
+    $type_uri        = $entity_properties['main_type_uri'];
+    $description     = $entity_properties['description'];
+    $entity_types    = $entity_properties['type_uris'];
+    $images          = $entity_properties['images'];
+    $related_post_id = $entity_properties['related_post_id'];
+    $same_as         = $entity_properties['same_as'];
+
+    // Avoid errors due to null.
+    if ( is_null( $entity_types ) ) {
+        $entity_types = 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 = wl_get_entity_post_by_uri( $uri );
+
+    if ( null !== $post ) {
+        // We insert into the params the entity ID, so it will be updated and not inserted.
+        $params['ID'] = $post->ID;
+        // Preserve the current entity status
+        if ( 'public' == $post->post_status ) {
+            $params['post_status'] = $post->post_status;
+        }
+        // Preserve the current entity content. Hotfix for issue #152
+        $params['post_content'] = $post->post_content;
+    }
+
+    // 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 );
+
+    // 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 );
 }
 
 /**
@@ -440,41 +440,41 @@ 
  */
 function wl_linked_data_content_get_embedded_entities( $content ) {
 
-	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+    // Remove quote escapes.
+    $content = str_replace( '\\"', '"', $content );
 
-	// Match all itemid attributes.
-	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
+    // Match all itemid attributes.
+    $pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
 
-	//	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
+    //	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
 
-	// Remove the pattern while it is found (match nested annotations).
-	$matches = array();
+    // Remove the pattern while it is found (match nested annotations).
+    $matches = array();
 
-	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+    // In case of errors, return an empty array.
+    if ( false === preg_match_all( $pattern, $content, $matches ) ) {
+        wl_write_log( "Found no entities embedded in content" );
 
-		return array();
-	}
+        return array();
+    }
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	// Collect the entities.
-	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d  = html_entity_decode( $uri );
-		$entity = wl_get_entity_post_by_uri( $uri_d );
+    // Collect the entities.
+    $entities = array();
+    foreach ( $matches[1] as $uri ) {
+        $uri_d  = html_entity_decode( $uri );
+        $entity = wl_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;
 }
 
 /**
@@ -486,22 +486,22 @@ 
  */
 function wl_linked_data_push_to_redlink( $post_id ) {
 
-	// Get the post.
-	$post = get_post( $post_id );
+    // Get the post.
+    $post = get_post( $post_id );
 
-	// wl_write_log( "wl_linked_data_push_to_redlink [ post id :: $post_id ][ post type :: $post->post_type ]" );
+    // wl_write_log( "wl_linked_data_push_to_redlink [ post id :: $post_id ][ post type :: $post->post_type ]" );
 
-	// Call the method on behalf of the post type.
-	switch ( $post->post_type ) {
-		case 'entity':
-			wl_push_entity_post_to_redlink( $post );
-			break;
-		default:
-			wl_push_post_to_redlink( $post );
-	}
+    // Call the method on behalf of the post type.
+    switch ( $post->post_type ) {
+        case 'entity':
+            wl_push_entity_post_to_redlink( $post );
+            break;
+        default:
+            wl_push_post_to_redlink( $post );
+    }
 
-	// Reindex the triple store if buffering is turned off.
-	if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
-		wordlift_reindex_triple_store();
-	}
+    // Reindex the triple store if buffering is turned off.
+    if ( false === WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+        wordlift_reindex_triple_store();
+    }
 }

Spacing +123 added lines, -124 removed lines

@@ -3,7 +3,7 @@ 
  * The Linked Data module provides synchronization of local WordPress data with the remote Linked Data store.
  */
 
-require_once( 'wordlift_linked_data_images.php' );
+require_once('wordlift_linked_data_images.php');
 
 /**
  * Receive events from post saves, and split them according to the post type.
@@ -12,24 +12,24 @@ 
  *
  * @param int $post_id The post id.
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
 		return;
 	}
 
 	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -38,17 +38,17 @@ 
  *
  * @param int $post_id The post id being saved.
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -58,125 +58,125 @@ 
 	$entities_predicates_mapping = null;
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 		$boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 			// Local entities have a tmp uri with 'local-entity-'
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Build the proper uri
-				$uri = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $entity['label'] ) );
+				$uri = sprintf('%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path($entity['label']));
 				// Populate the mapping
-				$entities_uri_mapping[ $entity_uri ] = $uri;
+				$entities_uri_mapping[$entity_uri] = $uri;
 				// Override the entity obj
-				$entities_via_post[ $entity_uri ]['uri'] = $uri;
+				$entities_via_post[$entity_uri]['uri'] = $uri;
 			}
 		}
 
 		// Populate the $entities_predicates_mapping
 		// Local Redlink uris need to be used here
-		foreach ( $boxes_via_post as $predicate => $entity_uris ) {
-			foreach ( $entity_uris as $entity_uri ) {
+		foreach ($boxes_via_post as $predicate => $entity_uris) {
+			foreach ($entity_uris as $entity_uri) {
 				// wl_write_log("Going to map predicates for uri $entity_uri ");
 				// Retrieve the entity label needed to build the uri
-				$label = $entities_via_post[ stripslashes( $entity_uri ) ]['label'];
-				$uri   = sprintf( '%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path( $label ) );
+				$label = $entities_via_post[stripslashes($entity_uri)]['label'];
+				$uri   = sprintf('%s/%s/%s', wl_configuration_get_redlink_dataset_uri(), 'entity', wl_sanitize_uri_path($label));
 				// wl_write_log("Going to map predicate $predicate to uri $uri ");
-				$entities_predicates_mapping[ $uri ][] = $predicate;
+				$entities_predicates_mapping[$uri][] = $predicate;
 			}
 		}
 
 		// Save entities and push them to Redlink
 		// TODO: pass also latitude, longitude, etc.
-		wl_save_entities( array_values( $entities_via_post ), $post_id );
+		wl_save_entities(array_values($entities_via_post), $post_id);
 
 	}
 
 	// Replace tmp uris in content post if needed
 	$updated_post_content = $post->post_content;
 	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+	foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+		$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 	}
 	// Update the post content
-	wp_update_post( array(
+	wp_update_post(array(
 		'ID'           => $post->ID,
 		'post_content' => $updated_post_content,
-	) );
+	));
 
 	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+	$disambiguated_entities = wl_linked_data_content_get_embedded_entities($updated_post_content);
 
 	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+	foreach (array_unique($disambiguated_entities) as $referenced_entity_id) {
 
 		// wl_write_log(" Going to manage relation between Post $post_id and $referenced_entity_id");
 
-		if ( $entities_predicates_mapping ) {
+		if ($entities_predicates_mapping) {
 
 			// wl_write_log(" Going to manage relation instances according to the following mapping");
 
 			// Retrieve the entity uri
-			$referenced_entity_uri = wl_get_entity_uri( $referenced_entity_id );
+			$referenced_entity_uri = wl_get_entity_uri($referenced_entity_id);
 			// Retrieve predicates for the current uri
-			if ( isset( $entities_predicates_mapping[ $referenced_entity_uri ] ) ) {
-				foreach ( $entities_predicates_mapping[ $referenced_entity_uri ] as $predicate ) {
+			if (isset($entities_predicates_mapping[$referenced_entity_uri])) {
+				foreach ($entities_predicates_mapping[$referenced_entity_uri] as $predicate) {
 					// wl_write_log(" Going to add relation with predicate $predicate");
-					wl_core_add_relation_instance( $post_id, $predicate, $referenced_entity_id );
+					wl_core_add_relation_instance($post_id, $predicate, $referenced_entity_id);
 				}
 			} else {
-				wl_write_log( "Entity uri $referenced_entity_uri missing in the mapping" );
-				wl_write_log( $entities_predicates_mapping );
+				wl_write_log("Entity uri $referenced_entity_uri missing in the mapping");
+				wl_write_log($entities_predicates_mapping);
 			}
 
 		} else {
 			// Just for unit tests
-			wl_core_add_relation_instance( $post_id, 'what', $referenced_entity_id );
+			wl_core_add_relation_instance($post_id, 'what', $referenced_entity_id);
 		}
 
 		// TODO Check if is needed
-		wl_linked_data_push_to_redlink( $referenced_entity_id );
+		wl_linked_data_push_to_redlink($referenced_entity_id);
 	}
 
 	// Push the post to Redlink.
-	wl_linked_data_push_to_redlink( $post->ID );
+	wl_linked_data_push_to_redlink($post->ID);
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Adds default schema type "Thing" as soon as an entity is created.
  */
-function wordlift_save_post_add_default_schema_type( $entity_id ) {
+function wordlift_save_post_add_default_schema_type($entity_id) {
 
-	$entity      = get_post( $entity_id );
-	$entity_type = wl_schema_get_types( $entity_id );
+	$entity      = get_post($entity_id);
+	$entity_type = wl_schema_get_types($entity_id);
 
 	// Assign type 'Thing' if we are dealing with an entity without type
-	if ( $entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null( $entity_type ) ) {
+	if ($entity->post_type == Wordlift_Entity_Service::TYPE_NAME && is_null($entity_type)) {
 
-		wl_schema_set_types( $entity_id, 'Thing' );
+		wl_schema_set_types($entity_id, 'Thing');
 	}
 }
 
 // Priority 1 (default is 10) because we want the default type to be set as soon as possible
 // Attatched to save_post because *wl_linked_data_save_post* does not always fire
-add_action( 'save_post', 'wordlift_save_post_add_default_schema_type', 1 );
+add_action('save_post', 'wordlift_save_post_add_default_schema_type', 1);
 
 /**
  * Save the specified entities to the local storage.
@@ -186,7 +186,7 @@ 
  *
  * @return array An array of posts.
  */
-function wl_save_entities( $entities, $related_post_id = null ) {
+function wl_save_entities($entities, $related_post_id = null) {
 
 	// wl_write_log( "[ entities count :: " . count( $entities ) . " ][ related post id :: $related_post_id ]" );
 
@@ -194,7 +194,7 @@ 
 	$posts = array();
 
 	// Save each entity and store the post id.
-	foreach ( $entities as $entity ) {
+	foreach ($entities as $entity) {
 
 		$uri   = $entity['uri'];
 		$label = $entity['label'];
@@ -203,21 +203,20 @@ 
 		$main_type_uri = $entity['main_type'];
 
 		// the preferred type.
-		$type_uris = ( isset( $entity['type'] ) ?
-			$entity['type'] :
-			array() );
+		$type_uris = (isset($entity['type']) ?
+			$entity['type'] : array());
 
 		$description = $entity['description'];
-		$images      = ( isset( $entity['image'] ) ?
-			( is_array( $entity['image'] )
+		$images      = (isset($entity['image']) ?
+			(is_array($entity['image'])
 				? $entity['image']
-				: array( $entity['image'] ) )
-			: array() );
-		$same_as     = ( isset( $entity['sameas'] ) ?
-			( is_array( $entity['sameas'] )
+				: array($entity['image']))
+			: array());
+		$same_as = (isset($entity['sameas']) ?
+			(is_array($entity['sameas'])
 				? $entity['sameas']
-				: array( $entity['sameas'] ) )
-			: array() );
+				: array($entity['sameas']))
+			: array());
 
 		// Bring properties inside an associative array
 		$entity_properties = array(
@@ -232,11 +231,11 @@ 
 		);
 
 		// Save the entity.
-		$entity_post = wl_save_entity( $entity_properties );
+		$entity_post = wl_save_entity($entity_properties);
 
 		// Store the post in the return array if successful.
-		if ( null !== $entity_post ) {
-			array_push( $posts, $entity_post );
+		if (null !== $entity_post) {
+			array_push($posts, $entity_post);
 		}
 	}
 
@@ -259,7 +258,7 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_properties ) {
+function wl_save_entity($entity_properties) {
 
 	$uri             = $entity_properties['uri'];
 	$label           = $entity_properties['label'];
@@ -271,7 +270,7 @@ 
 	$same_as         = $entity_properties['same_as'];
 
 	// Avoid errors due to null.
-	if ( is_null( $entity_types ) ) {
+	if (is_null($entity_types)) {
 		$entity_types = array();
 	}
 
@@ -279,7 +278,7 @@ 
 
 	// 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,
@@ -287,13 +286,13 @@ 
 	);
 
 	// Check whether an entity already exists with the provided URI.
-	$post = wl_get_entity_post_by_uri( $uri );
+	$post = wl_get_entity_post_by_uri($uri);
 
-	if ( null !== $post ) {
+	if (null !== $post) {
 		// We insert into the params the entity ID, so it will be updated and not inserted.
 		$params['ID'] = $post->ID;
 		// Preserve the current entity status
-		if ( 'public' == $post->post_status ) {
+		if ('public' == $post->post_status) {
 			$params['post_status'] = $post->post_status;
 		}
 		// Preserve the current entity content. Hotfix for issue #152
@@ -306,12 +305,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
@@ -325,73 +324,73 @@ 
 	$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);
 
 	// 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'];
@@ -409,24 +408,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);
 }
 
 /**
@@ -438,10 +437,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';
@@ -452,8 +451,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();
 	}
@@ -462,12 +461,12 @@ 
 
 	// Collect the entities.
 	$entities = array();
-	foreach ( $matches[1] as $uri ) {
-		$uri_d  = html_entity_decode( $uri );
-		$entity = wl_get_entity_post_by_uri( $uri_d );
+	foreach ($matches[1] as $uri) {
+		$uri_d  = html_entity_decode($uri);
+		$entity = wl_get_entity_post_by_uri($uri_d);
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
+		if (null !== $entity) {
+			array_push($entities, $entity->ID);
 		}
 	}
 
@@ -484,24 +483,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/includes/class-wordlift.php

Spacing +42 added lines, -42 removed lines

@@ -173,100 +173,100 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * The 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 Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The UI service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-ui-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-ui-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The Notice service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-notice-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-notice-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		/**
 		 * The ShareThis service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-sharethis-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-sharethis-service.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an instance of the UI service.
 		$this->ui_service = new Wordlift_UI_Service();
@@ -278,16 +278,16 @@ 
 		new Wordlift_Schema_Service();
 
 		// Create an instance of the Entity service, passing the UI service to draw parts of the Entity admin page.
-		$this->entity_service = new Wordlift_Entity_Service( $this->ui_service );
+		$this->entity_service = new Wordlift_Entity_Service($this->ui_service);
 
 		// Create an instance of the User service.
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create 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 an instance of the Timeline shortcode.
 		new Wordlift_Timeline_Shortcode();
@@ -313,9 +313,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');
 
 	}
 
@@ -328,34 +328,34 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Wordlift_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// 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 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( 'edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1 );
+		$this->loader->add_action('save_post', $this->entity_service, 'save_post', 9, 3);
+		$this->loader->add_action('edit_form_before_permalink', $this->entity_service, 'edit_form_before_permalink', 10, 1);
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 	}
 
@@ -368,17 +368,17 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 		// Hook the ShareThis service.
-		$this->loader->add_filter( 'the_content', $this->sharethis_service, 'the_content', 99 );
-		$this->loader->add_filter( 'the_excerpt', $this->sharethis_service, 'the_excerpt', 99 );
+		$this->loader->add_filter('the_content', $this->sharethis_service, 'the_content', 99);
+		$this->loader->add_filter('the_excerpt', $this->sharethis_service, 'the_excerpt', 99);
 	}
 
 	/**

Indentation +391 added lines, -391 removed lines

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