insideout10 / wordlift-plugin

src/modules/linked_data/wordlift_linked_data.php

Indentation +441 added lines, -441 removed lines

@@ -16,45 +16,45 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+    $log->trace( "Saving post $post_id to Linked Data..." );
 
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        $log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the post type and check whether it supports the editor.
-	//
-	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
-	/**
-	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
+    // Get the post type and check whether it supports the editor.
+    //
+    // @see https://github.com/insideout10/wordlift-plugin/issues/659.
+    $post_type = get_post_type( $post_id );
+    /**
+     * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     */
+    $is_editor_supported = wl_post_type_supports_editor( $post_type );
 
-	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+    // Bail out if it's not an entity.
+    if ( ! $is_editor_supported ) {
+        $log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
 
-		return;
-	}
+        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' );
@@ -63,111 +63,111 @@ 
 
 function wl_linked_data_rest_insert_post( $post, $request, $creating ){
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
 
-	$post_id = $post->ID;
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+    $post_id = $post->ID;
+    $log->trace( "Saving $post_id to Linked Data along with related entities..." );
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
-		return;
-	}
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        $log->trace( 'Doing autosave, skipping...' );
+        return;
+    }
 
-	// Get the entity service instance.
-	$entity_service = Wordlift_Entity_Service::get_instance();
+    // Get the entity service instance.
+    $entity_service = Wordlift_Entity_Service::get_instance();
 
-	// 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();
 
-	$metas = $request->get_json_params()['meta'];
+    $metas = $request->get_json_params()['meta'];
 
-	// Ignore if no change in meta
-	if ( empty($metas) ) {
-		$log->trace( 'No meta data, skipping...' );
-		return;
-	}
+    // Ignore if no change in meta
+    if ( empty($metas) ) {
+        $log->trace( 'No meta data, skipping...' );
+        return;
+    }
 
-	$entities_via_meta = json_decode($metas['wl_entities_gutenberg'], true);
+    $entities_via_meta = json_decode($metas['wl_entities_gutenberg'], true);
 
-	//file_put_contents( WP_PLUGIN_DIR . '/wordlift/debug.txt', serialize($entities_via_meta) );
+    //file_put_contents( WP_PLUGIN_DIR . '/wordlift/debug.txt', serialize($entities_via_meta) );
 
-	foreach ( $entities_via_meta as $entity_uri => $entity ) {
+    foreach ( $entities_via_meta 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 matches an internal existing entity, meaning:
-		// 1. when $entity_uri is an internal uri
-		// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-		$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+        // Look if current entity uri matches an internal existing entity, meaning:
+        // 1. when $entity_uri is an internal uri
+        // 2. when $entity_uri is an external uri used as sameAs of an internal entity
+        $ie = $entity_service->get_entity_post_by_uri( $entity_uri );
 
-		// Detect the uri depending if is an existing or a new entity
-		$uri = ( null === $ie ) ?
-			Wordlift_Uri_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_Uri_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;
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
 
-	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
-		// 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 if we found mappings of new entities.
+    if ( ! empty( $entities_uri_mapping ) ) {
+        // 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,
-			$entity_service->get_classification_scope_for( $referenced_entity_id ),
-			$referenced_entity_id
-		);
+        wl_core_add_relation_instance(
+            $post_id,
+            $entity_service->get_classification_scope_for( $referenced_entity_id ),
+            $referenced_entity_id
+        );
 
-	}
+    }
 
-	// Push the post to Redlink.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
+    // Push the post to Redlink.
+    Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
 }
 
 /**
@@ -179,156 +179,156 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+    $log->trace( "Saving $post_id to Linked Data along with related entities..." );
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        $log->trace( 'Doing autosave, skipping...' );
 
-		return;
-	}
+        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 ]" );
 
-	// Get the entity service instance.
-	$entity_service = Wordlift_Entity_Service::get_instance();
+    // Get the entity service instance.
+    $entity_service = Wordlift_Entity_Service::get_instance();
 
-	// 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 matches an internal existing entity, meaning:
-			// 1. when $entity_uri is an internal uri
-			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+            // Look if current entity uri matches an internal existing entity, meaning:
+            // 1. when $entity_uri is an internal uri
+            // 2. when $entity_uri is an external uri used as sameAs of an internal entity
+            $ie = $entity_service->get_entity_post_by_uri( $entity_uri );
 
-			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
-				Wordlift_Uri_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_Uri_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;
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
 
-	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
-		// 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 if we found mappings of new entities.
+    if ( ! empty( $entities_uri_mapping ) ) {
+        // 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,
-			$entity_service->get_classification_scope_for( $referenced_entity_id ),
-			$referenced_entity_id
-		);
+        wl_core_add_relation_instance(
+            $post_id,
+            $entity_service->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 = $entity_service->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.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    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 = $entity_service->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.
+    Wordlift_Linked_Data_Service::get_instance()->push( $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' );
@@ -351,208 +351,208 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/image.php' );
-	}
+    // Required for REST API calls
+    if ( ! function_exists( 'wp_crop_image' ) ) {
+        require_once( ABSPATH . 'wp-admin/includes/image.php' );
+    }
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
 
-	$uri = $entity_data['uri'];
-	/*
+    $uri = $entity_data['uri'];
+    /*
 	 * Data is coming from a $_POST, sanitize it.
 	 *
 	 * @since 3.19.4
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $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'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (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();
-
-	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
-
-	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
-
-		return $post;
-	}
-
-	// Prepare properties of the new entity.
-	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
-		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-		'post_title'   => $label,
-		'post_content' => $description,
-		'post_excerpt' => '',
-		// Ensure we're using a valid slug. We're not overwriting an existing
-		// entity with a post_name already set, since this call is made only for
-		// new entities.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
-	);
-
-	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
-	// the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
-	// Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
-	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
-	// is created when saving a post.
-	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		) );
-	}
-
-	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
-	// save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
-	// to the save_post and restore them after we saved the entity.
-	// see https://github.com/insideout10/wordlift-plugin/issues/203
-	// see https://github.com/insideout10/wordlift-plugin/issues/156
-	// see https://github.com/insideout10/wordlift-plugin/issues/148
-	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
-
-
-	$log->trace( 'Going to insert new post...' );
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Setting the alternative labels for this entity.
-	Wordlift_Entity_Service::get_instance()
-	                       ->set_alternative_labels( $post_id, $synonyms );
-
-	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
-
-	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		), 10, 2 );
-	}
-
-	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
-
-		// 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 );
-
-	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 = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
-
-		if ( false === $image ) {
-			continue;
-		}
+    $label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $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'] ) ? (array) $entity_data['image'] : array();
+    $same_as          = isset( $entity_data['sameas'] ) ? (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();
+
+    // Get the synonyms.
+    $synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+
+    // Check whether an entity already exists with the provided URI.
+    if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
+        $log->debug( "Post already exists for URI $uri." );
+
+        return $post;
+    }
+
+    // Prepare properties of the new entity.
+    $params = array(
+        'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+        'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+        'post_title'   => $label,
+        'post_content' => $description,
+        'post_excerpt' => '',
+        // Ensure we're using a valid slug. We're not overwriting an existing
+        // entity with a post_name already set, since this call is made only for
+        // new entities.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/282
+        'post_name'    => sanitize_title( $label ),
+    );
+
+    // If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
+    // the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
+    // Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
+    // This does NOT affect saving an entity from the entity admin page since this function is called when an entity
+    // is created when saving a post.
+    global $wpseo_metabox, $seo_ultimate;
+    if ( isset( $wpseo_metabox ) ) {
+        remove_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    if ( isset( $seo_ultimate ) ) {
+        remove_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ) );
+    }
+
+    // The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
+    // save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
+    // to the save_post and restore them after we saved the entity.
+    // see https://github.com/insideout10/wordlift-plugin/issues/203
+    // see https://github.com/insideout10/wordlift-plugin/issues/156
+    // see https://github.com/insideout10/wordlift-plugin/issues/148
+    global $wp_filter;
+    $save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+
+
+    $log->trace( 'Going to insert new post...' );
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Setting the alternative labels for this entity.
+    Wordlift_Entity_Service::get_instance()
+                            ->set_alternative_labels( $post_id, $synonyms );
+
+    // Restore all the existing filters.
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+
+    // If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
+    if ( isset( $wpseo_metabox ) ) {
+        add_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    // If SEO Ultimate is installed, add back the hook we removed a few lines above.
+    if ( isset( $seo_ultimate ) ) {
+        add_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ), 10, 2 );
+    }
+
+    // TODO: handle errors.
+    if ( is_wp_error( $post_id ) ) {
+        $log->error( 'An error occurred: ' . $post_id->get_error_message() );
+
+        // 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 );
+
+    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 = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+
+        if ( false === $image ) {
+            continue;
+        }
 
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
 
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
-
-		// 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 );
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
+
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
 
-		$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.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post_id );
+    // The entity is pushed to Redlink on save by the function hooked to save_post.
+    // save the entity in the triple store.
+    Wordlift_Linked_Data_Service::get_instance()->push( $post_id );
 
-	// finally return the entity post.
-	return get_post( $post_id );
+    // finally return the entity post.
+    return get_post( $post_id );
 }
 
 /**
@@ -566,40 +566,40 @@ 
  */
 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;
 }

