insideout10 / wordlift-plugin

src/modules/core/wordlift_core_schema_api.php

Doc Comments +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
  * @param int   $post_id    The numeric post ID
  * @param array $type_names An array of strings, each defining a type (e.g. Type, for the http://schema.org/Type)
  *
- * @return boolean True if everything went ok, an error string otherwise.
+ * @return boolean|null True if everything went ok, an error string otherwise.
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 

Indentation +78 added lines, -78 removed lines

@@ -17,34 +17,34 @@ 
  */
 function wl_schema_get_value( $post_id, $property_name ) {
 
-	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
-		return null;
-	}
-
-	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
-
-	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-			return null;
-		}
-	}
-
-	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
-	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
-		}
-	}
-
-	return null;
+    // Property name must be defined.
+    if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+        return null;
+    }
+
+    // store eventual schema name in  different variable
+    $property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+
+    // Establish entity id.
+    if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+        $post_id = get_the_ID();
+        if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+            return null;
+        }
+    }
+
+    // Get custom fields.
+    $term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Search for the required meta value (by constant name or schema name)
+    foreach ( $term_mapping as $wl_constant => $property_info ) {
+        $found_constant  = ( $wl_constant == $property_name );
+        $found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
+        if ( $found_constant || $found_predicate ) {
+            return get_post_meta( $post_id, $wl_constant );
+        }
+    }
+
+    return null;
 }
 
 /**
@@ -58,38 +58,38 @@ 
  */
 function wl_schema_set_value( $post_id, $property_name, $property_value ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
-		return false;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+        return false;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
-			}
+            // Deal with single values
+            if ( ! is_array( $property_value ) ) {
+                $property_value = array( $property_value );
+            }
 
-			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+            // Delete present meta
+            delete_post_meta( $post_id, $wl_constant );
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
-			}
+            foreach ( $property_value as $value ) {
+                add_post_meta( $post_id, $wl_constant, $value );
+            }
 
-			return true;
-		}
-	}
+            return true;
+        }
+    }
 
-	return false;
+    return false;
 }
 
 /**
@@ -102,18 +102,18 @@ 
  */
 function wl_schema_get_types( $post_id ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
-		return null;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) ) {
+        return null;
+    }
 
-	$type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+    $type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
-	}
+    if ( isset( $type['uri'] ) ) {
+        return array( $type['uri'] );
+    }
 
-	return null;
+    return null;
 }
 
 /**
@@ -126,21 +126,21 @@ 
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
-		return null;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+        return null;
+    }
 
-	// TODO: support more than one type.
-	if ( is_array( $type_names ) ) {
-		$type_names = $type_names[0];
-	}
+    // TODO: support more than one type.
+    if ( is_array( $type_names ) ) {
+        $type_names = $type_names[0];
+    }
 
-	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+    // Get the schema URI (e.g. http://schema.org/Thing)
+    $type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
 
-	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+    // Actually sets the taxonomy type
+    wl_set_entity_main_type( $post_id, $type_names );
 
 }
 
@@ -153,11 +153,11 @@ 
  */
 function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
 
-	$schema_root_address = 'http://schema.org/';
+    $schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
-	}
+    if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
+        $schema_name = $schema_root_address . $schema_name;
+    }
 
-	return $schema_name;
+    return $schema_name;
 }

Spacing +35 added lines, -35 removed lines

@@ -15,32 +15,32 @@ 
  *
  * @return array|null An array of values or NULL in case of no values (or error).
  */
-function wl_schema_get_value( $post_id, $property_name ) {
+function wl_schema_get_value($post_id, $property_name) {
 
 	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+	if ( ! isset($property_name) || is_null($property_name)) {
 		return null;
 	}
 
 	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_schema_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+	if (is_null($post_id) || ! is_numeric($post_id)) {
 		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+		if (is_null($post_id) || ! is_numeric($post_id)) {
 			return null;
 		}
 	}
 
 	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$term_mapping = wl_entity_taxonomy_get_custom_fields($post_id);
 	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
+	foreach ($term_mapping as $wl_constant => $property_info) {
+		$found_constant  = ($wl_constant == $property_name);
+		$found_predicate = (isset($property_info['predicate']) && $property_info['predicate'] == $property_schema_name);
+		if ($found_constant || $found_predicate) {
+			return get_post_meta($post_id, $wl_constant);
 		}
 	}
 
@@ -56,33 +56,33 @@ 
  *
  * @return boolean The method returns true if everything went ok, an error string otherwise.
  */
-function wl_schema_set_value( $post_id, $property_name, $property_value ) {
+function wl_schema_set_value($post_id, $property_name, $property_value) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+	if ( ! is_numeric($post_id) || is_null($property_name) || empty($property_value) || is_null($property_value)) {
 		return false;
 	}
 
 	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$accepted_fields = wl_entity_taxonomy_get_custom_fields($post_id);
 
 	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+	foreach ($accepted_fields as $wl_constant => $field) {
+		if ($field['predicate'] == $property_name) {
 
 			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
+			if ( ! is_array($property_value)) {
+				$property_value = array($property_value);
 			}
 
 			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+			delete_post_meta($post_id, $wl_constant);
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
+			foreach ($property_value as $value) {
+				add_post_meta($post_id, $wl_constant, $value);
 			}
 
 			return true;
@@ -100,17 +100,17 @@ 
  * @return array Array of type(s) (e.g. Type, for the http://schema.org/Type)
  *               or NULL in case of no values (or error).
  */
-function wl_schema_get_types( $post_id ) {
+function wl_schema_get_types($post_id) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
+	if ( ! is_numeric($post_id)) {
 		return null;
 	}
 
-	$type = Wordlift_Entity_Type_Service::get_instance()->get( $post_id );
+	$type = Wordlift_Entity_Type_Service::get_instance()->get($post_id);
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
+	if (isset($type['uri'])) {
+		return array($type['uri']);
 	}
 
 	return null;
@@ -124,23 +124,23 @@ 
  *
  * @return boolean True if everything went ok, an error string otherwise.
  */
-function wl_schema_set_types( $post_id, $type_names ) {
+function wl_schema_set_types($post_id, $type_names) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+	if ( ! is_numeric($post_id) || empty($type_names) || is_null($type_names)) {
 		return null;
 	}
 
 	// TODO: support more than one type.
-	if ( is_array( $type_names ) ) {
+	if (is_array($type_names)) {
 		$type_names = $type_names[0];
 	}
 
 	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+	$type_names = wl_build_full_schema_uri_from_schema_slug($type_names);
 
 	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+	wl_set_entity_main_type($post_id, $type_names);
 
 }
 
@@ -151,12 +151,12 @@ 
  *
  * @return string The full schema uri (es. 'latitude' returns 'http://schema.org/latitude')
  */
-function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
+function wl_build_full_schema_uri_from_schema_slug($schema_name) {
 
 	$schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === false ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
+	if (strpos($schema_name, $schema_root_address) === false) {   // === necessary
+		$schema_name = $schema_root_address.$schema_name;
 	}
 
 	return $schema_name;

src/wordlift_redlink.php

Indentation +40 added lines, -40 removed lines

@@ -19,57 +19,57 @@
  */
 function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'rl_execute_sparql_update_query' );
+    $log = Wordlift_Log_Service::get_logger( 'rl_execute_sparql_update_query' );
 
-	if ( get_transient( 'DISABLE_ENTITY_PUSH' ) ) {
-		return true;
-	}
+    if ( get_transient( 'DISABLE_ENTITY_PUSH' ) ) {
+        return true;
+    }
 
-	// Queue the update query.
-	if ( $queue ) {
-		$log->debug( 'Queueing query...' );
+    // Queue the update query.
+    if ( $queue ) {
+        $log->debug( 'Queueing query...' );
 
-		Wordlift_Sparql_Service::get_instance()->queue( $query );
+        Wordlift_Sparql_Service::get_instance()->queue( $query );
 
-		return true;
-	}
+        return true;
+    }
 
-	// Get the update end-point.
-	$url = wl_configuration_get_query_update_url();
+    // Get the update end-point.
+    $url = wl_configuration_get_query_update_url();
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'  => 'POST',
-		'headers' => array(
-			'Accept'       => 'application/json',
-			'Content-type' => 'application/sparql-update; charset=utf-8',
-		),
-		'body'    => $query,
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'  => 'POST',
+        'headers' => array(
+            'Accept'       => 'application/json',
+            'Content-type' => 'application/sparql-update; charset=utf-8',
+        ),
+        'body'    => $query,
+    ) );
 
-	// Send the request.
-	$response = wp_remote_post( $url, $args );
+    // Send the request.
+    $response = wp_remote_post( $url, $args );
 
-	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+    // If an error has been raised, return the error.
+    if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+        $body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
 
-		$log->debug( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		$log->debug( "\n" . var_export( $args, true ) );
-		$log->debug( "[ response :: " );
-		$log->debug( "\n" . var_export( $response, true ) );
-		$log->debug( "][ body :: " );
-		$log->debug( "\n" . $body );
-		$log->debug( "]" );
+        $log->debug( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
+        $log->debug( "\n" . var_export( $args, true ) );
+        $log->debug( "[ response :: " );
+        $log->debug( "\n" . var_export( $response, true ) );
+        $log->debug( "][ body :: " );
+        $log->debug( "\n" . $body );
+        $log->debug( "]" );
 
-		return false;
-	}
+        return false;
+    }
 
-	if ( WP_DEBUG ) {
-		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
-	}
+    if ( WP_DEBUG ) {
+        global $wl_logger;
+        $wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+    }
 
-	return true;
+    return true;
 }

Spacing +20 added lines, -20 removed lines

@@ -17,19 +17,19 @@ 
  *
  * @return bool True if successful otherwise false.
  */
-function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+function rl_execute_sparql_update_query($query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 
-	$log = Wordlift_Log_Service::get_logger( 'rl_execute_sparql_update_query' );
+	$log = Wordlift_Log_Service::get_logger('rl_execute_sparql_update_query');
 
-	if ( get_transient( 'DISABLE_ENTITY_PUSH' ) ) {
+	if (get_transient('DISABLE_ENTITY_PUSH')) {
 		return true;
 	}
 
 	// Queue the update query.
-	if ( $queue ) {
-		$log->debug( 'Queueing query...' );
+	if ($queue) {
+		$log->debug('Queueing query...');
 
-		Wordlift_Sparql_Service::get_instance()->queue( $query );
+		Wordlift_Sparql_Service::get_instance()->queue($query);
 
 		return true;
 	}
@@ -38,37 +38,37 @@ 
 	$url = wl_configuration_get_query_update_url();
 
 	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 		'method'  => 'POST',
 		'headers' => array(
 			'Accept'       => 'application/json',
 			'Content-type' => 'application/sparql-update; charset=utf-8',
 		),
 		'body'    => $query,
-	) );
+	));
 
 	// Send the request.
-	$response = wp_remote_post( $url, $args );
+	$response = wp_remote_post($url, $args);
 
 	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+	if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+		$body = (is_wp_error($response) ? $response->get_error_message() : $response['body']);
 
-		$log->debug( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		$log->debug( "\n" . var_export( $args, true ) );
-		$log->debug( "[ response :: " );
-		$log->debug( "\n" . var_export( $response, true ) );
-		$log->debug( "][ body :: " );
-		$log->debug( "\n" . $body );
-		$log->debug( "]" );
+		$log->debug("rl_execute_sparql_update_query : error [ url :: $url ][ args :: ");
+		$log->debug("\n".var_export($args, true));
+		$log->debug("[ response :: ");
+		$log->debug("\n".var_export($response, true));
+		$log->debug("][ body :: ");
+		$log->debug("\n".$body);
+		$log->debug("]");
 
 		return false;
 	}
 
-	if ( WP_DEBUG ) {
+	if (WP_DEBUG) {
 		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+		$wl_logger->trace("Query executed successfully [ query :: $query ]");
 	}
 
 	return true;

src/modules/core/wordlift_core_install.php

Indentation +208 added lines, -208 removed lines

@@ -12,93 +12,93 @@ 
  */
 function wl_core_install_entity_type_data() {
 
-	Wordlift_Log_Service::get_instance()->debug( 'Installing Entity Type data...' );
-
-	// Set the taxonomy data.
-	// Note: parent types must be defined before child types.
-	$terms = array(
-		'thing'         => array(
-			'label'       => 'Thing',
-			'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
-		),
-		'creative-work' => array(
-			'label'       => 'CreativeWork',
-			'description' => 'A creative work (or a Music Album).',
-		),
-		'event'         => array(
-			'label'       => 'Event',
-			'description' => 'An event.',
-		),
-		'organization'  => array(
-			'label'       => 'Organization',
-			'description' => 'An organization, including a government or a newspaper.',
-		),
-		'person'        => array(
-			'label'       => 'Person',
-			'description' => 'A person (or a music artist).',
-		),
-		'place'         => array(
-			'label'       => 'Place',
-			'description' => 'A place.',
-		),
-		'localbusiness' => array(
-			'label'       => 'LocalBusiness',
-			'description' => 'A local business.',
-		),
-	);
-
-	foreach ( $terms as $slug => $term ) {
-
-		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		if ( 0 == $term_id || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		} else {
-			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
-		}
-
-		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
-			continue;
-		}
-
-		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
-			$term['parents'] = array();
-		}
-
-		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
-		}
-
-		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
-			// No parent
-			$parent_id = 0;
-		} else {
-			// Get first parent
-			$parent_id = $parent_ids[0];
-		}
-
-		// Update term with description, slug and parent
-		$term = wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-			'name'        => $term['label'],
-			'slug'        => $slug,
-			'description' => $term['description'],
-			// We give to WP taxonomy just one parent. TODO: see if can give more than one
-			'parent'      => $parent_id,
-		) );
-
-		Wordlift_Log_Service::get_instance()->trace( "Entity Type $slug installed with ID {$term['term_id']}." );
-
-	}
-
-	Wordlift_Log_Service::get_instance()->debug( 'Entity Type data installed.' );
+    Wordlift_Log_Service::get_instance()->debug( 'Installing Entity Type data...' );
+
+    // Set the taxonomy data.
+    // Note: parent types must be defined before child types.
+    $terms = array(
+        'thing'         => array(
+            'label'       => 'Thing',
+            'description' => 'A generic thing (something that doesn\'t fit in the previous definitions.',
+        ),
+        'creative-work' => array(
+            'label'       => 'CreativeWork',
+            'description' => 'A creative work (or a Music Album).',
+        ),
+        'event'         => array(
+            'label'       => 'Event',
+            'description' => 'An event.',
+        ),
+        'organization'  => array(
+            'label'       => 'Organization',
+            'description' => 'An organization, including a government or a newspaper.',
+        ),
+        'person'        => array(
+            'label'       => 'Person',
+            'description' => 'A person (or a music artist).',
+        ),
+        'place'         => array(
+            'label'       => 'Place',
+            'description' => 'A place.',
+        ),
+        'localbusiness' => array(
+            'label'       => 'LocalBusiness',
+            'description' => 'A local business.',
+        ),
+    );
+
+    foreach ( $terms as $slug => $term ) {
+
+        // Create the term if it does not exist, then get its ID
+        $term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        if ( 0 == $term_id || is_null( $term_id ) ) {
+            $result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+        } else {
+            $term_id = $term_id['term_id'];
+            $result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+        }
+
+        // Check for errors.
+        if ( is_wp_error( $result ) ) {
+            wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+            continue;
+        }
+
+        // Check if 'parent' corresponds to an actual term and get its ID.
+        if ( ! isset( $term['parents'] ) ) {
+            $term['parents'] = array();
+        }
+
+        $parent_ids = array();
+        foreach ( $term['parents'] as $parent_slug ) {
+            $parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+        }
+
+        // Define a parent in the WP taxonomy style (not important for WL)
+        if ( empty( $parent_ids ) ) {
+            // No parent
+            $parent_id = 0;
+        } else {
+            // Get first parent
+            $parent_id = $parent_ids[0];
+        }
+
+        // Update term with description, slug and parent
+        $term = wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+            'name'        => $term['label'],
+            'slug'        => $slug,
+            'description' => $term['description'],
+            // We give to WP taxonomy just one parent. TODO: see if can give more than one
+            'parent'      => $parent_id,
+        ) );
+
+        Wordlift_Log_Service::get_instance()->trace( "Entity Type $slug installed with ID {$term['term_id']}." );
+
+    }
+
+    Wordlift_Log_Service::get_instance()->debug( 'Entity Type data installed.' );
 
 }
 