Spacing +157 added lines, -157 removed lines

@@ -14,15 +14,15 @@ 
  *
  * @param int $post_id The post id.
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post');
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+	$log->trace("Saving post $post_id to Linked Data...");
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
+		$log->debug("Skipping $post_id, because id is not numeric or is a post revision.");
 
 		return;
 	}
@@ -30,7 +30,7 @@ 
 	// Get the post type and check whether it supports the editor.
 	//
 	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
+	$post_type = get_post_type($post_id);
 	/**
 	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
 	 *
@@ -38,39 +38,39 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
 	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
+	$is_editor_supported = wl_post_type_supports_editor($post_type);
 
 	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+	if ( ! $is_editor_supported) {
+		$log->debug("Skipping $post_id, because $post_type doesn't support the editor (content).");
 
 		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');
 
-add_action( 'rest_insert_post', 'wl_linked_data_rest_insert_post', 10, 3 );
+add_action('rest_insert_post', 'wl_linked_data_rest_insert_post', 10, 3);
 
-function wl_linked_data_rest_insert_post( $post, $request, $creating ){
+function wl_linked_data_rest_insert_post($post, $request, $creating) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
 	$post_id = $post->ID;
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 		return;
 	}
 
@@ -83,8 +83,8 @@ 
 	$metas = $request->get_json_params()['meta'];
 
 	// Ignore if no change in meta
-	if ( empty($metas) ) {
-		$log->trace( 'No meta data, skipping...' );
+	if (empty($metas)) {
+		$log->trace('No meta data, skipping...');
 		return;
 	}
 
@@ -92,32 +92,32 @@ 
 
 	//file_put_contents( WP_PLUGIN_DIR . '/wordlift/debug.txt', serialize($entities_via_meta) );
 
-	foreach ( $entities_via_meta as $entity_uri => $entity ) {
+	foreach ($entities_via_meta as $entity_uri => $entity) {
 
 		// Only if the current entity is created from scratch let's avoid to
 		// create more than one entity with same label & entity type.
-		$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+		$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
 			$entity['main_type'] : null;
 
 		// Look if current entity uri matches an internal existing entity, meaning:
 		// 1. when $entity_uri is an internal uri
 		// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-		$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+		$ie = $entity_service->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_Uri_Service::get_instance()->build_uri(
 				$entity['label'],
 				Wordlift_Entity_Service::TYPE_NAME,
 				$entity_type
-			) : wl_get_entity_uri( $ie->ID );
+			) : wl_get_entity_uri($ie->ID);
 
-		wl_write_log( "Map $entity_uri on $uri" );
-		$entities_uri_mapping[ $entity_uri ] = $uri;
+		wl_write_log("Map $entity_uri on $uri");
+		$entities_uri_mapping[$entity_uri] = $uri;
 
 		// Local entities have a tmp uri with 'local-entity-' prefix
 		// These uris need to be rewritten here and replaced in the content
-		if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+		if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 			// Override the entity obj
 			$entity['uri'] = $uri;
 		}
@@ -126,8 +126,8 @@ 
 		$entity['related_post_id'] = $post_id;
 
 		// Save the entity if is a new entity
-		if ( null === $ie ) {
-			wl_save_entity( $entity );
+		if (null === $ie) {
+			wl_save_entity($entity);
 		}
 
 	}
@@ -136,38 +136,38 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// 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,
-			$entity_service->get_classification_scope_for( $referenced_entity_id ),
+			$entity_service->get_classification_scope_for($referenced_entity_id),
 			$referenced_entity_id
 		);
 
 	}
 
 	// Push the post to Redlink.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
+	Wordlift_Linked_Data_Service::get_instance()->push($post->ID);
 }
 
 /**
@@ -177,23 +177,23 @@ 
  *
  * @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) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 
 		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 ]" );
 
@@ -204,44 +204,44 @@ 
 	$entities_uri_mapping = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 		$boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
 			// Only if the current entity is created from scratch let's avoid to
 			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+			$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
 				$entity['main_type'] : null;
 
 			// Look if current entity uri matches an internal existing entity, meaning:
 			// 1. when $entity_uri is an internal uri
 			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+			$ie = $entity_service->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_Uri_Service::get_instance()->build_uri(
 					$entity['label'],
 					Wordlift_Entity_Service::TYPE_NAME,
 					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+				) : wl_get_entity_uri($ie->ID);
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 			// Local entities have a tmp uri with 'local-entity-' prefix
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Override the entity obj
 				$entity['uri'] = $uri;
 			}
@@ -250,8 +250,8 @@ 
 			$entity['related_post_id'] = $post_id;
 
 			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
+			if (null === $ie) {
+				wl_save_entity($entity);
 			}
 
 		}
@@ -262,39 +262,39 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// 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,
-			$entity_service->get_classification_scope_for( $referenced_entity_id ),
+			$entity_service->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(
@@ -303,35 +303,35 @@ 
 		);
 
 		// 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 = $entity_service->get_entity_post_by_uri( $uri );
+			$entity = $entity_service->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.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
+	Wordlift_Linked_Data_Service::get_instance()->push($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');
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -349,14 +349,14 @@ 
  *
  * @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) {
 
 	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+	if ( ! function_exists('wp_crop_image')) {
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 	}
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+	$log = Wordlift_Log_Service::get_logger('wl_save_entity');
 
 	$uri = $entity_data['uri'];
 	/*
@@ -366,28 +366,28 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+	$label            = preg_replace('/\xEF\xBB\xBF/', '', sanitize_text_field($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'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (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']) ? (array) $entity_data['image'] : array();
+	$same_as          = isset($entity_data['sameas']) ? (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();
 
 	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+	$synonyms = isset($entity_data['synonym']) ? $entity_data['synonym'] : array();
 
 	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
+	if (null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri)) {
+		$log->debug("Post already exists for URI $uri.");
 
 		return $post;
 	}
 
 	// Prepare properties of the new entity.
 	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+		'post_status'  => (is_numeric($related_post_id) ? get_post_status($related_post_id) : 'draft'),
 		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
 		'post_title'   => $label,
 		'post_content' => $description,
@@ -397,7 +397,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -406,18 +406,18 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		remove_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		remove_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		) );
+		));
 	}
 
 	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
@@ -427,95 +427,95 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
 
 
-	$log->trace( 'Going to insert new post...' );
+	$log->trace('Going to insert new post...');
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Setting the alternative labels for this entity.
 	Wordlift_Entity_Service::get_instance()
-	                       ->set_alternative_labels( $post_id, $synonyms );
+	                       ->set_alternative_labels($post_id, $synonyms);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		add_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		add_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		), 10, 2 );
+		), 10, 2);
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
+	if (is_wp_error($post_id)) {
+		$log->error('An error occurred: '.$post_id->get_error_message());
 
 		// 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);
 
-	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 = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+		$image = Wordlift_Remote_Image_Service::save_from_url($image_remote_url);
 
-		if ( false === $image ) {
+		if (false === $image) {
 			continue;
 		}
 
@@ -535,24 +535,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.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post_id );
+	Wordlift_Linked_Data_Service::get_instance()->push($post_id);
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }
 
 /**
@@ -564,10 +564,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';
@@ -578,8 +578,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();
 	}
@@ -588,13 +588,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);
 		}
 	}
 

src/admin/wordlift_admin_meta_box_entities.php

Indentation +119 added lines, -119 removed lines

@@ -10,15 +10,15 @@ 
  */
 function wl_register_metaboxes() {
 
-	// Load metabox classes.
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+    // Load metabox classes.
+    require_once( 'WL_Metabox/class-wl-metabox.php' );
 
-	$wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing.
+    $wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing.
 }
 
 if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+    add_action( 'load-post.php', 'wl_register_metaboxes' );
+    add_action( 'load-post-new.php', 'wl_register_metaboxes' );
 }
 
 
@@ -29,20 +29,20 @@ 
  */
 function wl_admin_add_entities_meta_box( $post_type ) {
 
-	// Bail out if the post type doesn't support a TinyMCE editor.
-	if ( ! wl_post_type_supports_editor( $post_type ) ) {
-		return;
-	}
-
-	if (!Wordlift_Admin::is_gutenberg()) {
-		// Add main meta box for related entities and 4W only if not Gutenberg
-		add_meta_box(
-			'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
-		);
-	} else {
-		// Call wl_entities_box_content for the other things that it does.
-		wl_entities_box_content(get_post(), false);
-	}
+    // Bail out if the post type doesn't support a TinyMCE editor.
+    if ( ! wl_post_type_supports_editor( $post_type ) ) {
+        return;
+    }
+
+    if (!Wordlift_Admin::is_gutenberg()) {
+        // Add main meta box for related entities and 4W only if not Gutenberg
+        add_meta_box(
+            'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+        );
+    } else {
+        // Call wl_entities_box_content for the other things that it does.
+        wl_entities_box_content(get_post(), false);
+    }
 }
 
 add_action( 'add_meta_boxes', 'wl_admin_add_entities_meta_box' );
@@ -58,18 +58,18 @@ 
  */
 function wl_post_type_supports_editor( $post_type ) {
 
-	$default = post_type_supports( $post_type, 'editor' );
-
-	/**
-	 * Allow 3rd parties to force the classification to load.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 *
-	 * @param bool $default The preset value as gathered by the `post_type_supports` call.
-	 */
-	return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
+    $default = post_type_supports( $post_type, 'editor' );
+
+    /**
+     * Allow 3rd parties to force the classification to load.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     *
+     * @param bool $default The preset value as gathered by the `post_type_supports` call.
+     */
+    return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
 }
 
 /**
@@ -79,100 +79,100 @@ 
  */
 function wl_entities_box_content( $post, $wrapper = true ) {
 
-	// Angularjs edit-post widget wrapper.
-	if($wrapper) echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+    // Angularjs edit-post widget wrapper.
+    if($wrapper) echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
 
-	// Angularjs edit-post widget classification boxes configuration.
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+    // Angularjs edit-post widget classification boxes configuration.
+    $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
 
-	// Array to store all related entities ids.
-	$all_referenced_entities_ids = array();
+    // Array to store all related entities ids.
+    $all_referenced_entities_ids = array();
 
-	// Add selected entities to classification_boxes.
-	foreach ( $classification_boxes as $i => $box ) {
-		// Build the proper relation name.
-		$relation_name = $box['id'];
+    // Add selected entities to classification_boxes.
+    foreach ( $classification_boxes as $i => $box ) {
+        // Build the proper relation name.
+        $relation_name = $box['id'];
 
-		// Get the entity referenced from the post content.
-		/*
+        // Get the entity referenced from the post content.
+        /*
 		 * Allow 3rd parties to provide another post content.
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
-
-		// Enhance current box selected entities.
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
-
-		// Maps the URIs to entity posts.
-		$entity_service = Wordlift_Entity_Service::get_instance();
-
-		// Replace all entity URI's with post ID's if found or null if there is no related post.
-		$entity_ids = array_map( function ( $item ) use ( $entity_service ) {
-			// Return entity post by the entity URI or null.
-			$post = $entity_service->get_entity_post_by_uri( $item );
-
-			// Check that the post object is not null.
-			if ( ! empty( $post ) ) {
-				return $post->ID;
-			}
-		}, $entity_uris );
-		// Store the entity ids for all the 4W.
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
-
-	}
-	// Json encoding for classification boxes structure.
-	$classification_boxes = wp_json_encode( $classification_boxes );
-
-	// Ensure there are no repetitions of the referenced entities.
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
-
-	// Remove all null, false and empty strings.
-	// NULL is being returned in some cases, when there is not related post, so we need to remove it.
-	$all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
-
-	// Build the entity storage object.
-	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity = wl_serialize_entity( $referenced_entity );
-		// Set a default confidence of `PHP_INT_MAX` for already annotated entities.
-		$referenced_entities_obj[ $entity['id'] ] = $entity
-		                                            + array( 'confidence' => PHP_INT_MAX );
-	}
-
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : wp_json_encode( $referenced_entities_obj );
-
-	$published_place_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
-	);
-	$published_place_obj = ( $published_place_id ) ?
-		wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
-		'undefined';
-
-	$topic_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
-	);
-	$topic_obj = ( $topic_id ) ?
-		wp_json_encode( wl_serialize_entity( $topic_id ) ) :
-		'undefined';
-
-	$configuration_service = Wordlift_Configuration_Service::get_instance();
-
-	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
-	$default_path           = WL_DEFAULT_PATH;
-	$dataset_uri            = $configuration_service->get_dataset_uri();
-	$current_post_uri       = wl_get_entity_uri( $post->ID );
-
-	// Retrieve the current post author.
-	$post_author = get_userdata( $post->post_author )->display_name;
-	// Retrive the published date.
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
-	// Current language.
-	$current_language = $configuration_service->get_language_code();
-
-	$js_code =  <<<JS
+        $post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
+        $entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
+
+        // Enhance current box selected entities.
+        $classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
+
+        // Maps the URIs to entity posts.
+        $entity_service = Wordlift_Entity_Service::get_instance();
+
+        // Replace all entity URI's with post ID's if found or null if there is no related post.
+        $entity_ids = array_map( function ( $item ) use ( $entity_service ) {
+            // Return entity post by the entity URI or null.
+            $post = $entity_service->get_entity_post_by_uri( $item );
+
+            // Check that the post object is not null.
+            if ( ! empty( $post ) ) {
+                return $post->ID;
+            }
+        }, $entity_uris );
+        // Store the entity ids for all the 4W.
+        $all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+
+    }
+    // Json encoding for classification boxes structure.
+    $classification_boxes = wp_json_encode( $classification_boxes );
+
+    // Ensure there are no repetitions of the referenced entities.
+    $all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+
+    // Remove all null, false and empty strings.
+    // NULL is being returned in some cases, when there is not related post, so we need to remove it.
+    $all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
+
+    // Build the entity storage object.
+    $referenced_entities_obj = array();
+    foreach ( $all_referenced_entities_ids as $referenced_entity ) {
+        $entity = wl_serialize_entity( $referenced_entity );
+        // Set a default confidence of `PHP_INT_MAX` for already annotated entities.
+        $referenced_entities_obj[ $entity['id'] ] = $entity
+                                                    + array( 'confidence' => PHP_INT_MAX );
+    }
+
+    $referenced_entities_obj = empty( $referenced_entities_obj ) ?
+        '{}' : wp_json_encode( $referenced_entities_obj );
+
+    $published_place_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
+    );
+    $published_place_obj = ( $published_place_id ) ?
+        wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
+        'undefined';
+
+    $topic_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
+    );
+    $topic_obj = ( $topic_id ) ?
+        wp_json_encode( wl_serialize_entity( $topic_id ) ) :
+        'undefined';
+
+    $configuration_service = Wordlift_Configuration_Service::get_instance();
+
+    $default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
+    $default_path           = WL_DEFAULT_PATH;
+    $dataset_uri            = $configuration_service->get_dataset_uri();
+    $current_post_uri       = wl_get_entity_uri( $post->ID );
+
+    // Retrieve the current post author.
+    $post_author = get_userdata( $post->post_author )->display_name;
+    // Retrive the published date.
+    $published_date = get_the_time( 'Y-m-d', $post->ID );
+    // Current language.
+    $current_language = $configuration_service->get_language_code();
+
+    $js_code =  <<<JS
 		if ('undefined' == typeof window.wordlift) {
 			window.wordlift = {};
 			window.wordlift.entities = {};  		
@@ -193,7 +193,7 @@ 
 		window.wordlift.currentLanguage = '$current_language';
 JS;
 
-	if($wrapper) echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
-	wp_add_inline_script('wl-entity-metabox-utility', $js_code);
+    if($wrapper) echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
+    wp_add_inline_script('wl-entity-metabox-utility', $js_code);
 }
 

Spacing +43 added lines, -45 removed lines

@@ -11,14 +11,14 @@ 
 function wl_register_metaboxes() {
 
 	// Load metabox classes.
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+	require_once('WL_Metabox/class-wl-metabox.php');
 
-	$wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing.
+	$wl_metabox = new WL_Metabox(); // Everything is done inside here with the correct timing.
 }
 
-if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+if (is_admin()) {
+	add_action('load-post.php', 'wl_register_metaboxes');
+	add_action('load-post-new.php', 'wl_register_metaboxes');
 }
 
 
@@ -27,17 +27,17 @@ 
  *
  * @param string $post_type The type of the current open post.
  */
-function wl_admin_add_entities_meta_box( $post_type ) {
+function wl_admin_add_entities_meta_box($post_type) {
 
 	// Bail out if the post type doesn't support a TinyMCE editor.
-	if ( ! wl_post_type_supports_editor( $post_type ) ) {
+	if ( ! wl_post_type_supports_editor($post_type)) {
 		return;
 	}
 
-	if (!Wordlift_Admin::is_gutenberg()) {
+	if ( ! Wordlift_Admin::is_gutenberg()) {
 		// Add main meta box for related entities and 4W only if not Gutenberg
 		add_meta_box(
-			'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+			'wordlift_entities_box', __('WordLift', 'wordlift'), 'wl_entities_box_content', $post_type, 'side', 'high'
 		);
 	} else {
 		// Call wl_entities_box_content for the other things that it does.
@@ -45,7 +45,7 @@ 
 	}
 }
 
-add_action( 'add_meta_boxes', 'wl_admin_add_entities_meta_box' );
+add_action('add_meta_boxes', 'wl_admin_add_entities_meta_box');
 
 /**
  * Whether the post type supports the editor UI.
@@ -56,9 +56,9 @@ 
  *
  * @return bool True if the editor UI is supported otherwise false.
  */
-function wl_post_type_supports_editor( $post_type ) {
+function wl_post_type_supports_editor($post_type) {
 
-	$default = post_type_supports( $post_type, 'editor' );
+	$default = post_type_supports($post_type, 'editor');
 
 	/**
 	 * Allow 3rd parties to force the classification to load.
@@ -69,7 +69,7 @@ 
 	 *
 	 * @param bool $default The preset value as gathered by the `post_type_supports` call.
 	 */
-	return apply_filters( 'wl_post_type_supports_editor', $default, $post_type );
+	return apply_filters('wl_post_type_supports_editor', $default, $post_type);
 }
 
 /**
@@ -77,19 +77,19 @@ 
  *
  * @param WP_Post $post The current post.
  */
-function wl_entities_box_content( $post, $wrapper = true ) {
+function wl_entities_box_content($post, $wrapper = true) {
 
 	// Angularjs edit-post widget wrapper.
-	if($wrapper) echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+	if ($wrapper) echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
 
 	// Angularjs edit-post widget classification boxes configuration.
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+	$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
 
 	// Array to store all related entities ids.
 	$all_referenced_entities_ids = array();
 
 	// Add selected entities to classification_boxes.
-	foreach ( $classification_boxes as $i => $box ) {
+	foreach ($classification_boxes as $i => $box) {
 		// Build the proper relation name.
 		$relation_name = $box['id'];
 
@@ -99,80 +99,78 @@ 
 		 *
 		 * @since 3.20.0
 		 */
-		$post_content = apply_filters( 'wl_post_content', $post->post_content, $post );
-		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris( $post_content );
+		$post_content = apply_filters('wl_post_content', $post->post_content, $post);
+		$entity_uris  = Wordlift_Content_Filter_Service::get_instance()->get_entity_uris($post_content);
 
 		// Enhance current box selected entities.
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_uris;
+		$classification_boxes[$i]['selectedEntities'] = $entity_uris;
 
 		// Maps the URIs to entity posts.
 		$entity_service = Wordlift_Entity_Service::get_instance();
 
 		// Replace all entity URI's with post ID's if found or null if there is no related post.
-		$entity_ids = array_map( function ( $item ) use ( $entity_service ) {
+		$entity_ids = array_map(function($item) use ($entity_service) {
 			// Return entity post by the entity URI or null.
-			$post = $entity_service->get_entity_post_by_uri( $item );
+			$post = $entity_service->get_entity_post_by_uri($item);
 
 			// Check that the post object is not null.
-			if ( ! empty( $post ) ) {
+			if ( ! empty($post)) {
 				return $post->ID;
 			}
-		}, $entity_uris );
+		}, $entity_uris);
 		// Store the entity ids for all the 4W.
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+		$all_referenced_entities_ids = array_merge($all_referenced_entities_ids, $entity_ids);
 
 	}
 	// Json encoding for classification boxes structure.
-	$classification_boxes = wp_json_encode( $classification_boxes );
+	$classification_boxes = wp_json_encode($classification_boxes);
 
 	// Ensure there are no repetitions of the referenced entities.
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_unique($all_referenced_entities_ids);
 
 	// Remove all null, false and empty strings.
 	// NULL is being returned in some cases, when there is not related post, so we need to remove it.
-	$all_referenced_entities_ids = array_filter( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_filter($all_referenced_entities_ids);
 
 	// Build the entity storage object.
 	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity = wl_serialize_entity( $referenced_entity );
+	foreach ($all_referenced_entities_ids as $referenced_entity) {
+		$entity = wl_serialize_entity($referenced_entity);
 		// Set a default confidence of `PHP_INT_MAX` for already annotated entities.
-		$referenced_entities_obj[ $entity['id'] ] = $entity
-		                                            + array( 'confidence' => PHP_INT_MAX );
+		$referenced_entities_obj[$entity['id']] = $entity
+		                                            + array('confidence' => PHP_INT_MAX);
 	}
 
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : wp_json_encode( $referenced_entities_obj );
+	$referenced_entities_obj = empty($referenced_entities_obj) ?
+		'{}' : wp_json_encode($referenced_entities_obj);
 
 	$published_place_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
 	);
-	$published_place_obj = ( $published_place_id ) ?
-		wp_json_encode( wl_serialize_entity( $published_place_id ) ) :
-		'undefined';
+	$published_place_obj = ($published_place_id) ?
+		wp_json_encode(wl_serialize_entity($published_place_id)) : 'undefined';
 
 	$topic_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
 	);
-	$topic_obj = ( $topic_id ) ?
-		wp_json_encode( wl_serialize_entity( $topic_id ) ) :
-		'undefined';
+	$topic_obj = ($topic_id) ?
+		wp_json_encode(wl_serialize_entity($topic_id)) : 'undefined';
 
 	$configuration_service = Wordlift_Configuration_Service::get_instance();
 
 	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
 	$default_path           = WL_DEFAULT_PATH;
 	$dataset_uri            = $configuration_service->get_dataset_uri();
-	$current_post_uri       = wl_get_entity_uri( $post->ID );
+	$current_post_uri       = wl_get_entity_uri($post->ID);
 
 	// Retrieve the current post author.
-	$post_author = get_userdata( $post->post_author )->display_name;
+	$post_author = get_userdata($post->post_author)->display_name;
 	// Retrive the published date.
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
+	$published_date = get_the_time('Y-m-d', $post->ID);
 	// Current language.
 	$current_language = $configuration_service->get_language_code();
 
-	$js_code =  <<<JS
+	$js_code = <<<JS
 		if ('undefined' == typeof window.wordlift) {
 			window.wordlift = {};
 			window.wordlift.entities = {};  		
@@ -193,7 +191,7 @@ 
 		window.wordlift.currentLanguage = '$current_language';
 JS;
 
-	if($wrapper) echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
+	if ($wrapper) echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
 	wp_add_inline_script('wl-entity-metabox-utility', $js_code);
 }
 

Braces +6 added lines, -2 removed lines

@@ -80,7 +80,9 @@ 
 function wl_entities_box_content( $post, $wrapper = true ) {
 
 	// Angularjs edit-post widget wrapper.
-	if($wrapper) echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+	if($wrapper) {
+	    echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+	}
 
 	// Angularjs edit-post widget classification boxes configuration.
 	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
@@ -193,7 +195,9 @@ 
 		window.wordlift.currentLanguage = '$current_language';
 JS;
 
-	if($wrapper) echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
+	if($wrapper) {
+	    echo '<script type="text/javascript">'.PHP_EOL.$js_code.PHP_EOL.'</script>';
+	}
 	wp_add_inline_script('wl-entity-metabox-utility', $js_code);
 }
 

src/includes/class-wordlift-remote-image-service.php

Indentation +133 added lines, -133 removed lines

@@ -8,138 +8,138 @@
  */
 class Wordlift_Remote_Image_Service {
 
-	/**
-	 * Save the image with the specified URL locally.
-	 *
-	 * @param string $url The image remote URL.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
-	 * url, *content_type*: the image content type) or false on error.
-	 */
-	public static function save_from_url( $url ) {
-
-		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
-		}
-		// Load `WP_Filesystem`.
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Parse the url.
-		$parts = wp_parse_url( $url );
-
-		// Get the bare filename (filename w/o the extension).
-		$basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
-
-		// Get the base dir.
-		$wp_upload_dir = wp_upload_dir();
-
-		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
-
-		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
-
-		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
-
-			return false;
-		};
-
-		$response = self::get_response( $url );
-
-		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
-
-			return false;
-		}
-
-		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
-
-		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
-
-		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
-			return false;
-		}
-
-		// Complete the local filename.
-		$image_full_path .= $extension;
-		$image_full_url  .= $extension;
-
-		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
-
-		// Return the path.
-		return array(
-			'path'         => $image_full_path,
-			'url'          => $image_full_url,
-			'content_type' => $content_type,
-		);
-	}
-
-	/**
-	 * Returns the file extension using the content type.
-	 *
-	 * @param string $content_type File content type.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return string|bool The file extension on success and
-	 * false on fail or if the content type is not supported.
-	 */
-	private static function get_extension_from_content_type( $content_type ) {
-
-		// Return the extension if match.
-		switch ( $content_type ) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				return '.jpg';
-			case 'image/gif':
-				return '.gif';
-			case 'image/png':
-				return '.png';
-		}
-
-		// Otherwise return false.
-		return false;
-	}
-
-	/**
-	 * Retrieve the response from url and sets the response.
-	 *
-	 * @param string $url The url to retrieve.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @return false|array True on success and false on failure.
-	 */
-	private static function get_response( $url ) {
-		// Request the remote file.
-		$response = wp_remote_get( $url );
-
-		// Bail out if the response is not ok.
-		if (
-			is_wp_error( $response )
-			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
-		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
-
-			return false;
-		}
-
-		// Set the response.
-		return $response;
-	}
+    /**
+     * Save the image with the specified URL locally.
+     *
+     * @param string $url The image remote URL.
+     *
+     * @since 3.18.0
+     *
+     * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
+     * url, *content_type*: the image content type) or false on error.
+     */
+    public static function save_from_url( $url ) {
+
+        // Required for REST API calls
+        if ( ! function_exists( 'WP_Filesystem' ) ) {
+            require_once( ABSPATH . 'wp-admin/includes/file.php' );
+        }
+        // Load `WP_Filesystem`.
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Parse the url.
+        $parts = wp_parse_url( $url );
+
+        // Get the bare filename (filename w/o the extension).
+        $basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
+
+        // Get the base dir.
+        $wp_upload_dir = wp_upload_dir();
+
+        // Set the upload directory and URL.
+        $upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
+        $upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+
+        // Get the full path to the local filename.
+        $image_full_path = $upload_dir . '/' . $basename;
+        $image_full_url  = $upload_url . '/' . $basename;
+
+        // Create custom directory and bail on failure.
+        if ( ! wp_mkdir_p( $upload_dir ) ) {
+            wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+
+            return false;
+        };
+
+        $response = self::get_response( $url );
+
+        // Bail if the response is not set.
+        if ( false === $response ) {
+            wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+
+            return false;
+        }
+
+        // Get the content type of response.
+        $content_type = wp_remote_retrieve_header( $response, 'content-type' );
+
+        // Get the file extension.
+        $extension = self::get_extension_from_content_type( $content_type );
+
+        // Bail if the content type is not supported.
+        if ( empty( $extension ) ) {
+            return false;
+        }
+
+        // Complete the local filename.
+        $image_full_path .= $extension;
+        $image_full_url  .= $extension;
+
+        // Store the data locally.
+        $wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+
+        // Return the path.
+        return array(
+            'path'         => $image_full_path,
+            'url'          => $image_full_url,
+            'content_type' => $content_type,
+        );
+    }
+
+    /**
+     * Returns the file extension using the content type.
+     *
+     * @param string $content_type File content type.
+     *
+     * @since 3.18.0
+     *
+     * @return string|bool The file extension on success and
+     * false on fail or if the content type is not supported.
+     */
+    private static function get_extension_from_content_type( $content_type ) {
+
+        // Return the extension if match.
+        switch ( $content_type ) {
+            case 'image/jpeg':
+            case 'image/jpg':
+                return '.jpg';
+            case 'image/gif':
+                return '.gif';
+            case 'image/png':
+                return '.png';
+        }
+
+        // Otherwise return false.
+        return false;
+    }
+
+    /**
+     * Retrieve the response from url and sets the response.
+     *
+     * @param string $url The url to retrieve.
+     *
+     * @since 3.18.0
+     *
+     * @return false|array True on success and false on failure.
+     */
+    private static function get_response( $url ) {
+        // Request the remote file.
+        $response = wp_remote_get( $url );
+
+        // Bail out if the response is not ok.
+        if (
+            is_wp_error( $response )
+            || 200 !== (int) $response['response']['code']
+            || ! isset( $response['body'] )
+        ) {
+            wl_write_log( "save_image_from_url : error fetching image $url \n" );
+
+            return false;
+        }
+
+        // Set the response.
+        return $response;
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -18,57 +18,57 @@ 
 	 * @return array|false An array with information about the saved image (*path*: the local path to the image, *url*: the local
 	 * url, *content_type*: the image content type) or false on error.
 	 */
-	public static function save_from_url( $url ) {
+	public static function save_from_url($url) {
 
 		// Required for REST API calls
-		if ( ! function_exists( 'WP_Filesystem' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		if ( ! function_exists('WP_Filesystem')) {
+			require_once(ABSPATH.'wp-admin/includes/file.php');
 		}
 		// Load `WP_Filesystem`.
 		WP_Filesystem();
 		global $wp_filesystem;
 
 		// Parse the url.
-		$parts = wp_parse_url( $url );
+		$parts = wp_parse_url($url);
 
 		// Get the bare filename (filename w/o the extension).
-		$basename = pathinfo( $parts['path'], PATHINFO_FILENAME );
+		$basename = pathinfo($parts['path'], PATHINFO_FILENAME);
 
 		// Get the base dir.
 		$wp_upload_dir = wp_upload_dir();
 
 		// Set the upload directory and URL.
-		$upload_dir = $wp_upload_dir['basedir'] . '/wl' . $wp_upload_dir['subdir'];
-		$upload_url = $wp_upload_dir['baseurl'] . '/wl' . $wp_upload_dir['subdir'];
+		$upload_dir = $wp_upload_dir['basedir'].'/wl'.$wp_upload_dir['subdir'];
+		$upload_url = $wp_upload_dir['baseurl'].'/wl'.$wp_upload_dir['subdir'];
 
 		// Get the full path to the local filename.
-		$image_full_path = $upload_dir . '/' . $basename;
-		$image_full_url  = $upload_url . '/' . $basename;
+		$image_full_path = $upload_dir.'/'.$basename;
+		$image_full_url  = $upload_url.'/'.$basename;
 
 		// Create custom directory and bail on failure.
-		if ( ! wp_mkdir_p( $upload_dir ) ) {
-			wl_write_log( "save_image_from_url : failed creating upload dir $upload_dir \n" );
+		if ( ! wp_mkdir_p($upload_dir)) {
+			wl_write_log("save_image_from_url : failed creating upload dir $upload_dir \n");
 
 			return false;
 		};
 
-		$response = self::get_response( $url );
+		$response = self::get_response($url);
 
 		// Bail if the response is not set.
-		if ( false === $response ) {
-			wl_write_log( "save_image_from_url : failed to fetch the response from: $url \n" );
+		if (false === $response) {
+			wl_write_log("save_image_from_url : failed to fetch the response from: $url \n");
 
 			return false;
 		}
 
 		// Get the content type of response.
-		$content_type = wp_remote_retrieve_header( $response, 'content-type' );
+		$content_type = wp_remote_retrieve_header($response, 'content-type');
 
 		// Get the file extension.
-		$extension = self::get_extension_from_content_type( $content_type );
+		$extension = self::get_extension_from_content_type($content_type);
 
 		// Bail if the content type is not supported.
-		if ( empty( $extension ) ) {
+		if (empty($extension)) {
 			return false;
 		}
 
@@ -77,7 +77,7 @@ 
 		$image_full_url  .= $extension;
 
 		// Store the data locally.
-		$wp_filesystem->put_contents( $image_full_path, wp_remote_retrieve_body( $response ) );
+		$wp_filesystem->put_contents($image_full_path, wp_remote_retrieve_body($response));
 
 		// Return the path.
 		return array(
@@ -97,10 +97,10 @@ 
 	 * @return string|bool The file extension on success and
 	 * false on fail or if the content type is not supported.
 	 */
-	private static function get_extension_from_content_type( $content_type ) {
+	private static function get_extension_from_content_type($content_type) {
 
 		// Return the extension if match.
-		switch ( $content_type ) {
+		switch ($content_type) {
 			case 'image/jpeg':
 			case 'image/jpg':
 				return '.jpg';
@@ -123,17 +123,17 @@ 
 	 *
 	 * @return false|array True on success and false on failure.
 	 */
-	private static function get_response( $url ) {
+	private static function get_response($url) {
 		// Request the remote file.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Bail out if the response is not ok.
 		if (
-			is_wp_error( $response )
+			is_wp_error($response)
 			|| 200 !== (int) $response['response']['code']
-			|| ! isset( $response['body'] )
+			|| ! isset($response['body'])
 		) {
-			wl_write_log( "save_image_from_url : error fetching image $url \n" );
+			wl_write_log("save_image_from_url : error fetching image $url \n");
 
 			return false;
 		}

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

Indentation +64 added lines, -64 removed lines

@@ -14,83 +14,83 @@
  */
 class Wordlift_Entity_Type_Taxonomy_Service {
 
-	/**
-	 * The WordPress taxonomy name.
-	 *
-	 * @since 1.0.0
-	 */
-	const TAXONOMY_NAME = 'wl_entity_type';
+    /**
+     * The WordPress taxonomy name.
+     *
+     * @since 1.0.0
+     */
+    const TAXONOMY_NAME = 'wl_entity_type';
 
-	/**
-	 * Register the taxonomies.
-	 *
-	 * @since 3.18.0
-	 */
-	public function init() {
+    /**
+     * Register the taxonomies.
+     *
+     * @since 3.18.0
+     */
+    public function init() {
 
-		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
-		);
+        $labels = array(
+            'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
+            'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
+            'search_items'      => __( 'Search Entity Types', 'wordlift' ),
+            'all_items'         => __( 'All Entity Types', 'wordlift' ),
+            'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
+            'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
+            'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
+            'update_item'       => __( 'Update Entity Type', 'wordlift' ),
+            'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
+            'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
+            'menu_name'         => __( 'Entity Types', 'wordlift' ),
+        );
 
-		// Take away GUI for taxonomy editing.
-		// TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
-		$capabilities = array(
-			// We enable editors to change the title/description of terms:
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/398.
-			'manage_terms' => 'manage_options',
-			'edit_terms'   => 'wl_entity_type_edit_term',
-			'delete_terms' => 'wl_entity_type_delete_term',
-			'assign_terms' => 'edit_posts',
-		);
+        // Take away GUI for taxonomy editing.
+        // TODO: read capabilities when editing of the WL <-> schema.org mapping is possible.
+        $capabilities = array(
+            // We enable editors to change the title/description of terms:
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/398.
+            'manage_terms' => 'manage_options',
+            'edit_terms'   => 'wl_entity_type_edit_term',
+            'delete_terms' => 'wl_entity_type_delete_term',
+            'assign_terms' => 'edit_posts',
+        );
 
-		$args = array(
-			'labels'             => $labels,
-			'capabilities'       => $capabilities,
-			'hierarchical'       => true,
-			'show_admin_column'  => true,
-			'show_in_rest'		 => true,
-			'show_in_quick_edit' => false,
-		);
+        $args = array(
+            'labels'             => $labels,
+            'capabilities'       => $capabilities,
+            'hierarchical'       => true,
+            'show_admin_column'  => true,
+            'show_in_rest'		 => true,
+            'show_in_quick_edit' => false,
+        );
 
-		/*
+        /*
 		 * If `All Entity Types` is enabled, use the new metabox.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 * @since 3.20.0
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$args['meta_box_cb'] = array( 'Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render' );
-		}
+        if ( WL_ALL_ENTITY_TYPES ) {
+            $args['meta_box_cb'] = array( 'Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render' );
+        }
 
-		register_taxonomy(
-			self::TAXONOMY_NAME, // Taxonomy name.
-			Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
-			$args // Taxonomy args.
-		);
+        register_taxonomy(
+            self::TAXONOMY_NAME, // Taxonomy name.
+            Wordlift_Entity_Service::valid_entity_post_types(), // Taxonomy post types.
+            $args // Taxonomy args.
+        );
 
-		/**
-		 * Register meta wl_entities_gutenberg for use in Gutenberg
-		 */
-		register_meta( 'post', 'wl_entities_gutenberg', array(
-			'show_in_rest' => true,
-			'single'       => true,
-			'type'         => 'string',
-		) );
+        /**
+         * Register meta wl_entities_gutenberg for use in Gutenberg
+         */
+        register_meta( 'post', 'wl_entities_gutenberg', array(
+            'show_in_rest' => true,
+            'single'       => true,
+            'type'         => 'string',
+        ) );
 
-		// Add filter to change the metabox CSS class.
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+        // Add filter to change the metabox CSS class.
+        add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
 
-	}
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -29,17 +29,17 @@ 
 	public function init() {
 
 		$labels = array(
-			'name'              => _x( 'Entity Types', 'taxonomy general name', 'wordlift' ),
-			'singular_name'     => _x( 'Entity Type', 'taxonomy singular name', 'wordlift' ),
-			'search_items'      => __( 'Search Entity Types', 'wordlift' ),
-			'all_items'         => __( 'All Entity Types', 'wordlift' ),
-			'parent_item'       => __( 'Parent Entity Type', 'wordlift' ),
-			'parent_item_colon' => __( 'Parent Entity Type:', 'wordlift' ),
-			'edit_item'         => __( 'Edit Entity Type', 'wordlift' ),
-			'update_item'       => __( 'Update Entity Type', 'wordlift' ),
-			'add_new_item'      => __( 'Add New Entity Type', 'wordlift' ),
-			'new_item_name'     => __( 'New Entity Type', 'wordlift' ),
-			'menu_name'         => __( 'Entity Types', 'wordlift' ),
+			'name'              => _x('Entity Types', 'taxonomy general name', 'wordlift'),
+			'singular_name'     => _x('Entity Type', 'taxonomy singular name', 'wordlift'),
+			'search_items'      => __('Search Entity Types', 'wordlift'),
+			'all_items'         => __('All Entity Types', 'wordlift'),
+			'parent_item'       => __('Parent Entity Type', 'wordlift'),
+			'parent_item_colon' => __('Parent Entity Type:', 'wordlift'),
+			'edit_item'         => __('Edit Entity Type', 'wordlift'),
+			'update_item'       => __('Update Entity Type', 'wordlift'),
+			'add_new_item'      => __('Add New Entity Type', 'wordlift'),
+			'new_item_name'     => __('New Entity Type', 'wordlift'),
+			'menu_name'         => __('Entity Types', 'wordlift'),
 		);
 
 		// Take away GUI for taxonomy editing.
@@ -69,8 +69,8 @@ 
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/835
 		 * @since 3.20.0
 		 */
-		if ( WL_ALL_ENTITY_TYPES ) {
-			$args['meta_box_cb'] = array( 'Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render' );
+		if (WL_ALL_ENTITY_TYPES) {
+			$args['meta_box_cb'] = array('Wordlift_Admin_Schemaorg_Taxonomy_Metabox', 'render');
 		}
 
 		register_taxonomy(
@@ -82,14 +82,14 @@ 
 		/**
 		 * Register meta wl_entities_gutenberg for use in Gutenberg
 		 */
-		register_meta( 'post', 'wl_entities_gutenberg', array(
+		register_meta('post', 'wl_entities_gutenberg', array(
 			'show_in_rest' => true,
 			'single'       => true,
 			'type'         => 'string',
-		) );
+		));
 
 		// Add filter to change the metabox CSS class.
-		add_filter( 'postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class' );
+		add_filter('postbox_classes_entity_wl_entity_typediv', 'wl_admin_metaboxes_add_css_class');
 
 	}