@@ -107,16 +107,16 @@ 
  */
 function wl_core_install_create_relation_instance_table() {
 
-	global $wpdb;
-	// global $wl_db_version;
-	$installed_version = get_option( 'wl_db_version' );
+    global $wpdb;
+    // global $wl_db_version;
+    $installed_version = get_option( 'wl_db_version' );
 
-	if ( WL_DB_VERSION != $installed_version ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
-		$charset_collate = $wpdb->get_charset_collate();
+    if ( WL_DB_VERSION != $installed_version ) {
+        $table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+        $charset_collate = $wpdb->get_charset_collate();
 
-		// Sql statement for the relation instances custom table
-		$sql = <<<EOF
+        // Sql statement for the relation instances custom table
+        $sql = <<<EOF
 			CREATE TABLE $table_name (
   				id int(11) NOT NULL AUTO_INCREMENT,
   				subject_id int(11) NOT NULL,
@@ -128,14 +128,14 @@ 
 			) $charset_collate;
 EOF;
 
-		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+        // @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        $results = dbDelta( $sql );
 
-		wl_write_log( $results );
+        wl_write_log( $results );
 
-		update_option( 'wl_db_version', WL_DB_VERSION );
-	}
+        update_option( 'wl_db_version', WL_DB_VERSION );
+    }
 }
 
 /**
@@ -146,9 +146,9 @@ 
  */
 function wl_core_upgrade_db_to_1_0() {
 
-	if ( ! get_option( 'wl_db_version' ) ) {
-		wl_core_install_create_relation_instance_table();
-	}
+    if ( ! get_option( 'wl_db_version' ) ) {
+        wl_core_install_create_relation_instance_table();
+    }
 
 }
 
@@ -161,31 +161,31 @@ 
  */
 function wl_core_upgrade_db_1_0_to_3_10() {
 
-	// If the DB version is less than 3.10, than flatten the txonomy.
-	if ( version_compare( get_option( 'wl_db_version' ), '3.9', '<=' ) ) {
+    // If the DB version is less than 3.10, than flatten the txonomy.
+    if ( version_compare( get_option( 'wl_db_version' ), '3.9', '<=' ) ) {
 
-		$term_slugs = array(
-			'thing',
-			'creative-work',
-			'event',
-			'organization',
-			'person',
-			'place',
-			'localbusiness',
-		);
+        $term_slugs = array(
+            'thing',
+            'creative-work',
+            'event',
+            'organization',
+            'person',
+            'place',
+            'localbusiness',
+        );
 
-		foreach ( $term_slugs as $slug ) {
+        foreach ( $term_slugs as $slug ) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+            $term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
 
-			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-					'parent' => 0,
-				) );
-			}
-		}
-	}
+            // Set the term's parent to 0.
+            if ( $term ) {
+                wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+                    'parent' => 0,
+                ) );
+            }
+        }
+    }
 
 }
 
@@ -198,14 +198,14 @@ 
  * @since 3.12.0
  */
 function wl_core_upgrade_db_3_10_3_12() {
-	/*
+    /*
 	 * As this upgrade functionality runs on the init hook, and the AMP plugin
 	 * initialization does the same, avoid possible race conditions by
 	 * deferring the actual flush to a later hook.
 	 */
-	add_action( 'wp_loaded', function () {
-		flush_rewrite_rules();
-	} );
+    add_action( 'wp_loaded', function () {
+        flush_rewrite_rules();
+    } );
 }
 
 /**
@@ -216,42 +216,42 @@ 
  * @since 3.14.0
  */
 function wl_core_upgrade_db_3_12_3_14() {
-	$result = wp_insert_term(
-		'Recipe',
-		Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-		array(
-			'slug'        => 'recipe',
-			'description' => 'A Recipe.',
-		)
-	);
-
-	// Assign capabilities to manipulate entities to admins.
-	$admins = get_role( 'administrator' );
-
-	$admins->add_cap( 'edit_wordlift_entity' );
-	$admins->add_cap( 'edit_wordlift_entities' );
-	$admins->add_cap( 'edit_others_wordlift_entities' );
-	$admins->add_cap( 'publish_wordlift_entities' );
-	$admins->add_cap( 'read_private_wordlift_entities' );
-	$admins->add_cap( 'delete_wordlift_entity' );
-	$admins->add_cap( 'delete_wordlift_entities' );
-	$admins->add_cap( 'delete_others_wordlift_entities' );
-	$admins->add_cap( 'delete_published_wordlift_entities' );
-	$admins->add_cap( 'delete_private_wordlift_entities' );
-
-	// Assign capabilities to manipulate entities to editors.
-	$editors = get_role( 'editor' );
-
-	$editors->add_cap( 'edit_wordlift_entity' );
-	$editors->add_cap( 'edit_wordlift_entities' );
-	$editors->add_cap( 'edit_others_wordlift_entities' );
-	$editors->add_cap( 'publish_wordlift_entities' );
-	$editors->add_cap( 'read_private_wordlift_entities' );
-	$editors->add_cap( 'delete_wordlift_entity' );
-	$editors->add_cap( 'delete_wordlift_entities' );
-	$editors->add_cap( 'delete_others_wordlift_entities' );
-	$editors->add_cap( 'delete_published_wordlift_entities' );
-	$editors->add_cap( 'delete_private_wordlift_entities' );
+    $result = wp_insert_term(
+        'Recipe',
+        Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+        array(
+            'slug'        => 'recipe',
+            'description' => 'A Recipe.',
+        )
+    );
+
+    // Assign capabilities to manipulate entities to admins.
+    $admins = get_role( 'administrator' );
+
+    $admins->add_cap( 'edit_wordlift_entity' );
+    $admins->add_cap( 'edit_wordlift_entities' );
+    $admins->add_cap( 'edit_others_wordlift_entities' );
+    $admins->add_cap( 'publish_wordlift_entities' );
+    $admins->add_cap( 'read_private_wordlift_entities' );
+    $admins->add_cap( 'delete_wordlift_entity' );
+    $admins->add_cap( 'delete_wordlift_entities' );
+    $admins->add_cap( 'delete_others_wordlift_entities' );
+    $admins->add_cap( 'delete_published_wordlift_entities' );
+    $admins->add_cap( 'delete_private_wordlift_entities' );
+
+    // Assign capabilities to manipulate entities to editors.
+    $editors = get_role( 'editor' );
+
+    $editors->add_cap( 'edit_wordlift_entity' );
+    $editors->add_cap( 'edit_wordlift_entities' );
+    $editors->add_cap( 'edit_others_wordlift_entities' );
+    $editors->add_cap( 'publish_wordlift_entities' );
+    $editors->add_cap( 'read_private_wordlift_entities' );
+    $editors->add_cap( 'delete_wordlift_entity' );
+    $editors->add_cap( 'delete_wordlift_entities' );
+    $editors->add_cap( 'delete_others_wordlift_entities' );
+    $editors->add_cap( 'delete_published_wordlift_entities' );
+    $editors->add_cap( 'delete_private_wordlift_entities' );
 }
 
 /**
@@ -262,27 +262,27 @@ 
  * @since 3.15.0
  */
 function wl_core_upgrade_db_3_14_3_15() {
-	global $wpdb;
-
-	if ( version_compare( get_option( 'wl_db_version' ), '3.15', '<=' ) ) {
-		$article = get_term_by( 'slug', 'article', Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		if ( ! $article ) {
-			$article    = wp_insert_term(
-				'Article',
-				Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-				array(
-					'slug'        => 'article',
-					'description' => 'An Article.',
-				)
-			);
-			$article_id = $article['term_id'];
-		} else {
-			$article_id = $article->term_id;
-		}
-
-		// An sql that will assign the article term to all posts and pages
-		$wpdb->query( $wpdb->prepare(
-			"
+    global $wpdb;
+
+    if ( version_compare( get_option( 'wl_db_version' ), '3.15', '<=' ) ) {
+        $article = get_term_by( 'slug', 'article', Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+        if ( ! $article ) {
+            $article    = wp_insert_term(
+                'Article',
+                Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+                array(
+                    'slug'        => 'article',
+                    'description' => 'An Article.',
+                )
+            );
+            $article_id = $article['term_id'];
+        } else {
+            $article_id = $article->term_id;
+        }
+
+        // An sql that will assign the article term to all posts and pages
+        $wpdb->query( $wpdb->prepare(
+            "
 			INSERT INTO $wpdb->term_relationships( object_id, term_taxonomy_id )
 			SELECT id, %d
 			FROM $wpdb->posts
@@ -296,33 +296,33 @@ 
 						AND tt.taxonomy = 'wl_entity_type'
 			)
 			",
-			$article_id
-		) );
-	}
+            $article_id
+        ) );
+    }
 }
 
 // Check db status on automated plugins updates
 function wl_core_update_db_check() {
 
-	// Ensure the custom type and the taxonomy are registered.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-
-	// Commenting this out because this function is already called by init
-	// with priority 0 at wordlift_entity_type.php.
-	wl_entity_type_taxonomy_register();
-
-	// Ensure the custom taxonomy for dbpedia topics is registered
-	Wordlift_Topic_Taxonomy_Service::get_instance()->init();
-
-	if ( get_option( 'wl_db_version' ) !== WL_DB_VERSION ) {
-		wl_core_install_entity_type_data();
-		wl_core_upgrade_db_to_1_0();
-		wl_core_upgrade_db_1_0_to_3_10();
-		wl_core_upgrade_db_3_10_3_12();
-		wl_core_upgrade_db_3_12_3_14();
-		wl_core_upgrade_db_3_14_3_15();
-		update_option( 'wl_db_version', WL_DB_VERSION );
-	}
+    // Ensure the custom type and the taxonomy are registered.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+
+    // Commenting this out because this function is already called by init
+    // with priority 0 at wordlift_entity_type.php.
+    wl_entity_type_taxonomy_register();
+
+    // Ensure the custom taxonomy for dbpedia topics is registered
+    Wordlift_Topic_Taxonomy_Service::get_instance()->init();
+
+    if ( get_option( 'wl_db_version' ) !== WL_DB_VERSION ) {
+        wl_core_install_entity_type_data();
+        wl_core_upgrade_db_to_1_0();
+        wl_core_upgrade_db_1_0_to_3_10();
+        wl_core_upgrade_db_3_10_3_12();
+        wl_core_upgrade_db_3_12_3_14();
+        wl_core_upgrade_db_3_14_3_15();
+        update_option( 'wl_db_version', WL_DB_VERSION );
+    }
 
 }
 

Spacing +65 added lines, -65 removed lines

@@ -12,7 +12,7 @@ 
  */
 function wl_core_install_entity_type_data() {
 
-	Wordlift_Log_Service::get_instance()->debug( 'Installing Entity Type data...' );
+	Wordlift_Log_Service::get_instance()->debug('Installing Entity Type data...');
 
 	// Set the taxonomy data.
 	// Note: parent types must be defined before child types.
@@ -47,37 +47,37 @@ 
 		),
 	);
 
-	foreach ( $terms as $slug => $term ) {
+	foreach ($terms as $slug => $term) {
 
 		// Create the term if it does not exist, then get its ID
-		$term_id = term_exists( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		$term_id = term_exists($slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
-		if ( 0 == $term_id || is_null( $term_id ) ) {
-			$result = wp_insert_term( $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		if (0 == $term_id || is_null($term_id)) {
+			$result = wp_insert_term($slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 		} else {
 			$term_id = $term_id['term_id'];
-			$result  = get_term( $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A );
+			$result  = get_term($term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, ARRAY_A);
 		}
 
 		// Check for errors.
-		if ( is_wp_error( $result ) ) {
-			wl_write_log( 'wl_install_entity_type_data [ ' . $result->get_error_message() . ' ]' );
+		if (is_wp_error($result)) {
+			wl_write_log('wl_install_entity_type_data [ '.$result->get_error_message().' ]');
 			continue;
 		}
 
 		// Check if 'parent' corresponds to an actual term and get its ID.
-		if ( ! isset( $term['parents'] ) ) {
+		if ( ! isset($term['parents'])) {
 			$term['parents'] = array();
 		}
 
 		$parent_ids = array();
-		foreach ( $term['parents'] as $parent_slug ) {
-			$parent_id    = get_term_by( 'slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-			$parent_ids[] = intval( $parent_id->term_id );  // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
+		foreach ($term['parents'] as $parent_slug) {
+			$parent_id    = get_term_by('slug', $parent_slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
+			$parent_ids[] = intval($parent_id->term_id); // Note: int casting is suggested by Codex: http://codex.wordpress.org/Function_Reference/get_term_by
 		}
 
 		// Define a parent in the WP taxonomy style (not important for WL)
-		if ( empty( $parent_ids ) ) {
+		if (empty($parent_ids)) {
 			// No parent
 			$parent_id = 0;
 		} else {
@@ -86,19 +86,19 @@ 
 		}
 
 		// Update term with description, slug and parent
-		$term = wp_update_term( $result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+		$term = wp_update_term($result['term_id'], Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 			'name'        => $term['label'],
 			'slug'        => $slug,
 			'description' => $term['description'],
 			// We give to WP taxonomy just one parent. TODO: see if can give more than one
 			'parent'      => $parent_id,
-		) );
+		));
 
-		Wordlift_Log_Service::get_instance()->trace( "Entity Type $slug installed with ID {$term['term_id']}." );
+		Wordlift_Log_Service::get_instance()->trace("Entity Type $slug installed with ID {$term['term_id']}.");
 
 	}
 
-	Wordlift_Log_Service::get_instance()->debug( 'Entity Type data installed.' );
+	Wordlift_Log_Service::get_instance()->debug('Entity Type data installed.');
 
 }
 
@@ -109,10 +109,10 @@ 
 
 	global $wpdb;
 	// global $wl_db_version;
-	$installed_version = get_option( 'wl_db_version' );
+	$installed_version = get_option('wl_db_version');
 
-	if ( WL_DB_VERSION != $installed_version ) {
-		$table_name      = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+	if (WL_DB_VERSION != $installed_version) {
+		$table_name      = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
 		$charset_collate = $wpdb->get_charset_collate();
 
 		// Sql statement for the relation instances custom table
@@ -129,12 +129,12 @@ 
 EOF;
 
 		// @see: https://codex.wordpress.org/Creating_Tables_with_Plugins
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-		$results = dbDelta( $sql );
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
+		$results = dbDelta($sql);
 
-		wl_write_log( $results );
+		wl_write_log($results);
 
-		update_option( 'wl_db_version', WL_DB_VERSION );
+		update_option('wl_db_version', WL_DB_VERSION);
 	}
 }
 
@@ -146,7 +146,7 @@ 
  */
 function wl_core_upgrade_db_to_1_0() {
 
-	if ( ! get_option( 'wl_db_version' ) ) {
+	if ( ! get_option('wl_db_version')) {
 		wl_core_install_create_relation_instance_table();
 	}
 
@@ -162,7 +162,7 @@ 
 function wl_core_upgrade_db_1_0_to_3_10() {
 
 	// If the DB version is less than 3.10, than flatten the txonomy.
-	if ( version_compare( get_option( 'wl_db_version' ), '3.9', '<=' ) ) {
+	if (version_compare(get_option('wl_db_version'), '3.9', '<=')) {
 
 		$term_slugs = array(
 			'thing',
@@ -174,15 +174,15 @@ 
 			'localbusiness',
 		);
 
-		foreach ( $term_slugs as $slug ) {
+		foreach ($term_slugs as $slug) {
 
-			$term = get_term_by( 'slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+			$term = get_term_by('slug', $slug, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			// Set the term's parent to 0.
-			if ( $term ) {
-				wp_update_term( $term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+			if ($term) {
+				wp_update_term($term->term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 					'parent' => 0,
-				) );
+				));
 			}
 		}
 	}
@@ -203,7 +203,7 @@ 
 	 * initialization does the same, avoid possible race conditions by
 	 * deferring the actual flush to a later hook.
 	 */
-	add_action( 'wp_loaded', function () {
+	add_action('wp_loaded', function() {
 		flush_rewrite_rules();
 	} );
 }
@@ -226,32 +226,32 @@ 
 	);
 
 	// Assign capabilities to manipulate entities to admins.
-	$admins = get_role( 'administrator' );
-
-	$admins->add_cap( 'edit_wordlift_entity' );
-	$admins->add_cap( 'edit_wordlift_entities' );
-	$admins->add_cap( 'edit_others_wordlift_entities' );
-	$admins->add_cap( 'publish_wordlift_entities' );
-	$admins->add_cap( 'read_private_wordlift_entities' );
-	$admins->add_cap( 'delete_wordlift_entity' );
-	$admins->add_cap( 'delete_wordlift_entities' );
-	$admins->add_cap( 'delete_others_wordlift_entities' );
-	$admins->add_cap( 'delete_published_wordlift_entities' );
-	$admins->add_cap( 'delete_private_wordlift_entities' );
+	$admins = get_role('administrator');
+
+	$admins->add_cap('edit_wordlift_entity');
+	$admins->add_cap('edit_wordlift_entities');
+	$admins->add_cap('edit_others_wordlift_entities');
+	$admins->add_cap('publish_wordlift_entities');
+	$admins->add_cap('read_private_wordlift_entities');
+	$admins->add_cap('delete_wordlift_entity');
+	$admins->add_cap('delete_wordlift_entities');
+	$admins->add_cap('delete_others_wordlift_entities');
+	$admins->add_cap('delete_published_wordlift_entities');
+	$admins->add_cap('delete_private_wordlift_entities');
 
 	// Assign capabilities to manipulate entities to editors.
-	$editors = get_role( 'editor' );
-
-	$editors->add_cap( 'edit_wordlift_entity' );
-	$editors->add_cap( 'edit_wordlift_entities' );
-	$editors->add_cap( 'edit_others_wordlift_entities' );
-	$editors->add_cap( 'publish_wordlift_entities' );
-	$editors->add_cap( 'read_private_wordlift_entities' );
-	$editors->add_cap( 'delete_wordlift_entity' );
-	$editors->add_cap( 'delete_wordlift_entities' );
-	$editors->add_cap( 'delete_others_wordlift_entities' );
-	$editors->add_cap( 'delete_published_wordlift_entities' );
-	$editors->add_cap( 'delete_private_wordlift_entities' );
+	$editors = get_role('editor');
+
+	$editors->add_cap('edit_wordlift_entity');
+	$editors->add_cap('edit_wordlift_entities');
+	$editors->add_cap('edit_others_wordlift_entities');
+	$editors->add_cap('publish_wordlift_entities');
+	$editors->add_cap('read_private_wordlift_entities');
+	$editors->add_cap('delete_wordlift_entity');
+	$editors->add_cap('delete_wordlift_entities');
+	$editors->add_cap('delete_others_wordlift_entities');
+	$editors->add_cap('delete_published_wordlift_entities');
+	$editors->add_cap('delete_private_wordlift_entities');
 }
 
 /**
@@ -264,10 +264,10 @@ 
 function wl_core_upgrade_db_3_14_3_15() {
 	global $wpdb;
 
-	if ( version_compare( get_option( 'wl_db_version' ), '3.15', '<=' ) ) {
-		$article = get_term_by( 'slug', 'article', Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-		if ( ! $article ) {
-			$article    = wp_insert_term(
+	if (version_compare(get_option('wl_db_version'), '3.15', '<=')) {
+		$article = get_term_by('slug', 'article', Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
+		if ( ! $article) {
+			$article = wp_insert_term(
 				'Article',
 				Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
 				array(
@@ -281,7 +281,7 @@ 
 		}
 
 		// An sql that will assign the article term to all posts and pages
-		$wpdb->query( $wpdb->prepare(
+		$wpdb->query($wpdb->prepare(
 			"
 			INSERT INTO $wpdb->term_relationships( object_id, term_taxonomy_id )
 			SELECT id, %d
@@ -297,7 +297,7 @@ 
 			)
 			",
 			$article_id
-		) );
+		));
 	}
 }
 
@@ -314,16 +314,16 @@ 
 	// Ensure the custom taxonomy for dbpedia topics is registered
 	Wordlift_Topic_Taxonomy_Service::get_instance()->init();
 
-	if ( get_option( 'wl_db_version' ) !== WL_DB_VERSION ) {
+	if (get_option('wl_db_version') !== WL_DB_VERSION) {
 		wl_core_install_entity_type_data();
 		wl_core_upgrade_db_to_1_0();
 		wl_core_upgrade_db_1_0_to_3_10();
 		wl_core_upgrade_db_3_10_3_12();
 		wl_core_upgrade_db_3_12_3_14();
 		wl_core_upgrade_db_3_14_3_15();
-		update_option( 'wl_db_version', WL_DB_VERSION );
+		update_option('wl_db_version', WL_DB_VERSION);
 	}
 
 }
 
-add_action( 'init', 'wl_core_update_db_check', 11 ); // need taxonomies and post type to be defined first
+add_action('init', 'wl_core_update_db_check', 11); // need taxonomies and post type to be defined first

src/modules/core/wordlift_core_functions.php

Indentation +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@
  * @param mixed $response The response to send to the client as JSON.
  */
 function wl_core_send_json( $response ) {
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	wp_send_json( $response );
+    wp_send_json( $response );
 }

Spacing +3 added lines, -3 removed lines

@@ -6,10 +6,10 @@
  *
  * @param mixed $response The response to send to the client as JSON.
  */
-function wl_core_send_json( $response ) {
-	if ( ob_get_contents() ) {
+function wl_core_send_json($response) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }

src/modules/core/wordlift_core_constants.php

Spacing +18 added lines, -18 removed lines

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

src/modules/core/wordlift_core_post_entity_relations.php

Indentation +246 added lines, -246 removed lines

@@ -16,12 +16,12 @@ 
  */
 function wl_core_check_relation_predicate_is_supported( $predicate ) {
 
-	return in_array( $predicate, array(
-		WL_WHAT_RELATION,
-		WL_WHEN_RELATION,
-		WL_WHERE_RELATION,
-		WL_WHO_RELATION,
-	) );
+    return in_array( $predicate, array(
+        WL_WHAT_RELATION,
+        WL_WHEN_RELATION,
+        WL_WHERE_RELATION,
+        WL_WHO_RELATION,
+    ) );
 }
 
 /**
@@ -31,7 +31,7 @@ 
  */
 function wl_core_get_validation_rules() {
 
-	return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+    return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
 }
 
 /**
@@ -41,10 +41,10 @@ 
  */
 function wl_core_get_relation_instances_table_name() {
 
-	global $wpdb;
-	$table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+    global $wpdb;
+    $table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
 
-	return $table_name;
+    return $table_name;
 }
 
 /**
@@ -59,33 +59,33 @@ 
  */
 function wl_core_add_relation_instance( $subject_id, $predicate, $object_id ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
-		return false;
-	}
-
-	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
-		return false;
-	}
-
-	// Prepare interaction with db
-	global $wpdb;
-
-	// Checks passed. Add relation if not exists:
-	// See https://codex.wordpress.org/Class_Reference/wpdb#REPLACE_row
-	$wpdb->replace(
-		wl_core_get_relation_instances_table_name(),
-		array(
-			'subject_id' => $subject_id,
-			'predicate'  => $predicate,
-			'object_id'  => $object_id,
-		),
-		array( '%d', '%s', '%d' )
-	);
-
-	// Return record id
-	return $wpdb->insert_id;
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
+        return false;
+    }
+
+    // Checks on the given relation
+    if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+        return false;
+    }
+
+    // Prepare interaction with db
+    global $wpdb;
+
+    // Checks passed. Add relation if not exists:
+    // See https://codex.wordpress.org/Class_Reference/wpdb#REPLACE_row
+    $wpdb->replace(
+        wl_core_get_relation_instances_table_name(),
+        array(
+            'subject_id' => $subject_id,
+            'predicate'  => $predicate,
+            'object_id'  => $object_id,
+        ),
+        array( '%d', '%s', '%d' )
+    );
+
+    // Return record id
+    return $wpdb->insert_id;
 }
 
 /**
@@ -98,26 +98,26 @@ 
  */
 function wl_core_delete_relation_instances( $subject_id ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
-		return false;
-	}
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) ) {
+        return false;
+    }
 
-	// Prepare interaction with db
-	global $wpdb;
+    // Prepare interaction with db
+    global $wpdb;
 
-	// wl_write_log( "Going to delete relation instances [ subject_id :: $subject_id ]");
+    // wl_write_log( "Going to delete relation instances [ subject_id :: $subject_id ]");
 
-	// @see https://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
-	$wpdb->delete(
-		wl_core_get_relation_instances_table_name(),
-		array(
-			'subject_id' => $subject_id,
-		),
-		array( '%d' )
-	);
+    // @see https://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
+    $wpdb->delete(
+        wl_core_get_relation_instances_table_name(),
+        array(
+            'subject_id' => $subject_id,
+        ),
+        array( '%d' )
+    );
 
-	return true;
+    return true;
 }
 
 /**
@@ -133,18 +133,18 @@ 
  */
 function wl_core_validate_filters_for_related( $filters ) {
 
-	if ( ! is_array( $filters ) ) {
-		$filters = array();
-	}
+    if ( ! is_array( $filters ) ) {
+        $filters = array();
+    }
 
-	if ( ! isset( $filters['predicate'] ) ) {
-		$filters['predicate'] = null;
-	}
-	if ( ! isset( $filters['status'] ) ) {
-		$filters['status'] = null;
-	}
+    if ( ! isset( $filters['predicate'] ) ) {
+        $filters['predicate'] = null;
+    }
+    if ( ! isset( $filters['status'] ) ) {
+        $filters['status'] = null;
+    }
 
-	return $filters;
+    return $filters;
 }
 
 ///**
@@ -191,10 +191,10 @@ 
  */
 function wl_core_get_related_entity_ids( $subject_id, $filters = array() ) {
 
-	$status    = isset( $filters['status'] ) ? $filters['status'] : null;
-	$predicate = isset( $filters['predicate'] ) ? $filters['predicate'] : null;
+    $status    = isset( $filters['status'] ) ? $filters['status'] : null;
+    $predicate = isset( $filters['predicate'] ) ? $filters['predicate'] : null;
 
-	return Wordlift_Relation_Service::get_instance()->get_objects( $subject_id, 'ids', $predicate, $status );
+    return Wordlift_Relation_Service::get_instance()->get_objects( $subject_id, 'ids', $predicate, $status );
 
 //	$filters = wl_core_validate_filters_for_related( $filters );
 //
@@ -215,11 +215,11 @@ 
  */
 function wl_core_get_related_entities( $subject_id, $filters = array() ) {
 
-	$ids = wl_core_get_related_entity_ids( $subject_id, $filters );
+    $ids = wl_core_get_related_entity_ids( $subject_id, $filters );
 
-	return array_map( function ( $item ) {
-		return get_post( $item );
-	}, $ids );
+    return array_map( function ( $item ) {
+        return get_post( $item );
+    }, $ids );
 }
 
 //
@@ -297,12 +297,12 @@ 
  */
 function wl_core_get_related_post_ids( $object_id, $filters = array() ) {
 
-	$relation_service = Wordlift_Relation_Service::get_instance();
+    $relation_service = Wordlift_Relation_Service::get_instance();
 
-	$status    = isset( $filters['status'] ) ? $filters['status'] : null;
-	$predicate = isset( $filters['predicate'] ) ? $filters['predicate'] : null;
+    $status    = isset( $filters['status'] ) ? $filters['status'] : null;
+    $predicate = isset( $filters['predicate'] ) ? $filters['predicate'] : null;
 
-	return $relation_service->get_article_subjects( $object_id, 'ids', $predicate, $status );
+    return $relation_service->get_article_subjects( $object_id, 'ids', $predicate, $status );
 //
 //	$filters = wl_core_validate_filters_for_related( $filters );
 //
@@ -326,11 +326,11 @@ 
  */
 function wl_core_get_related_posts( $subject_id, $filters = array() ) {
 
-	$ids = wl_core_get_related_post_ids( $subject_id, $filters );
+    $ids = wl_core_get_related_post_ids( $subject_id, $filters );
 
-	return array_map( function ( $item ) {
-		return get_post( $item );
-	}, $ids );
+    return array_map( function ( $item ) {
+        return get_post( $item );
+    }, $ids );
 }
 
 ///**
@@ -415,108 +415,108 @@ 
  */
 function wl_core_sql_query_builder( $args ) {
 
-	// Prepare interaction with db
-	global $wpdb;
-
-	// Retrieve Wordlift relation instances table name
-	$table_name = wl_core_get_relation_instances_table_name();
-
-	// When type is set to `post` we're looking for `post`s that are not
-	// configured as entities.
-	// When the type is set to `entity` we're looking also for `post`s that are
-	// configured as entities.
-
-	// Since we want Find only articles, based on the entity type, we need
-	// to figure out the relevant sql statements to add to the join and where
-	// parts.
-	$tax_query = array(
-		array(
-			'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-			'field'    => 'slug',
-			'terms'    => 'article',
-			'operator' => 'entity' === $args['post_type'] ? 'NOT IN' : 'IN',
-		),
-	);
-
-	// Use "p" as the table to match the initial join.
-	$tax_sql = get_tax_sql( $tax_query, 'p', 'ID' );
-
-	// Sql Action
-	$sql = 'SELECT ';
-	// Determine what has to be returned depending on 'get' argument value
-	switch ( $args['get'] ) {
-		case 'posts':
-			$sql .= 'p.*';
-			break;
-		case 'post_ids':
-			$sql .= 'p.id';
-			break;
-	}
-
-	// If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
-	$join_column = $args['as'] . '_id';
-
-	$sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
-
-	// Changing left join generate by the tax query into an inner since the term relationship has to exist.
-	$sql .= str_replace( 'LEFT JOIN', 'INNER JOIN', $tax_sql['join'] );
-
-	// Sql add post type filter
-	$post_types = Wordlift_Entity_Service::valid_entity_post_types();
-	$sql        .= " AND p.post_type IN ('" . join( "', '", esc_sql( $post_types ) ) . "') AND";
-
-	// Sql add post status filter
-	if ( isset( $args['post_status'] ) && ! is_null( $args['post_status'] ) ) {
-		$sql .= $wpdb->prepare( ' p.post_status = %s AND', $args['post_status'] );
-	}
-
-	// Add filtering conditions
-	// If we look for posts related as objects this means that
-	// related_to is a reference for a subject: subject_id is the filtering column
-	// If we look for posts related as subject this means that
-	// related_to is reference for an object: object_id is the filtering column
-
-	$filtering_column = ( 'object' == $args['as'] ) ? 'subject_id' : 'object_id';
-
-	if ( isset( $args['related_to'] ) ) {
-		$sql .= $wpdb->prepare( " r.$filtering_column = %d", $args['related_to'] );
-	}
-	if ( isset( $args['related_to'] ) && isset( $args['related_to__in'] ) ) {
-		$sql .= ' AND';
-	}
-	if ( isset( $args['related_to__in'] ) ) {
-		$sql .= " r.$filtering_column IN (" . implode( ',', $args['related_to__in'] ) . ')';
-		// The IDs used for filtering shouldn't be in the results.
-		$sql .= " AND p.ID NOT IN (" . implode( ',', $args['related_to__in'] ) . ')';
-	}
-	if ( isset( $args['post__not_in'] ) ) {
-		$sql .= ' AND r.' . $args['as'] . '_id NOT IN (' . implode( ',', $args['post__not_in'] ) . ')';
-	}
-	if ( isset( $args['post__in'] ) ) {
-		$sql .= ' AND r.' . $args['as'] . '_id IN (' . implode( ',', $args['post__in'] ) . ')';
-	}
-	// Add predicate filter if required.
-	if ( isset( $args['with_predicate'] ) ) {
-		// Sql Inner Join clause.
-		$sql .= $wpdb->prepare( ' AND r.predicate = %s', $args['with_predicate'] );
-	}
-
-	// Add the taxonomy related sql.
-	$sql .= $tax_sql['where'];
-
-	// Add a group by clause to avoid duplicated rows
-	// @todo: isn't a distinct a better choice?
-	$sql .= ' GROUP BY p.id';
-
-	// @todo: how does `first` represent the limit?
-	if ( isset( $args['first'] ) && is_numeric( $args['first'] ) ) {
-		// Sql Inner Join clause.
-		$sql .= $wpdb->prepare( ' LIMIT %d', $args['first'] );
-	}
-	// Close sql statement
-	$sql .= ';';
-
-	return $sql;
+    // Prepare interaction with db
+    global $wpdb;
+
+    // Retrieve Wordlift relation instances table name
+    $table_name = wl_core_get_relation_instances_table_name();
+
+    // When type is set to `post` we're looking for `post`s that are not
+    // configured as entities.
+    // When the type is set to `entity` we're looking also for `post`s that are
+    // configured as entities.
+
+    // Since we want Find only articles, based on the entity type, we need
+    // to figure out the relevant sql statements to add to the join and where
+    // parts.
+    $tax_query = array(
+        array(
+            'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+            'field'    => 'slug',
+            'terms'    => 'article',
+            'operator' => 'entity' === $args['post_type'] ? 'NOT IN' : 'IN',
+        ),
+    );
+
+    // Use "p" as the table to match the initial join.
+    $tax_sql = get_tax_sql( $tax_query, 'p', 'ID' );
+
+    // Sql Action
+    $sql = 'SELECT ';
+    // Determine what has to be returned depending on 'get' argument value
+    switch ( $args['get'] ) {
+        case 'posts':
+            $sql .= 'p.*';
+            break;
+        case 'post_ids':
+            $sql .= 'p.id';
+            break;
+    }
+
+    // If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
+    $join_column = $args['as'] . '_id';
+
+    $sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
+
+    // Changing left join generate by the tax query into an inner since the term relationship has to exist.
+    $sql .= str_replace( 'LEFT JOIN', 'INNER JOIN', $tax_sql['join'] );
+
+    // Sql add post type filter
+    $post_types = Wordlift_Entity_Service::valid_entity_post_types();
+    $sql        .= " AND p.post_type IN ('" . join( "', '", esc_sql( $post_types ) ) . "') AND";
+
+    // Sql add post status filter
+    if ( isset( $args['post_status'] ) && ! is_null( $args['post_status'] ) ) {
+        $sql .= $wpdb->prepare( ' p.post_status = %s AND', $args['post_status'] );
+    }
+
+    // Add filtering conditions
+    // If we look for posts related as objects this means that
+    // related_to is a reference for a subject: subject_id is the filtering column
+    // If we look for posts related as subject this means that
+    // related_to is reference for an object: object_id is the filtering column
+
+    $filtering_column = ( 'object' == $args['as'] ) ? 'subject_id' : 'object_id';
+
+    if ( isset( $args['related_to'] ) ) {
+        $sql .= $wpdb->prepare( " r.$filtering_column = %d", $args['related_to'] );
+    }
+    if ( isset( $args['related_to'] ) && isset( $args['related_to__in'] ) ) {
+        $sql .= ' AND';
+    }
+    if ( isset( $args['related_to__in'] ) ) {
+        $sql .= " r.$filtering_column IN (" . implode( ',', $args['related_to__in'] ) . ')';
+        // The IDs used for filtering shouldn't be in the results.
+        $sql .= " AND p.ID NOT IN (" . implode( ',', $args['related_to__in'] ) . ')';
+    }
+    if ( isset( $args['post__not_in'] ) ) {
+        $sql .= ' AND r.' . $args['as'] . '_id NOT IN (' . implode( ',', $args['post__not_in'] ) . ')';
+    }
+    if ( isset( $args['post__in'] ) ) {
+        $sql .= ' AND r.' . $args['as'] . '_id IN (' . implode( ',', $args['post__in'] ) . ')';
+    }
+    // Add predicate filter if required.
+    if ( isset( $args['with_predicate'] ) ) {
+        // Sql Inner Join clause.
+        $sql .= $wpdb->prepare( ' AND r.predicate = %s', $args['with_predicate'] );
+    }
+
+    // Add the taxonomy related sql.
+    $sql .= $tax_sql['where'];
+
+    // Add a group by clause to avoid duplicated rows
+    // @todo: isn't a distinct a better choice?
+    $sql .= ' GROUP BY p.id';
+
+    // @todo: how does `first` represent the limit?
+    if ( isset( $args['first'] ) && is_numeric( $args['first'] ) ) {
+        // Sql Inner Join clause.
+        $sql .= $wpdb->prepare( ' LIMIT %d', $args['first'] );
+    }
+    // Close sql statement
+    $sql .= ';';
+
+    return $sql;
 
 }
 
@@ -534,70 +534,70 @@ 
  */
 function wl_core_get_posts( $args, $returned_type = OBJECT ) {
 
-	// Merge given args with defaults args value
-	$args = array_merge( array(
-		'with_predicate' => null,
-		'as'             => 'subject',
-		'post_type'      => 'post',
-		'get'            => 'posts',
-		'post_status'    => null,
-	), $args );
-
-	// Arguments validation rules
-	// At least one between related_to and related_to__in has to be set
-	if ( ! isset( $args['related_to'] ) && ! isset( $args['related_to__in'] ) ) {
-		return false;
-	}
-	if ( isset( $args['related_to'] ) && ! is_numeric( $args['related_to'] ) ) {
-		return false;
-	}
-
-	// The same check is applied to post_in, post__not_in and related_to__in options
-	// Only arrays with at least one numeric value are considerad valid
-	// The argument value is further sanitized in order to clean up not numeric values
-	foreach (
-		array(
-			'post__in',
-			'post__not_in',
-			'related_to__in',
-		) as $option_name
-	) {
-		if ( isset( $args[ $option_name ] ) ) {
-			if ( ! is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
-				return false;
-			}
-			// Sanitize value removing non numeric values from the array
-			$args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
-		}
-	}
-	// Performing validation rules
-	foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
-		if ( isset( $args[ $option_name ] ) && ! is_null( $args[ $option_name ] ) ) {
-			if ( ! in_array( $args[ $option_name ], $accepeted_values ) ) {
-				return false;
-			}
-		}
-	}
-
-	// Prepare interaction with db
-	global $wpdb;
-
-	// Build sql statement with given arguments
-	$sql_statement = wl_core_sql_query_builder( $args );
-
-	// If ids are required, returns a one-dimensional array containing ids.
-	// Otherwise an array of associative arrays representing the post | relation object
-	if ( 'post_ids' == $args['get'] ) {
-		# See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
-		$results = $wpdb->get_col( $sql_statement );
-	} else {
-		$results = $wpdb->get_results( $sql_statement, $returned_type );
-	}
-	// If there were an error performing the query then false is returned
-	if ( ! empty( $wpdb->last_error ) ) {
-		return false;
-	}
-
-	// Finally
-	return $results;
+    // Merge given args with defaults args value
+    $args = array_merge( array(
+        'with_predicate' => null,
+        'as'             => 'subject',
+        'post_type'      => 'post',
+        'get'            => 'posts',
+        'post_status'    => null,
+    ), $args );
+
+    // Arguments validation rules
+    // At least one between related_to and related_to__in has to be set
+    if ( ! isset( $args['related_to'] ) && ! isset( $args['related_to__in'] ) ) {
+        return false;
+    }
+    if ( isset( $args['related_to'] ) && ! is_numeric( $args['related_to'] ) ) {
+        return false;
+    }
+
+    // The same check is applied to post_in, post__not_in and related_to__in options
+    // Only arrays with at least one numeric value are considerad valid
+    // The argument value is further sanitized in order to clean up not numeric values
+    foreach (
+        array(
+            'post__in',
+            'post__not_in',
+            'related_to__in',
+        ) as $option_name
+    ) {
+        if ( isset( $args[ $option_name ] ) ) {
+            if ( ! is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
+                return false;
+            }
+            // Sanitize value removing non numeric values from the array
+            $args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
+        }
+    }
+    // Performing validation rules
+    foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
+        if ( isset( $args[ $option_name ] ) && ! is_null( $args[ $option_name ] ) ) {
+            if ( ! in_array( $args[ $option_name ], $accepeted_values ) ) {
+                return false;
+            }
+        }
+    }
+
+    // Prepare interaction with db
+    global $wpdb;
+
+    // Build sql statement with given arguments
+    $sql_statement = wl_core_sql_query_builder( $args );
+
+    // If ids are required, returns a one-dimensional array containing ids.
+    // Otherwise an array of associative arrays representing the post | relation object
+    if ( 'post_ids' == $args['get'] ) {
+        # See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
+        $results = $wpdb->get_col( $sql_statement );
+    } else {
+        $results = $wpdb->get_results( $sql_statement, $returned_type );
+    }
+    // If there were an error performing the query then false is returned
+    if ( ! empty( $wpdb->last_error ) ) {
+        return false;
+    }
+
+    // Finally
+    return $results;
 }

Spacing +73 added lines, -73 removed lines

@@ -14,14 +14,14 @@ 
  *
  * @return boolean Return true if supported, false otherwise
  */
-function wl_core_check_relation_predicate_is_supported( $predicate ) {
+function wl_core_check_relation_predicate_is_supported($predicate) {
 
-	return in_array( $predicate, array(
+	return in_array($predicate, array(
 		WL_WHAT_RELATION,
 		WL_WHEN_RELATION,
 		WL_WHERE_RELATION,
 		WL_WHO_RELATION,
-	) );
+	));
 }
 
 /**
@@ -31,7 +31,7 @@ 
  */
 function wl_core_get_validation_rules() {
 
-	return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+	return unserialize(WL_CORE_GET_POSTS_VALIDATION_RULES);
 }
 
 /**
@@ -42,7 +42,7 @@ 
 function wl_core_get_relation_instances_table_name() {
 
 	global $wpdb;
-	$table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+	$table_name = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
 
 	return $table_name;
 }
@@ -57,15 +57,15 @@ 
  * @uses   $wpdb->replace() to perform the query
  * @return integer|boolean Return then relation instance ID or false.
  */
-function wl_core_add_relation_instance( $subject_id, $predicate, $object_id ) {
+function wl_core_add_relation_instance($subject_id, $predicate, $object_id) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) || ! is_numeric( $object_id ) ) {
+	if ( ! is_numeric($subject_id) || ! is_numeric($object_id)) {
 		return false;
 	}
 
 	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+	if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
 		return false;
 	}
 
@@ -81,7 +81,7 @@ 
 			'predicate'  => $predicate,
 			'object_id'  => $object_id,
 		),
-		array( '%d', '%s', '%d' )
+		array('%d', '%s', '%d')
 	);
 
 	// Return record id
@@ -96,10 +96,10 @@ 
  *
  * @return boolean False for failure. True for success.
  */
-function wl_core_delete_relation_instances( $subject_id ) {
+function wl_core_delete_relation_instances($subject_id) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
+	if ( ! is_numeric($subject_id)) {
 		return false;
 	}
 
@@ -114,7 +114,7 @@ 
 		array(
 			'subject_id' => $subject_id,
 		),
-		array( '%d' )
+		array('%d')
 	);
 
 	return true;
@@ -131,16 +131,16 @@ 
  *      'status'    => null
  *  );
  */
-function wl_core_validate_filters_for_related( $filters ) {
+function wl_core_validate_filters_for_related($filters) {
 
-	if ( ! is_array( $filters ) ) {
+	if ( ! is_array($filters)) {
 		$filters = array();
 	}
 
-	if ( ! isset( $filters['predicate'] ) ) {
+	if ( ! isset($filters['predicate'])) {
 		$filters['predicate'] = null;
 	}
-	if ( ! isset( $filters['status'] ) ) {
+	if ( ! isset($filters['status'])) {
 		$filters['status'] = null;
 	}
 
@@ -189,12 +189,12 @@ 
  *
  * @return array Array of post entity objects.
  */
-function wl_core_get_related_entity_ids( $subject_id, $filters = array() ) {
+function wl_core_get_related_entity_ids($subject_id, $filters = array()) {
 
-	$status    = isset( $filters['status'] ) ? $filters['status'] : null;
-	$predicate = isset( $filters['predicate'] ) ? $filters['predicate'] : null;
+	$status    = isset($filters['status']) ? $filters['status'] : null;
+	$predicate = isset($filters['predicate']) ? $filters['predicate'] : null;
 
-	return Wordlift_Relation_Service::get_instance()->get_objects( $subject_id, 'ids', $predicate, $status );
+	return Wordlift_Relation_Service::get_instance()->get_objects($subject_id, 'ids', $predicate, $status);
 
 //	$filters = wl_core_validate_filters_for_related( $filters );
 //
@@ -213,13 +213,13 @@ 
  *
  * @return array An array of {@link WP_Post}s.
  */
-function wl_core_get_related_entities( $subject_id, $filters = array() ) {
+function wl_core_get_related_entities($subject_id, $filters = array()) {
 
-	$ids = wl_core_get_related_entity_ids( $subject_id, $filters );
+	$ids = wl_core_get_related_entity_ids($subject_id, $filters);
 
-	return array_map( function ( $item ) {
-		return get_post( $item );
-	}, $ids );
+	return array_map(function($item) {
+		return get_post($item);
+	}, $ids);
 }
 
 //
@@ -295,14 +295,14 @@ 
  *
  * @return array Array of objects.
  */
-function wl_core_get_related_post_ids( $object_id, $filters = array() ) {
+function wl_core_get_related_post_ids($object_id, $filters = array()) {
 
 	$relation_service = Wordlift_Relation_Service::get_instance();
 
-	$status    = isset( $filters['status'] ) ? $filters['status'] : null;
-	$predicate = isset( $filters['predicate'] ) ? $filters['predicate'] : null;
+	$status    = isset($filters['status']) ? $filters['status'] : null;
+	$predicate = isset($filters['predicate']) ? $filters['predicate'] : null;
 
-	return $relation_service->get_article_subjects( $object_id, 'ids', $predicate, $status );
+	return $relation_service->get_article_subjects($object_id, 'ids', $predicate, $status);
 //
 //	$filters = wl_core_validate_filters_for_related( $filters );
 //
@@ -324,13 +324,13 @@ 
  *
  * @return array An array of {@link WP_Post}s.
  */
-function wl_core_get_related_posts( $subject_id, $filters = array() ) {
+function wl_core_get_related_posts($subject_id, $filters = array()) {
 
-	$ids = wl_core_get_related_post_ids( $subject_id, $filters );
+	$ids = wl_core_get_related_post_ids($subject_id, $filters);
 
-	return array_map( function ( $item ) {
-		return get_post( $item );
-	}, $ids );
+	return array_map(function($item) {
+		return get_post($item);
+	}, $ids);
 }
 
 ///**
@@ -413,7 +413,7 @@ 
  *
  * @return string|false String representing a sql statement, or false in case of error
  */
-function wl_core_sql_query_builder( $args ) {
+function wl_core_sql_query_builder($args) {
 
 	// Prepare interaction with db
 	global $wpdb;
@@ -439,12 +439,12 @@ 
 	);
 
 	// Use "p" as the table to match the initial join.
-	$tax_sql = get_tax_sql( $tax_query, 'p', 'ID' );
+	$tax_sql = get_tax_sql($tax_query, 'p', 'ID');
 
 	// Sql Action
 	$sql = 'SELECT ';
 	// Determine what has to be returned depending on 'get' argument value
-	switch ( $args['get'] ) {
+	switch ($args['get']) {
 		case 'posts':
 			$sql .= 'p.*';
 			break;
@@ -454,20 +454,20 @@ 
 	}
 
 	// If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
-	$join_column = $args['as'] . '_id';
+	$join_column = $args['as'].'_id';
 
 	$sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
 
 	// Changing left join generate by the tax query into an inner since the term relationship has to exist.
-	$sql .= str_replace( 'LEFT JOIN', 'INNER JOIN', $tax_sql['join'] );
+	$sql .= str_replace('LEFT JOIN', 'INNER JOIN', $tax_sql['join']);
 
 	// Sql add post type filter
 	$post_types = Wordlift_Entity_Service::valid_entity_post_types();
-	$sql        .= " AND p.post_type IN ('" . join( "', '", esc_sql( $post_types ) ) . "') AND";
+	$sql .= " AND p.post_type IN ('".join("', '", esc_sql($post_types))."') AND";
 
 	// Sql add post status filter
-	if ( isset( $args['post_status'] ) && ! is_null( $args['post_status'] ) ) {
-		$sql .= $wpdb->prepare( ' p.post_status = %s AND', $args['post_status'] );
+	if (isset($args['post_status']) && ! is_null($args['post_status'])) {
+		$sql .= $wpdb->prepare(' p.post_status = %s AND', $args['post_status']);
 	}
 
 	// Add filtering conditions
@@ -476,29 +476,29 @@ 
 	// If we look for posts related as subject this means that
 	// related_to is reference for an object: object_id is the filtering column
 
-	$filtering_column = ( 'object' == $args['as'] ) ? 'subject_id' : 'object_id';
+	$filtering_column = ('object' == $args['as']) ? 'subject_id' : 'object_id';
 
-	if ( isset( $args['related_to'] ) ) {
-		$sql .= $wpdb->prepare( " r.$filtering_column = %d", $args['related_to'] );
+	if (isset($args['related_to'])) {
+		$sql .= $wpdb->prepare(" r.$filtering_column = %d", $args['related_to']);
 	}
-	if ( isset( $args['related_to'] ) && isset( $args['related_to__in'] ) ) {
+	if (isset($args['related_to']) && isset($args['related_to__in'])) {
 		$sql .= ' AND';
 	}
-	if ( isset( $args['related_to__in'] ) ) {
-		$sql .= " r.$filtering_column IN (" . implode( ',', $args['related_to__in'] ) . ')';
+	if (isset($args['related_to__in'])) {
+		$sql .= " r.$filtering_column IN (".implode(',', $args['related_to__in']).')';
 		// The IDs used for filtering shouldn't be in the results.
-		$sql .= " AND p.ID NOT IN (" . implode( ',', $args['related_to__in'] ) . ')';
+		$sql .= " AND p.ID NOT IN (".implode(',', $args['related_to__in']).')';
 	}
-	if ( isset( $args['post__not_in'] ) ) {
-		$sql .= ' AND r.' . $args['as'] . '_id NOT IN (' . implode( ',', $args['post__not_in'] ) . ')';
+	if (isset($args['post__not_in'])) {
+		$sql .= ' AND r.'.$args['as'].'_id NOT IN ('.implode(',', $args['post__not_in']).')';
 	}
-	if ( isset( $args['post__in'] ) ) {
-		$sql .= ' AND r.' . $args['as'] . '_id IN (' . implode( ',', $args['post__in'] ) . ')';
+	if (isset($args['post__in'])) {
+		$sql .= ' AND r.'.$args['as'].'_id IN ('.implode(',', $args['post__in']).')';
 	}
 	// Add predicate filter if required.
-	if ( isset( $args['with_predicate'] ) ) {
+	if (isset($args['with_predicate'])) {
 		// Sql Inner Join clause.
-		$sql .= $wpdb->prepare( ' AND r.predicate = %s', $args['with_predicate'] );
+		$sql .= $wpdb->prepare(' AND r.predicate = %s', $args['with_predicate']);
 	}
 
 	// Add the taxonomy related sql.
@@ -509,9 +509,9 @@ 
 	$sql .= ' GROUP BY p.id';
 
 	// @todo: how does `first` represent the limit?
-	if ( isset( $args['first'] ) && is_numeric( $args['first'] ) ) {
+	if (isset($args['first']) && is_numeric($args['first'])) {
 		// Sql Inner Join clause.
-		$sql .= $wpdb->prepare( ' LIMIT %d', $args['first'] );
+		$sql .= $wpdb->prepare(' LIMIT %d', $args['first']);
 	}
 	// Close sql statement
 	$sql .= ';';
@@ -532,23 +532,23 @@ 
  *
  * @return array|false List of WP_Post objects or list of WP_Post ids. False in case of error or invalid params
  */
-function wl_core_get_posts( $args, $returned_type = OBJECT ) {
+function wl_core_get_posts($args, $returned_type = OBJECT) {
 
 	// Merge given args with defaults args value
-	$args = array_merge( array(
+	$args = array_merge(array(
 		'with_predicate' => null,
 		'as'             => 'subject',
 		'post_type'      => 'post',
 		'get'            => 'posts',
 		'post_status'    => null,
-	), $args );
+	), $args);
 
 	// Arguments validation rules
 	// At least one between related_to and related_to__in has to be set
-	if ( ! isset( $args['related_to'] ) && ! isset( $args['related_to__in'] ) ) {
+	if ( ! isset($args['related_to']) && ! isset($args['related_to__in'])) {
 		return false;
 	}
-	if ( isset( $args['related_to'] ) && ! is_numeric( $args['related_to'] ) ) {
+	if (isset($args['related_to']) && ! is_numeric($args['related_to'])) {
 		return false;
 	}
 
@@ -562,18 +562,18 @@ 
 			'related_to__in',
 		) as $option_name
 	) {
-		if ( isset( $args[ $option_name ] ) ) {
-			if ( ! is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
+		if (isset($args[$option_name])) {
+			if ( ! is_array($args[$option_name]) || 0 == count(array_filter($args[$option_name], "is_numeric"))) {
 				return false;
 			}
 			// Sanitize value removing non numeric values from the array
-			$args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
+			$args[$option_name] = array_filter($args[$option_name], "is_numeric");
 		}
 	}
 	// Performing validation rules
-	foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
-		if ( isset( $args[ $option_name ] ) && ! is_null( $args[ $option_name ] ) ) {
-			if ( ! in_array( $args[ $option_name ], $accepeted_values ) ) {
+	foreach (wl_core_get_validation_rules() as $option_name => $accepeted_values) {
+		if (isset($args[$option_name]) && ! is_null($args[$option_name])) {
+			if ( ! in_array($args[$option_name], $accepeted_values)) {
 				return false;
 			}
 		}
@@ -583,18 +583,18 @@ 
 	global $wpdb;
 
 	// Build sql statement with given arguments
-	$sql_statement = wl_core_sql_query_builder( $args );
+	$sql_statement = wl_core_sql_query_builder($args);
 
 	// If ids are required, returns a one-dimensional array containing ids.
 	// Otherwise an array of associative arrays representing the post | relation object
-	if ( 'post_ids' == $args['get'] ) {
+	if ('post_ids' == $args['get']) {
 		# See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
-		$results = $wpdb->get_col( $sql_statement );
+		$results = $wpdb->get_col($sql_statement);
 	} else {
-		$results = $wpdb->get_results( $sql_statement, $returned_type );
+		$results = $wpdb->get_results($sql_statement, $returned_type);
 	}
 	// If there were an error performing the query then false is returned
-	if ( ! empty( $wpdb->last_error ) ) {
+	if ( ! empty($wpdb->last_error)) {
 		return false;
 	}
 

src/modules/linked_data/wordlift_linked_data.php

Indentation +320 added lines, -320 removed lines

@@ -18,19 +18,19 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		return;
-	}
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        return;
+    }
 
-	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+    // unhook this function so it doesn't loop infinitely
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
 
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
 
-	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    // re-hook this function
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -44,143 +44,143 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		return;
-	}
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        return;
+    }
 
-	// get the current post.
-	$post = get_post( $post_id );
+    // get the current post.
+    $post = get_post( $post_id );
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
 
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( json_encode( $_POST['wl_entities'] ) );
+        wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
+        wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
+        wl_write_log( "]" );
 
-		$entities_via_post = $_POST['wl_entities'];
-		$boxes_via_post    = $_POST['wl_boxes'];
+        $entities_via_post = $_POST['wl_entities'];
+        $boxes_via_post    = $_POST['wl_boxes'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
 
-			// Only if the current entity is created from scratch let's avoid to
-			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
-				$entity['main_type'] : null;
-
-			// 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 = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
+            // 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 = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
 
-			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
-				Wordlift_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;
-	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-	}
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+    // Save each entity and store the post id.
+    foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+        $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+    }
 
-	// Update the post content
-	wp_update_post( array(
-		'ID'           => $post->ID,
-		'post_content' => $updated_post_content,
-	) );
+    // Update the post content
+    wp_update_post( array(
+        'ID'           => $post->ID,
+        'post_content' => $updated_post_content,
+    ) );
 
-	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+    // Extract related/referenced entities from text.
+    $disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
 
-	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+    // Reset previously saved instances
+    wl_core_delete_relation_instances( $post_id );
 
-	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+    // Save relation instances
+    foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
 
-		wl_core_add_relation_instance(
-			$post_id,
-			Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
-			$referenced_entity_id
-		);
+        wl_core_add_relation_instance(
+            $post_id,
+            Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
+            $referenced_entity_id
+        );
 
-	}
+    }
 
-	if ( isset( $_POST['wl_entities'] ) ) {
-		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
-			$_POST['wl_metadata'] : array();
+    if ( isset( $_POST['wl_entities'] ) ) {
+        // Save post metadata if available
+        $metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+            $_POST['wl_metadata'] : array();
 
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC,
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	// Push the post to Redlink.
-	Wordlift_Linked_Data_Service::get_instance()->push( $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC,
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri = ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    // Push the post to Redlink.
+    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' );
@@ -203,185 +203,185 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	$uri              = $entity_data['uri'];
-	$label            = $entity_data['label'];
-	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
-	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (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 ) ) {
-		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();
-
-	// 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 ) ) {
-		wl_write_log( ': error occurred' );
-
-		// inform an error occurred.
-		return null;
-	}
-
-	wl_set_entity_main_type( $post_id, $type_uri );
-
-	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
-
-	// Get a dataset URI for the entity.
-	$wl_uri = wl_build_entity_uri( $post_id );
-
-	// Save the entity URI.
-	wl_set_entity_uri( $post_id, $wl_uri );
-
-	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
-	}
-
-	$new_uri = wl_get_entity_uri( $post_id );
-
-	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
-
-	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = wl_save_image( $image_remote_url );
-
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
-
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
-
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+    $uri              = $entity_data['uri'];
+    $label            = $entity_data['label'];
+    $type_uri         = $entity_data['main_type'];
+    $entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+    $description      = $entity_data['description'];
+    $images           = isset( $entity_data['image'] ) ? (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 ) ) {
+        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();
+
+    // 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 ) ) {
+        wl_write_log( ': error occurred' );
+
+        // inform an error occurred.
+        return null;
+    }
+
+    wl_set_entity_main_type( $post_id, $type_uri );
+
+    // Save the entity types.
+    wl_set_entity_rdf_types( $post_id, $entity_types );
+
+    // Get a dataset URI for the entity.
+    $wl_uri = wl_build_entity_uri( $post_id );
+
+    // Save the entity URI.
+    wl_set_entity_uri( $post_id, $wl_uri );
+
+    // Add the uri to the sameAs data if it's not a local URI.
+    if ( $wl_uri !== $uri ) {
+        array_push( $same_as, $uri );
+    }
+
+    $new_uri = wl_get_entity_uri( $post_id );
+
+    // Save the sameAs data for the entity.
+    wl_schema_set_value( $post_id, 'sameAs', $same_as );
+
+    // Save the other properties (latitude, langitude, startDate, endDate, etc.)
+    foreach ( $other_properties as $property_name => $property_value ) {
+        wl_schema_set_value( $post_id, $property_name, $property_value );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = wl_save_image( $image_remote_url );
+
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
+
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
+
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
 
-		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
-	}
+        // Set it as the featured image.
+        set_post_thumbnail( $post_id, $attachment_id );
+    }
 
-	// The entity is pushed to Redlink on save by the function hooked to save_post.
-	// save the entity in the triple store.
-	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 );
 }
 
 /**
@@ -395,40 +395,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 +112 added lines, -112 removed lines

@@ -7,7 +7,7 @@ 
  * @subpackage Wordlift/modules/linked_data
  */
 
-require_once( 'wordlift_linked_data_images.php' );
+require_once('wordlift_linked_data_images.php');
 
 /**
  * Receive events from post saves, and split them according to the post type.
@@ -16,24 +16,24 @@ 
  *
  * @param int $post_id The post id.
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
 		return;
 	}
 
 	// unhook this function so it doesn't loop infinitely
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// re-hook this function
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -42,17 +42,17 @@ 
  *
  * @param int $post_id The post id being saved.
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -60,44 +60,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 = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $entity_uri );
+			$ie = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($entity_uri);
 
 			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
+			$uri = (null === $ie) ?
 				Wordlift_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;
 			}
@@ -106,8 +106,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);
 			}
 
 		}
@@ -117,36 +117,36 @@ 
 	// Replace tmp uris in content post if needed
 	$updated_post_content = $post->post_content;
 	// Save each entity and store the post id.
-	foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-		$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+	foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+		$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 	}
 
 	// Update the post content
-	wp_update_post( array(
+	wp_update_post(array(
 		'ID'           => $post->ID,
 		'post_content' => $updated_post_content,
-	) );
+	));
 
 	// Extract related/referenced entities from text.
-	$disambiguated_entities = wl_linked_data_content_get_embedded_entities( $updated_post_content );
+	$disambiguated_entities = wl_linked_data_content_get_embedded_entities($updated_post_content);
 
 	// Reset previously saved instances
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 	// Save relation instances
-	foreach ( array_unique( $disambiguated_entities ) as $referenced_entity_id ) {
+	foreach (array_unique($disambiguated_entities) as $referenced_entity_id) {
 
 		wl_core_add_relation_instance(
 			$post_id,
-			Wordlift_Entity_Service::get_instance()->get_classification_scope_for( $referenced_entity_id ),
+			Wordlift_Entity_Service::get_instance()->get_classification_scope_for($referenced_entity_id),
 			$referenced_entity_id
 		);
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) {
+	if (isset($_POST['wl_entities'])) {
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ?
 			$_POST['wl_metadata'] : array();
 
 		$fields = array(
@@ -155,35 +155,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 = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri );
+			$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if ($field === Wordlift_Schema_Service::FIELD_TOPIC) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
 	// Push the post to Redlink.
-	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
@@ -201,29 +201,29 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
 	$uri              = $entity_data['uri'];
 	$label            = $entity_data['label'];
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (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 ) ) {
+	if (null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_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,
@@ -233,7 +233,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"
@@ -242,18 +242,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
@@ -263,90 +263,90 @@ 
 	// 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();
 
 	// 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 ) ) {
-		wl_write_log( ': error occurred' );
+	if (is_wp_error($post_id)) {
+		wl_write_log(': error occurred');
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = wl_build_entity_uri( $post_id );
+	$wl_uri = wl_build_entity_uri($post_id);
 
 	// Save the entity URI.
-	wl_set_entity_uri( $post_id, $wl_uri );
+	wl_set_entity_uri($post_id, $wl_uri);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
+	if ($wl_uri !== $uri) {
+		array_push($same_as, $uri);
 	}
 
-	$new_uri = wl_get_entity_uri( $post_id );
+	$new_uri = wl_get_entity_uri($post_id);
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = wl_save_image( $image_remote_url );
+		$image = wl_save_image($image_remote_url);
 
 		// Get the local URL.
 		$filename     = $image['path'];
@@ -364,24 +364,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);
 }
 
 /**
@@ -393,10 +393,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';
@@ -407,8 +407,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();
 	}
@@ -417,13 +417,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/modules/geo_widget/wordlift_geo_widget.php

Indentation +58 added lines, -58 removed lines

@@ -9,32 +9,32 @@ 
 
 function wordlift_geo_widget_shortcode( $atts, $content = null ) {
 
-	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
-		'width'     => '100%',
-		'height'    => '300px',
-		'latitude'  => 0.0,
-		'longitude' => 0.0,
-		'zoom'      => 5,
-
-	), $atts );
-
-	// Add leaflet css and library.
-	wp_enqueue_style( 'leaflet_css', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
-	wp_enqueue_script( 'leaflet_js', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js' );
-
-	ob_start(); // Collect the buffer.
-	wordlift_geo_widget_html(
-		$params['width'],
-		$params['height'],
-		$params['latitude'],
-		$params['longitude'],
-		$params['zoom'],
-		$content
-	);
-
-	// Return the accumulated buffer.
-	return ob_get_clean();
+    // Extract attributes and set default values.
+    $params = shortcode_atts( array(
+        'width'     => '100%',
+        'height'    => '300px',
+        'latitude'  => 0.0,
+        'longitude' => 0.0,
+        'zoom'      => 5,
+
+    ), $atts );
+
+    // Add leaflet css and library.
+    wp_enqueue_style( 'leaflet_css', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
+    wp_enqueue_script( 'leaflet_js', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js' );
+
+    ob_start(); // Collect the buffer.
+    wordlift_geo_widget_html(
+        $params['width'],
+        $params['height'],
+        $params['latitude'],
+        $params['longitude'],
+        $params['zoom'],
+        $content
+    );
+
+    // Return the accumulated buffer.
+    return ob_get_clean();
 
 }
 
@@ -42,24 +42,24 @@ 
 
 function wl_geo_widget_layer_shortcode( $atts ) {
 
-	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
-		'name'  => '',
-		'label' => '',
-	), $atts );
+    // Extract attributes and set default values.
+    $params = shortcode_atts( array(
+        'name'  => '',
+        'label' => '',
+    ), $atts );
 
-	// Return if a SPARQL Query name hasn't been provided.
-	if ( empty( $params['name'] ) ) {
-		return;
-	}
+    // Return if a SPARQL Query name hasn't been provided.
+    if ( empty( $params['name'] ) ) {
+        return;
+    }
 
-	// Set the layer label.
-	$label_j = json_encode( empty( $params['label'] ) ? $params['name'] : $params['label'] );
+    // Set the layer label.
+    $label_j = json_encode( empty( $params['label'] ) ? $params['name'] : $params['label'] );
 
-	// Define the AJAX Url.
-	$ajax_url = admin_url( 'admin-ajax.php?action=wl_sparql&format=geojson&slug=' . urlencode( $params['name'] ) );
+    // Define the AJAX Url.
+    $ajax_url = admin_url( 'admin-ajax.php?action=wl_sparql&format=geojson&slug=' . urlencode( $params['name'] ) );
 
-	echo <<<EOF
+    echo <<<EOF
 
         $.ajax( '$ajax_url', {
             success: function( data ) {
@@ -90,21 +90,21 @@ 
 
 function wl_geo_widget_marker_shortcode( $atts ) {
 
-	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
-		'latitude'  => null,
-		'longitude' => null,
-	), $atts );
+    // Extract attributes and set default values.
+    $params = shortcode_atts( array(
+        'latitude'  => null,
+        'longitude' => null,
+    ), $atts );
 
-	// Return if either latitude or longitude haven't been provided.
-	if ( empty( $params['latitude'] ) || empty( $params['longitude'] ) ) {
-		return;
-	}
+    // Return if either latitude or longitude haven't been provided.
+    if ( empty( $params['latitude'] ) || empty( $params['longitude'] ) ) {
+        return;
+    }
 
-	$latitude_j  = json_encode( $params['latitude'] );
-	$longitude_j = json_encode( $params['longitude'] );
+    $latitude_j  = json_encode( $params['latitude'] );
+    $longitude_j = json_encode( $params['longitude'] );
 
-	echo <<<EOF
+    echo <<<EOF
 
 		L.marker([$latitude_j, $longitude_j]).addTo(map);
 EOF;
@@ -116,10 +116,10 @@ 
 
 function wordlift_geo_widget_html( $width, $height, $latitude, $longitude, $zoom, $content ) {
 
-	// Create a unique Id for this widget.
-	$div_id = uniqid( 'wl-geo-' );
+    // Create a unique Id for this widget.
+    $div_id = uniqid( 'wl-geo-' );
 
-	echo <<<EOF
+    echo <<<EOF
 <div id="$div_id" style="width: $width; height: $height;"></div>
 
 <script type="text/javascript">
@@ -144,10 +144,10 @@ 
 
 EOF;
 
-	// Run inner shortcodes.
-	do_shortcode( $content );
+    // Run inner shortcodes.
+    do_shortcode( $content );
 
-	echo <<<EOF
+    echo <<<EOF
 
     } );
 </script>

Spacing +23 added lines, -23 removed lines

@@ -7,21 +7,21 @@ 
  * @subpackage Wordlift/modules/geo_widget
  */
 
-function wordlift_geo_widget_shortcode( $atts, $content = null ) {
+function wordlift_geo_widget_shortcode($atts, $content = null) {
 
 	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
+	$params = shortcode_atts(array(
 		'width'     => '100%',
 		'height'    => '300px',
 		'latitude'  => 0.0,
 		'longitude' => 0.0,
 		'zoom'      => 5,
 
-	), $atts );
+	), $atts);
 
 	// Add leaflet css and library.
-	wp_enqueue_style( 'leaflet_css', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
-	wp_enqueue_script( 'leaflet_js', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js' );
+	wp_enqueue_style('leaflet_css', dirname(dirname(plugin_dir_url(__FILE__))).'/bower_components/leaflet/dist/leaflet.css');
+	wp_enqueue_script('leaflet_js', dirname(dirname(plugin_dir_url(__FILE__))).'/bower_components/leaflet/dist/leaflet.js');
 
 	ob_start(); // Collect the buffer.
 	wordlift_geo_widget_html(
@@ -38,26 +38,26 @@ 
 
 }
 
-add_shortcode( 'wl_geo', 'wordlift_geo_widget_shortcode' );
+add_shortcode('wl_geo', 'wordlift_geo_widget_shortcode');
 
-function wl_geo_widget_layer_shortcode( $atts ) {
+function wl_geo_widget_layer_shortcode($atts) {
 
 	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
+	$params = shortcode_atts(array(
 		'name'  => '',
 		'label' => '',
-	), $atts );
+	), $atts);
 
 	// Return if a SPARQL Query name hasn't been provided.
-	if ( empty( $params['name'] ) ) {
+	if (empty($params['name'])) {
 		return;
 	}
 
 	// Set the layer label.
-	$label_j = json_encode( empty( $params['label'] ) ? $params['name'] : $params['label'] );
+	$label_j = json_encode(empty($params['label']) ? $params['name'] : $params['label']);
 
 	// Define the AJAX Url.
-	$ajax_url = admin_url( 'admin-ajax.php?action=wl_sparql&format=geojson&slug=' . urlencode( $params['name'] ) );
+	$ajax_url = admin_url('admin-ajax.php?action=wl_sparql&format=geojson&slug='.urlencode($params['name']));
 
 	echo <<<EOF
 
@@ -85,24 +85,24 @@ 
 
 }
 
-add_shortcode( 'wl_geo_layer', 'wl_geo_widget_layer_shortcode' );
+add_shortcode('wl_geo_layer', 'wl_geo_widget_layer_shortcode');
 
 
-function wl_geo_widget_marker_shortcode( $atts ) {
+function wl_geo_widget_marker_shortcode($atts) {
 
 	// Extract attributes and set default values.
-	$params = shortcode_atts( array(
+	$params = shortcode_atts(array(
 		'latitude'  => null,
 		'longitude' => null,
-	), $atts );
+	), $atts);
 
 	// Return if either latitude or longitude haven't been provided.
-	if ( empty( $params['latitude'] ) || empty( $params['longitude'] ) ) {
+	if (empty($params['latitude']) || empty($params['longitude'])) {
 		return;
 	}
 
-	$latitude_j  = json_encode( $params['latitude'] );
-	$longitude_j = json_encode( $params['longitude'] );
+	$latitude_j  = json_encode($params['latitude']);
+	$longitude_j = json_encode($params['longitude']);
 
 	echo <<<EOF
 
@@ -111,13 +111,13 @@ 
 
 }
 
-add_shortcode( 'wl_geo_marker', 'wl_geo_widget_marker_shortcode' );
+add_shortcode('wl_geo_marker', 'wl_geo_widget_marker_shortcode');
 
 
-function wordlift_geo_widget_html( $width, $height, $latitude, $longitude, $zoom, $content ) {
+function wordlift_geo_widget_html($width, $height, $latitude, $longitude, $zoom, $content) {
 
 	// Create a unique Id for this widget.
-	$div_id = uniqid( 'wl-geo-' );
+	$div_id = uniqid('wl-geo-');
 
 	echo <<<EOF
 <div id="$div_id" style="width: $width; height: $height;"></div>
@@ -145,7 +145,7 @@ 
 EOF;
 
 	// Run inner shortcodes.
-	do_shortcode( $content );
+	do_shortcode($content);
 
 	echo <<<EOF
 

src/public/class-wordlift-related-entities-cloud-shortcode.php

Indentation +98 added lines, -98 removed lines

@@ -16,110 +16,110 @@
  */
 class Wordlift_Related_Entities_Cloud_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_cloud';
-
-	/**
-	 * The {@link Wordlift_Relation_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	private $relation_service;
-
-	/**
-	 * Create a {@link Wordlift_Related_Entities_Cloud_Shortcode} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
-	 */
-	public function __construct( $relation_service ) {
-		parent::__construct();
-
-		$this->relation_service = $relation_service;
-
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
-
-		$tags = $this->get_related_entities_tags();
-
-		// Bail out if there are no associated entities.
-		if ( empty( $tags ) ) {
-			return '';
-		}
-
-		/*
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_cloud';
+
+    /**
+     * The {@link Wordlift_Relation_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    private $relation_service;
+
+    /**
+     * Create a {@link Wordlift_Related_Entities_Cloud_Shortcode} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
+     */
+    public function __construct( $relation_service ) {
+        parent::__construct();
+
+        $this->relation_service = $relation_service;
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
+
+        $tags = $this->get_related_entities_tags();
+
+        // Bail out if there are no associated entities.
+        if ( empty( $tags ) ) {
+            return '';
+        }
+
+        /*
 		 * Since the output is use in the widget as well, we need to have the
 		 * same class as the core tagcloud widget, to easily inherit its styling.
 		 */
 
-		return '<div class="tagcloud wl-related-entities-cloud">' .
-		       wp_generate_tag_cloud( $tags ) .
-		       '</div>';
-	}
-
-	/**
-	 * Find the related entities to the currently displayed post and
-	 * calculate the "tags" for them as wp_generate_tag_cloud expects to get.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return array    Array of tags. Empty array in case we re not in a context
-	 *                  of a post, or it has no related entities.
-	 */
-	public function get_related_entities_tags() {
-
-		// Define the supported types list.
-		$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
-
-		// Show nothing if not on a post or entity page.
-		if ( ! is_singular( $supported_types ) ) {
-			return array();
-		}
-
-		// Get the IDs of entities related to current post.
-		$related_entities = wl_core_get_related_entity_ids( get_the_ID(), array( 'status' => 'publish' ) );
-
-		// Bail out if there are no associated entities.
-		if ( empty( $related_entities ) ) {
-			return array();
-		}
-
-		/*
+        return '<div class="tagcloud wl-related-entities-cloud">' .
+                wp_generate_tag_cloud( $tags ) .
+                '</div>';
+    }
+
+    /**
+     * Find the related entities to the currently displayed post and
+     * calculate the "tags" for them as wp_generate_tag_cloud expects to get.
+     *
+     * @since 3.11.0
+     *
+     * @return array    Array of tags. Empty array in case we re not in a context
+     *                  of a post, or it has no related entities.
+     */
+    public function get_related_entities_tags() {
+
+        // Define the supported types list.
+        $supported_types = Wordlift_Entity_Service::valid_entity_post_types();
+
+        // Show nothing if not on a post or entity page.
+        if ( ! is_singular( $supported_types ) ) {
+            return array();
+        }
+
+        // Get the IDs of entities related to current post.
+        $related_entities = wl_core_get_related_entity_ids( get_the_ID(), array( 'status' => 'publish' ) );
+
+        // Bail out if there are no associated entities.
+        if ( empty( $related_entities ) ) {
+            return array();
+        }
+
+        /*
 		 * Create an array of "tags" to feed to wp_generate_tag_cloud.
 		 * Use the number of posts and entities connected to the entity as a weight.
 		 */
-		$tags = array();
-
-		foreach ( $related_entities as $entity_id ) {
-
-			$connected_entities = count( wl_core_get_related_entity_ids( $entity_id, array( 'status' => 'publish' ) ) );
-			$connected_posts    = count( $this->relation_service->get_article_subjects( $entity_id, '*', null,'publish' ) );
-
-			$tags[] = (object) array(
-				'id'    => $entity_id,
-				// Used to give a unique class on the tag.
-				'name'  => get_the_title( $entity_id ),
-				// The text of the tag.
-				'slug'  => get_the_title( $entity_id ),
-				// Required but not seem to be relevant
-				'link'  => get_permalink( $entity_id ),
-				// the url the tag links to.
-				'count' => $connected_entities + $connected_posts,
-				// The weight.
-			);
-
-		}
-
-		return $tags;
-	}
+        $tags = array();
+
+        foreach ( $related_entities as $entity_id ) {
+
+            $connected_entities = count( wl_core_get_related_entity_ids( $entity_id, array( 'status' => 'publish' ) ) );
+            $connected_posts    = count( $this->relation_service->get_article_subjects( $entity_id, '*', null,'publish' ) );
+
+            $tags[] = (object) array(
+                'id'    => $entity_id,
+                // Used to give a unique class on the tag.
+                'name'  => get_the_title( $entity_id ),
+                // The text of the tag.
+                'slug'  => get_the_title( $entity_id ),
+                // Required but not seem to be relevant
+                'link'  => get_permalink( $entity_id ),
+                // the url the tag links to.
+                'count' => $connected_entities + $connected_posts,
+                // The weight.
+            );
+
+        }
+
+        return $tags;
+    }
 
 }

Spacing +14 added lines, -14 removed lines

@@ -37,7 +37,7 @@ 
 	 *
 	 * @param \Wordlift_Relation_Service $relation_service The {@link Wordlift_Relation_Service} instance.
 	 */
-	public function __construct( $relation_service ) {
+	public function __construct($relation_service) {
 		parent::__construct();
 
 		$this->relation_service = $relation_service;
@@ -47,12 +47,12 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		$tags = $this->get_related_entities_tags();
 
 		// Bail out if there are no associated entities.
-		if ( empty( $tags ) ) {
+		if (empty($tags)) {
 			return '';
 		}
 
@@ -61,8 +61,8 @@ 
 		 * same class as the core tagcloud widget, to easily inherit its styling.
 		 */
 
-		return '<div class="tagcloud wl-related-entities-cloud">' .
-		       wp_generate_tag_cloud( $tags ) .
+		return '<div class="tagcloud wl-related-entities-cloud">'.
+		       wp_generate_tag_cloud($tags).
 		       '</div>';
 	}
 
@@ -81,15 +81,15 @@ 
 		$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 		// Show nothing if not on a post or entity page.
-		if ( ! is_singular( $supported_types ) ) {
+		if ( ! is_singular($supported_types)) {
 			return array();
 		}
 
 		// Get the IDs of entities related to current post.
-		$related_entities = wl_core_get_related_entity_ids( get_the_ID(), array( 'status' => 'publish' ) );
+		$related_entities = wl_core_get_related_entity_ids(get_the_ID(), array('status' => 'publish'));
 
 		// Bail out if there are no associated entities.
-		if ( empty( $related_entities ) ) {
+		if (empty($related_entities)) {
 			return array();
 		}
 
@@ -99,19 +99,19 @@ 
 		 */
 		$tags = array();
 
-		foreach ( $related_entities as $entity_id ) {
+		foreach ($related_entities as $entity_id) {
 
-			$connected_entities = count( wl_core_get_related_entity_ids( $entity_id, array( 'status' => 'publish' ) ) );
-			$connected_posts    = count( $this->relation_service->get_article_subjects( $entity_id, '*', null,'publish' ) );
+			$connected_entities = count(wl_core_get_related_entity_ids($entity_id, array('status' => 'publish')));
+			$connected_posts    = count($this->relation_service->get_article_subjects($entity_id, '*', null, 'publish'));
 
 			$tags[] = (object) array(
 				'id'    => $entity_id,
 				// Used to give a unique class on the tag.
-				'name'  => get_the_title( $entity_id ),
+				'name'  => get_the_title($entity_id),
 				// The text of the tag.
-				'slug'  => get_the_title( $entity_id ),
+				'slug'  => get_the_title($entity_id),
 				// Required but not seem to be relevant
-				'link'  => get_permalink( $entity_id ),
+				'link'  => get_permalink($entity_id),
 				// the url the tag links to.
 				'count' => $connected_entities + $connected_posts,
 				// The weight.