insideout10 / wordlift-plugin

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

Indentation +92 added lines, -92 removed lines

@@ -16,108 +16,108 @@
  */
 class Wordlift_Publisher_Service {
 
-	/**
-	 * Counts the number of potential publishers.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return int The number of potential publishers.
-	 */
-	public function count() {
+    /**
+     * Counts the number of potential publishers.
+     *
+     * @since 3.11.0
+     *
+     * @return int The number of potential publishers.
+     */
+    public function count() {
 
-		// Get the global `wpdb` instance.
-		global $wpdb;
+        // Get the global `wpdb` instance.
+        global $wpdb;
 
-		// Run the query and get the count.
-		$count = $wpdb->get_var( $wpdb->prepare(
-			'SELECT COUNT( p.id )' .
-			" FROM $wpdb->posts p" .
-			"  LEFT JOIN $wpdb->term_relationships tr" .
-			'   ON tr.object_id = p.id' .
-			"  LEFT JOIN $wpdb->term_taxonomy tt" .
-			'   ON tt.term_taxonomy_id = tr.term_taxonomy_id' .
-			"  LEFT JOIN $wpdb->terms t" .
-			'   ON t.term_id = tt.term_id' .
-			"  LEFT JOIN $wpdb->postmeta m" .
-			"   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'" .
-			'  WHERE p.post_type = %s' .
-			"   AND t.name IN ( 'Organization', 'Person' )" .
-			'   AND tt.taxonomy = %s' .
-			' ORDER BY p.post_title',
-			Wordlift_Entity_Service::TYPE_NAME,
-			Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
-		) );
+        // Run the query and get the count.
+        $count = $wpdb->get_var( $wpdb->prepare(
+            'SELECT COUNT( p.id )' .
+            " FROM $wpdb->posts p" .
+            "  LEFT JOIN $wpdb->term_relationships tr" .
+            '   ON tr.object_id = p.id' .
+            "  LEFT JOIN $wpdb->term_taxonomy tt" .
+            '   ON tt.term_taxonomy_id = tr.term_taxonomy_id' .
+            "  LEFT JOIN $wpdb->terms t" .
+            '   ON t.term_id = tt.term_id' .
+            "  LEFT JOIN $wpdb->postmeta m" .
+            "   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'" .
+            '  WHERE p.post_type = %s' .
+            "   AND t.name IN ( 'Organization', 'Person' )" .
+            '   AND tt.taxonomy = %s' .
+            ' ORDER BY p.post_title',
+            Wordlift_Entity_Service::TYPE_NAME,
+            Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
+        ) );
 
-		// Finally return the count.
-		return (int) $count;
-	}
+        // Finally return the count.
+        return (int) $count;
+    }
 
-	/**
-	 * Query WP for potential publishers, i.e. {@link WP_Post}s of type `entity`
-	 * and of `wl_entity_type` (taxonomy) `Organization` or `Person`.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param string $filter The title filter.
-	 *
-	 * @return array An array of results.
-	 */
-	public function query( $filter = '' ) {
+    /**
+     * Query WP for potential publishers, i.e. {@link WP_Post}s of type `entity`
+     * and of `wl_entity_type` (taxonomy) `Organization` or `Person`.
+     *
+     * @since 3.11.0
+     *
+     * @param string $filter The title filter.
+     *
+     * @return array An array of results.
+     */
+    public function query( $filter = '' ) {
 
-		// Get the global `wpdb` instance.
-		global $wpdb;
+        // Get the global `wpdb` instance.
+        global $wpdb;
 
-		// Run the query and get the results.
-		$results = $wpdb->get_results( $wpdb->prepare(
-			'SELECT p.id, p.post_title, t.name AS type, m.meta_value AS thumbnail_id' .
-			" FROM $wpdb->posts p" .
-			"  LEFT JOIN $wpdb->term_relationships tr" .
-			'   ON tr.object_id = p.id' .
-			"  LEFT JOIN $wpdb->term_taxonomy tt" .
-			'   ON tt.term_taxonomy_id = tr.term_taxonomy_id' .
-			"  LEFT JOIN $wpdb->terms t" .
-			'   ON t.term_id = tt.term_id' .
-			"  LEFT JOIN $wpdb->postmeta m" .
-			"   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'" .
-			'  WHERE p.post_type = %s' .
-			"   AND t.name IN ( 'Organization', 'Person' )" .
-			'   AND tt.taxonomy = %s' .
-			'   AND p.post_title LIKE %s' .
-			' ORDER BY p.post_title',
-			Wordlift_Entity_Service::TYPE_NAME,
-			Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-			'%' . $wpdb->esc_like( $filter ) . '%'
-		) );
+        // Run the query and get the results.
+        $results = $wpdb->get_results( $wpdb->prepare(
+            'SELECT p.id, p.post_title, t.name AS type, m.meta_value AS thumbnail_id' .
+            " FROM $wpdb->posts p" .
+            "  LEFT JOIN $wpdb->term_relationships tr" .
+            '   ON tr.object_id = p.id' .
+            "  LEFT JOIN $wpdb->term_taxonomy tt" .
+            '   ON tt.term_taxonomy_id = tr.term_taxonomy_id' .
+            "  LEFT JOIN $wpdb->terms t" .
+            '   ON t.term_id = tt.term_id' .
+            "  LEFT JOIN $wpdb->postmeta m" .
+            "   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'" .
+            '  WHERE p.post_type = %s' .
+            "   AND t.name IN ( 'Organization', 'Person' )" .
+            '   AND tt.taxonomy = %s' .
+            '   AND p.post_title LIKE %s' .
+            ' ORDER BY p.post_title',
+            Wordlift_Entity_Service::TYPE_NAME,
+            Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+            '%' . $wpdb->esc_like( $filter ) . '%'
+        ) );
 
-		// Set a reference to ourselves to pass to the closure.
-		$publisher_service = $this;
+        // Set a reference to ourselves to pass to the closure.
+        $publisher_service = $this;
 
-		// Map the results in a `Select2` compatible array.
-		return array_map( function ( $item ) use ( $publisher_service ) {
-			return array(
-				'id'            => $item->id,
-				'text'          => $item->post_title,
-				'type'          => $item->type,
-				'thumbnail_url' => $publisher_service->get_attachment_image_url( $item->thumbnail_id ),
-			);
-		}, $results );
-	}
+        // Map the results in a `Select2` compatible array.
+        return array_map( function ( $item ) use ( $publisher_service ) {
+            return array(
+                'id'            => $item->id,
+                'text'          => $item->post_title,
+                'type'          => $item->type,
+                'thumbnail_url' => $publisher_service->get_attachment_image_url( $item->thumbnail_id ),
+            );
+        }, $results );
+    }
 
-	/**
-	 * Get the thumbnail's URL.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param int    $attachment_id The attachment id.
-	 * @param string $size          The attachment size (default = 'thumbnail').
-	 *
-	 * @return string|bool The image URL or false if not found.
-	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+    /**
+     * Get the thumbnail's URL.
+     *
+     * @since 3.11.0
+     *
+     * @param int    $attachment_id The attachment id.
+     * @param string $size          The attachment size (default = 'thumbnail').
+     *
+     * @return string|bool The image URL or false if not found.
+     */
+    public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
 
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
+        $image = wp_get_attachment_image_src( $attachment_id, $size );
 
-		return isset( $image['0'] ) ? $image['0'] : false;
-	}
+        return isset( $image['0'] ) ? $image['0'] : false;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -29,24 +29,24 @@ 
 		global $wpdb;
 
 		// Run the query and get the count.
-		$count = $wpdb->get_var( $wpdb->prepare(
-			'SELECT COUNT( p.id )' .
-			" FROM $wpdb->posts p" .
-			"  LEFT JOIN $wpdb->term_relationships tr" .
-			'   ON tr.object_id = p.id' .
-			"  LEFT JOIN $wpdb->term_taxonomy tt" .
-			'   ON tt.term_taxonomy_id = tr.term_taxonomy_id' .
-			"  LEFT JOIN $wpdb->terms t" .
-			'   ON t.term_id = tt.term_id' .
-			"  LEFT JOIN $wpdb->postmeta m" .
-			"   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'" .
-			'  WHERE p.post_type = %s' .
-			"   AND t.name IN ( 'Organization', 'Person' )" .
-			'   AND tt.taxonomy = %s' .
+		$count = $wpdb->get_var($wpdb->prepare(
+			'SELECT COUNT( p.id )'.
+			" FROM $wpdb->posts p".
+			"  LEFT JOIN $wpdb->term_relationships tr".
+			'   ON tr.object_id = p.id'.
+			"  LEFT JOIN $wpdb->term_taxonomy tt".
+			'   ON tt.term_taxonomy_id = tr.term_taxonomy_id'.
+			"  LEFT JOIN $wpdb->terms t".
+			'   ON t.term_id = tt.term_id'.
+			"  LEFT JOIN $wpdb->postmeta m".
+			"   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'".
+			'  WHERE p.post_type = %s'.
+			"   AND t.name IN ( 'Organization', 'Person' )".
+			'   AND tt.taxonomy = %s'.
 			' ORDER BY p.post_title',
 			Wordlift_Entity_Service::TYPE_NAME,
 			Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME
-		) );
+		));
 
 		// Finally return the count.
 		return (int) $count;
@@ -62,45 +62,45 @@ 
 	 *
 	 * @return array An array of results.
 	 */
-	public function query( $filter = '' ) {
+	public function query($filter = '') {
 
 		// Get the global `wpdb` instance.
 		global $wpdb;
 
 		// Run the query and get the results.
-		$results = $wpdb->get_results( $wpdb->prepare(
-			'SELECT p.id, p.post_title, t.name AS type, m.meta_value AS thumbnail_id' .
-			" FROM $wpdb->posts p" .
-			"  LEFT JOIN $wpdb->term_relationships tr" .
-			'   ON tr.object_id = p.id' .
-			"  LEFT JOIN $wpdb->term_taxonomy tt" .
-			'   ON tt.term_taxonomy_id = tr.term_taxonomy_id' .
-			"  LEFT JOIN $wpdb->terms t" .
-			'   ON t.term_id = tt.term_id' .
-			"  LEFT JOIN $wpdb->postmeta m" .
-			"   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'" .
-			'  WHERE p.post_type = %s' .
-			"   AND t.name IN ( 'Organization', 'Person' )" .
-			'   AND tt.taxonomy = %s' .
-			'   AND p.post_title LIKE %s' .
+		$results = $wpdb->get_results($wpdb->prepare(
+			'SELECT p.id, p.post_title, t.name AS type, m.meta_value AS thumbnail_id'.
+			" FROM $wpdb->posts p".
+			"  LEFT JOIN $wpdb->term_relationships tr".
+			'   ON tr.object_id = p.id'.
+			"  LEFT JOIN $wpdb->term_taxonomy tt".
+			'   ON tt.term_taxonomy_id = tr.term_taxonomy_id'.
+			"  LEFT JOIN $wpdb->terms t".
+			'   ON t.term_id = tt.term_id'.
+			"  LEFT JOIN $wpdb->postmeta m".
+			"   ON m.post_id = p.id AND m.meta_key = '_thumbnail_id'".
+			'  WHERE p.post_type = %s'.
+			"   AND t.name IN ( 'Organization', 'Person' )".
+			'   AND tt.taxonomy = %s'.
+			'   AND p.post_title LIKE %s'.
 			' ORDER BY p.post_title',
 			Wordlift_Entity_Service::TYPE_NAME,
 			Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-			'%' . $wpdb->esc_like( $filter ) . '%'
-		) );
+			'%'.$wpdb->esc_like($filter).'%'
+		));
 
 		// Set a reference to ourselves to pass to the closure.
 		$publisher_service = $this;
 
 		// Map the results in a `Select2` compatible array.
-		return array_map( function ( $item ) use ( $publisher_service ) {
+		return array_map(function($item) use ($publisher_service) {
 			return array(
 				'id'            => $item->id,
 				'text'          => $item->post_title,
 				'type'          => $item->type,
-				'thumbnail_url' => $publisher_service->get_attachment_image_url( $item->thumbnail_id ),
+				'thumbnail_url' => $publisher_service->get_attachment_image_url($item->thumbnail_id),
 			);
-		}, $results );
+		}, $results);
 	}
 
 	/**
@@ -113,11 +113,11 @@ 
 	 *
 	 * @return string|bool The image URL or false if not found.
 	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+	public function get_attachment_image_url($attachment_id, $size = 'thumbnail') {
 
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
+		$image = wp_get_attachment_image_src($attachment_id, $size);
 
-		return isset( $image['0'] ) ? $image['0'] : false;
+		return isset($image['0']) ? $image['0'] : false;
 	}
 
 }

src/wordlift.php

Spacing +157 added lines, -157 removed lines

@@ -25,15 +25,15 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules
-require_once( 'modules/core/wordlift_core.php' );
+require_once('modules/core/wordlift_core.php');
 
 /**
  * Log to the debug.log file.
@@ -46,9 +46,9 @@ 
  *
  * @param string|mixed $log The log data.
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->info( $log );
+	Wordlift_Log_Service::get_instance()->info($log);
 
 //	$handler = apply_filters( 'wl_write_log_handler', null );
 //
@@ -74,19 +74,19 @@ 
  * @param string|array $log    The log data.
  * @param string       $caller The calling function.
  */
-function wl_write_log_handler( $log, $caller = null ) {
+function wl_write_log_handler($log, $caller = null) {
 
 	global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+	if (true === WP_DEBUG) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+		$message = (isset($caller) ? sprintf('[%-40.40s] ', $caller) : '').
+		           (is_array($log) || is_object($log) ? print_r($log, true) : wl_write_log_hide_key($log));
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
+		if (isset($wl_logger)) {
+			$wl_logger->info($message);
 		} else {
-			error_log( $message );
+			error_log($message);
 		}
 
 	}
@@ -104,9 +104,9 @@ 
  *
  * @return string A text with the key hidden.
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -116,12 +116,12 @@ 
  *
  * @param string $query A SPARQL query.
  */
-function wl_queue_sparql_update_query( $query ) {
+function wl_queue_sparql_update_query($query) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
+	file_put_contents($filename, $query."\n", FILE_APPEND);
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_queue_sparql_update_query [ filename :: $filename ]");
 }
 
 /**
@@ -129,33 +129,33 @@ 
  *
  * @param int $request_id The request ID.
  */
-function wl_execute_saved_sparql_update_query( $request_id ) {
+function wl_execute_saved_sparql_update_query($request_id) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+	$filename = WL_TEMP_DIR.$request_id.'.sparql';
 
 	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+	if ( ! file_exists($filename)) {
+		wl_write_log("wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]");
 
 		return;
 	}
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_execute_saved_sparql_update_query [ filename :: $filename ]");
 
 	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+	$query = file_get_contents($filename);
 
 	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+	rl_execute_sparql_update_query($query, false);
 
 	// Reindex the triple store.
 	wordlift_reindex_triple_store();
 
 	// Delete the temporary file.
-	unlink( $filename );
+	unlink($filename);
 }
 
-add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
+add_action('wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1);
 
 /**
  * Add buttons hook for the TinyMCE editor. This method is called by the WP init hook.
@@ -163,8 +163,8 @@ 
 function wordlift_buttonhooks() {
 
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
+		add_filter('mce_external_plugins', 'wordlift_register_tinymce_javascript');
 	}
 }
 
@@ -175,11 +175,11 @@ 
  *
  * @return array The modified plugins array.
  */
-function wordlift_register_tinymce_javascript( $plugin_array ) {
+function wordlift_register_tinymce_javascript($plugin_array) {
 
 	// add the wordlift plugin.
 	// We can't use the minified version here.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+	$plugin_array['wordlift'] = plugin_dir_url(__FILE__).'js/wordlift-reloaded.js';
 
 	return $plugin_array;
 }
@@ -191,7 +191,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -199,17 +199,17 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // init process for button control
-add_action( 'init', 'wordlift_buttonhooks' );
+add_action('init', 'wordlift_buttonhooks');
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 
 /**
@@ -218,30 +218,30 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-	wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+	wp_enqueue_script('angularjs-geolocation', plugin_dir_url(__FILE__).'/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js');
+	wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js');
+	wp_enqueue_script('angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui', plugin_dir_url(__FILE__).'css/wordlift-ui.min.css');
 }
 
-add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
+add_action('wp_enqueue_scripts', 'wl_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -251,23 +251,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -276,16 +276,16 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
 	// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : '',
 	);
 }
 
@@ -296,12 +296,12 @@ 
  *
  * @return string A datetime.
  */
-function wl_get_post_modified_time( $post ) {
+function wl_get_post_modified_time($post) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+	$date_modified = get_post_modified_time('c', true, $post);
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
+	if ('-' === substr($date_modified, 0, 1)) {
+		return get_the_time('c', $post);
 	}
 
 	return $date_modified;
@@ -314,27 +314,27 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 
 	// If there is a featured image it has the priority
-	$featured_image_id = get_post_thumbnail_id( $post_id );
-	if ( is_numeric( $featured_image_id ) ) {
-		$image_url = wp_get_attachment_url( $featured_image_id );
+	$featured_image_id = get_post_thumbnail_id($post_id);
+	if (is_numeric($featured_image_id)) {
+		$image_url = wp_get_attachment_url($featured_image_id);
 
-		return array( $image_url );
+		return array($image_url);
 	}
 
 	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
+	$images = get_children(array(
 		'post_parent'    => $post_id,
 		'post_type'      => 'attachment',
 		'post_mime_type' => 'image',
-	) );
+	));
 
 	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
+	if (empty($images)) {
 		return array();
 	}
 
@@ -342,11 +342,11 @@ 
 	$image_urls = array();
 
 	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
+	foreach ($images as $attachment_id => $attachment) {
+		$image_url = wp_get_attachment_url($attachment_id);
 		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
+		if ( ! in_array($image_url, $image_urls)) {
+			array_push($image_urls, $image_url);
 		}
 	}
 
@@ -363,17 +363,17 @@ 
  *
  * @return string The SPARQL fragment.
  */
-function wl_get_sparql_images( $uri, $post_id ) {
+function wl_get_sparql_images($uri, $post_id) {
 
 	$sparql = '';
 
 	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+	$uri_e = esc_html($uri);
 
 	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
+	$image_urls = wl_get_image_urls($post_id);
+	foreach ($image_urls as $image_url) {
+		$image_url_esc = wl_sparql_escape_uri($image_url);
 		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
 	}
 
@@ -388,21 +388,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -416,10 +416,10 @@ 
  * @param int    $post_id    The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 
@@ -435,10 +435,10 @@ 
  *
  * @param bool $hard True if the rewrite involves configuration updates in Apache/IIS.
  */
-function wl_flush_rewrite_rules_hard( $hard ) {
+function wl_flush_rewrite_rules_hard($hard) {
 
 	// If WL is not yet configured, we cannot perform any update, so we exit.
-	if ( '' === wl_configuration_get_key() ) {
+	if ('' === wl_configuration_get_key()) {
 		return;
 	}
 
@@ -447,13 +447,13 @@ 
 	$limit  = 100;
 
 	// Get more posts if the number of returned posts matches the limit.
-	while ( $limit === ( $posts = get_posts( array(
+	while ($limit === ($posts = get_posts(array(
 			'offset'      => $offset,
 			'numberposts' => $limit,
 			'orderby'     => 'ID',
 			'post_type'   => 'any',
 			'post_status' => 'publish',
-		) ) ) ) {
+		)))) {
 
 		// Holds the delete part of the query.
 		$delete_query = rl_sparql_prefixes();
@@ -462,16 +462,16 @@ 
 		$insert_query = '';
 
 		// Cycle in each post to build the query.
-		foreach ( $posts as $post ) {
+		foreach ($posts as $post) {
 
 			// Ignore revisions.
-			if ( wp_is_post_revision( $post->ID ) ) {
+			if (wp_is_post_revision($post->ID)) {
 				continue;
 			}
 
 			// Get the entity URI.
-			$s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
-			                                                                 ->get_uri( $post->ID ) );
+			$s = Wordlift_Sparql_Service::escape_uri(Wordlift_Entity_Service::get_instance()
+			                                                                 ->get_uri($post->ID));
 
 			// Get the post URL.
 			// $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
@@ -480,13 +480,13 @@ 
 			$delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
 
 			$insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
-			                                                     ->get_insert_query( $s, $post->ID );
+			                                                     ->get_insert_query($s, $post->ID);
 
 		}
 
 
 		// Execute the query.
-		rl_execute_sparql_update_query( $delete_query . $insert_query );
+		rl_execute_sparql_update_query($delete_query.$insert_query);
 
 		// Advance to the next posts.
 		$offset += $limit;
@@ -502,7 +502,7 @@ 
 
 }
 
-add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
+add_filter('flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1);
 
 /**
  * Sanitizes an URI path by replacing the non allowed characters with an underscore.
@@ -515,9 +515,9 @@ 
  *
  * @return string The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -527,10 +527,10 @@ 
  *
  * @return array Array containing $value (if $value was not an array)
  */
-function wl_force_to_array( $value ) {
+function wl_force_to_array($value) {
 
-	if ( ! is_array( $value ) ) {
-		return array( $value );
+	if ( ! is_array($value)) {
+		return array($value);
 	}
 
 	return $value;
@@ -542,28 +542,28 @@ 
 function wl_shutdown() {
 
 	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
 
 	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+	if (WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists($filename)) {
 
 		// The request ID.
-		$args = array( WL_REQUEST_ID );
+		$args = array(WL_REQUEST_ID);
 
 		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+		wp_schedule_single_event(time(), 'wl_execute_saved_sparql_update_query', $args);
 
 		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+		$timestamp = wp_next_scheduled('wl_execute_saved_sparql_update_query', $args);
 
 		// Spawn the cron.
 		spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+		wl_write_log("wl_shutdown [ request id :: ".WL_REQUEST_ID." ][ timestamp :: $timestamp ]");
 	}
 }
 
-add_action( 'shutdown', 'wl_shutdown' );
+add_action('shutdown', 'wl_shutdown');
 
 /**
  * Replaces the *itemid* attributes URIs with the WordLift URIs.
@@ -572,113 +572,113 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
 	// wl_write_log( "wl_replace_item_id_with_uri" );
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
-require_once( 'wordlift_entity_type_taxonomy.php' );
+require_once('wordlift_entity_type.php');
+require_once('wordlift_entity_type_taxonomy.php');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
-require_once( 'modules/redirector/wordlift_redirector.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
+require_once('modules/redirector/wordlift_redirector.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/wordlift_widget_chord.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/wordlift_widget_chord.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_sparql.php' );
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_sparql.php');
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 // Provide syncing features.
-require_once( 'admin/wordlift_admin_sync.php' );
+require_once('admin/wordlift_admin_sync.php');
 //}
 
 // load languages.
 // TODO: the following call gives for granted that the plugin is in the wordlift directory,
 //       we're currently doing this because wordlift is symbolic linked.
-load_plugin_textdomain( 'wordlift', false, '/wordlift/languages' );
+load_plugin_textdomain('wordlift', false, '/wordlift/languages');
 
 
 /**
@@ -686,7 +686,7 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 }
 
@@ -695,18 +695,18 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.

src/uninstall.php

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // If uninstall not called from WordPress, then exit.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
@@ -39,53 +39,53 @@ 
  */
 
 // Do a db search for posts of type entity
-$args           = array(
-	'posts_per_page' => - 1,
+$args = array(
+	'posts_per_page' => -1,
 	'post_type'      => Wordlift_Entity_Service::TYPE_NAME,
-	'post_status'    => array( 'publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash' ),
+	'post_status'    => array('publish', 'pending', 'draft', 'auto-draft', 'future', 'private', 'inherit', 'trash'),
 	'fields'         => 'ids'
 );
-$entities_array = get_posts( $args );
+$entities_array = get_posts($args);
 
 // Loop over entities and delete them.
 // TODO: thumbnails?
-wl_write_log( 'Deleting entities and their meta... ' );
-wl_write_log( $entities_array );
-foreach ( $entities_array as $entity_id ) {
+wl_write_log('Deleting entities and their meta... ');
+wl_write_log($entities_array);
+foreach ($entities_array as $entity_id) {
 	// Delete the whole entity and its metas.
-	wp_delete_post( $entity_id, true );
+	wp_delete_post($entity_id, true);
 }
-wl_write_log( 'Done.' );
+wl_write_log('Done.');
 
 /*
  * Delete post-entity relationships
  */
-wl_write_log( 'Deleting post-entity relationships... ' );
-$sql = 'DROP TABLE IF EXISTS ' . wl_core_get_relation_instances_table_name() . ';';
-$wpdb->query( $sql );
-delete_option( 'wl_db_version' );
-wl_write_log( 'Done.' );
+wl_write_log('Deleting post-entity relationships... ');
+$sql = 'DROP TABLE IF EXISTS '.wl_core_get_relation_instances_table_name().';';
+$wpdb->query($sql);
+delete_option('wl_db_version');
+wl_write_log('Done.');
 
 /*
  * Delete taxonomy
  */
-wl_write_log( 'Cleaning entities taxonomy... ' );
+wl_write_log('Cleaning entities taxonomy... ');
 // Delte custom taxonomy terms.
 // We loop over terms in this rude way because in the uninstall script
 // is not possible to call WP custom taxonomy functions.
-foreach ( range( 0, 100 ) as $index ) {
-	delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_' . $index );
-	wp_delete_term( $index, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+foreach (range(0, 100) as $index) {
+	delete_option(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME.'_'.$index);
+	wp_delete_term($index, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 }
-delete_option( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME . '_children' );  // it's a hierarchical taxonomy
-wl_write_log( 'Done.' );
+delete_option(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME.'_children'); // it's a hierarchical taxonomy
+wl_write_log('Done.');
 
 /**
  * Delete options
  */
-wl_write_log( 'Cleaning WordLift options... ' );
+wl_write_log('Cleaning WordLift options... ');
 // delete_option( WL_OPTIONS_NAME );
-delete_option( 'wl_option_prefixes' );
-delete_option( 'wl_general_settings' );
-delete_option( 'wl_advanced_settings' );
-wl_write_log( 'Done. WordLift successfully uninstalled.' );
+delete_option('wl_option_prefixes');
+delete_option('wl_general_settings');
+delete_option('wl_advanced_settings');
+wl_write_log('Done. WordLift successfully uninstalled.');

src/wordlift_constants.php

Spacing +13 added lines, -13 removed lines

@@ -4,35 +4,35 @@ 
  */
 
 // Define the basic options for HTTP calls to REDLINK.
-define( 'WL_REDLINK_API_HTTP_OPTIONS', serialize( array(
+define('WL_REDLINK_API_HTTP_OPTIONS', serialize(array(
 	'timeout'         => 300,
 	'redirection'     => 5,
 	'httpversion'     => '1.1',
 	'blocking'        => true,
 	'cookies'         => array(),
-	'sslverify'       => ( 'false' === getenv( 'WL_SSL_VERIFY_ENABLED' ) ) ? false : true,
-	'sslcertificates' => dirname( __FILE__ ) . '/ssl/ca-bundle.crt',
+	'sslverify'       => ('false' === getenv('WL_SSL_VERIFY_ENABLED')) ? false : true,
+	'sslcertificates' => dirname(__FILE__).'/ssl/ca-bundle.crt',
 	'decompress'      => false
-) ) );
+)));
 
 // Create a unique ID for this request, useful to hook async HTTP requests.
-define( 'WL_REQUEST_ID', uniqid() );
+define('WL_REQUEST_ID', uniqid());
 
 // Set the temporary files folder.
-defined( 'WL_TEMP_DIR' ) || define( 'WL_TEMP_DIR', get_temp_dir() );
+defined('WL_TEMP_DIR') || define('WL_TEMP_DIR', get_temp_dir());
 
-define( 'WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', 'true' !== getenv( 'WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING' ) );
+define('WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', 'true' !== getenv('WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING'));
 
 // Define the meta name used to store the entity URL.
-define( 'WL_ENTITY_URL_META_NAME', 'entity_url' );
+define('WL_ENTITY_URL_META_NAME', 'entity_url');
 
 // Max number of recursions when printing microdata
-define( 'WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3 );
+define('WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3);
 
 
-define( 'WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined( 'WORDLIFT_API_URL' ) ? WORDLIFT_API_URL . '/' : 'https://api.wordlift.it/' );
+define('WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined('WORDLIFT_API_URL') ? WORDLIFT_API_URL.'/' : 'https://api.wordlift.it/');
 
-define( 'WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=' );
+define('WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=');
 
 
 /**
@@ -45,8 +45,8 @@ 
 	$items    = wl_prefixes_list();
 	$prefixes = array();
 
-	foreach ( $items as $item ) {
-		$prefixes[ $item['prefix'] ] = $item['namespace'];
+	foreach ($items as $item) {
+		$prefixes[$item['prefix']] = $item['namespace'];
 	}
 
 	return $prefixes;

src/modules/core/wordlift_core_post_entity_relations.php

Indentation +310 added lines, -310 removed lines

@@ -9,12 +9,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,
+    ) );
 }
 
 /**
@@ -24,7 +24,7 @@ 
  */
 function wl_core_get_validation_rules() {
 
-	return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+    return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
 }
 
 /**
@@ -34,10 +34,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;
 }
 
 /**
@@ -52,33 +52,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;
 }
 
 /**
@@ -93,33 +93,33 @@ 
  */
 function wl_core_delete_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;
-
-	wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]" );
-
-	// @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
-	$wpdb->delete(
-		wl_core_get_relation_instances_table_name(),
-		array(
-			'subject_id' => $subject_id,
-			'predicate'  => $predicate,
-			'object_id'  => $object_id,
-		),
-		array( '%d', '%s', '%d' )
-	);
-
-	return true;
+    // 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;
+
+    wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]" );
+
+    // @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
+    $wpdb->delete(
+        wl_core_get_relation_instances_table_name(),
+        array(
+            'subject_id' => $subject_id,
+            'predicate'  => $predicate,
+            'object_id'  => $object_id,
+        ),
+        array( '%d', '%s', '%d' )
+    );
+
+    return true;
 }
 
 /**
@@ -134,29 +134,29 @@ 
  */
 function wl_core_add_relation_instances( $subject_id, $predicate, $object_ids ) {
 
-	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
-		return false;
-	}
-
-	// Checks on the given relation
-	if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
-		return false;
-	}
-
-	// Check $object_ids is an array
-	if ( ! is_array( $object_ids ) || empty( $object_ids ) ) {
-		return false;
-	}
-
-	// Call method to check and add each single relation
-	$inserted_records_ids = array();
-	foreach ( $object_ids as $object_id ) {
-		$new_record_id          = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
-		$inserted_records_ids[] = $new_record_id;
-	}
-
-	return $inserted_records_ids;
+    // Checks on subject and object
+    if ( ! is_numeric( $subject_id ) ) {
+        return false;
+    }
+
+    // Checks on the given relation
+    if ( ! wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+        return false;
+    }
+
+    // Check $object_ids is an array
+    if ( ! is_array( $object_ids ) || empty( $object_ids ) ) {
+        return false;
+    }
+
+    // Call method to check and add each single relation
+    $inserted_records_ids = array();
+    foreach ( $object_ids as $object_id ) {
+        $new_record_id          = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
+        $inserted_records_ids[] = $new_record_id;
+    }
+
+    return $inserted_records_ids;
 }
 
 /**
@@ -169,26 +169,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 ttps://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 ttps://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;
 }
 
 /**
@@ -204,18 +204,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;
 }
 
 /**
@@ -236,9 +236,9 @@ 
  */
 function wl_core_get_related_entities( $subject_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -259,9 +259,9 @@ 
  */
 function wl_core_get_related_entity_ids( $subject_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -278,20 +278,20 @@ 
  */
 function wl_core_inner_get_related_entities( $get, $item_id, $predicate = null, $post_status = null ) {
 
-	if ( $results = wl_core_get_posts( array(
-		'get'            => $get,
-		'post_type'      => 'entity',
-		'post_status'    => $post_status,
-		'related_to'     => $item_id,
-		'as'             => 'object',
-		'with_predicate' => $predicate,
-	) )
-	) {
-		return $results;
-	}
-
-	// If wl_core_get_posts return false then an empty array is returned
-	return array();
+    if ( $results = wl_core_get_posts( array(
+        'get'            => $get,
+        'post_type'      => 'entity',
+        'post_status'    => $post_status,
+        'related_to'     => $item_id,
+        'as'             => 'object',
+        'with_predicate' => $predicate,
+    ) )
+    ) {
+        return $results;
+    }
+
+    // If wl_core_get_posts return false then an empty array is returned
+    return array();
 }
 
 /**
@@ -312,9 +312,9 @@ 
  */
 function wl_core_get_related_posts( $object_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_posts( "posts", $object_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_posts( "posts", $object_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -335,9 +335,9 @@ 
  */
 function wl_core_get_related_post_ids( $object_id, $filters = array() ) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related( $filters );
 
-	return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters['predicate'], $filters['status'] );
 }
 
 /**
@@ -353,41 +353,41 @@ 
  */
 function wl_core_inner_get_related_posts( $get, $item_id, $predicate = null, $post_status = null ) {
 
-	// Retrieve the post object
-	$post = get_post( $item_id );
-	if ( null === $post ) {
-		return array();
-	}
-
-	if ( "entity" === $post->post_type ) {
-		if ( $results = wl_core_get_posts( array(
-			'get'            => $get,
-			'post_type'      => 'post',
-			'post_status'    => $post_status,
-			'related_to'     => $item_id,
-			'as'             => 'subject',
-			'with_predicate' => $predicate,
-		) )
-		) {
-			return $results;
-		}
-	} else {
-		if ( $results = wl_core_get_posts( array(
-			'get'            => $get,
-			'post_type'      => 'post',
-			'post_status'    => $post_status,
-			'post__not_in'   => array( $item_id ),
-			'related_to__in' => wl_core_get_related_entity_ids( $post->ID ),
-			'as'             => 'subject',
-			'with_predicate' => $predicate,
-		) )
-		) {
-			return $results;
-		}
-	}
-
-	// If wl_core_get_posts return false then an empty array is returned
-	return array();
+    // Retrieve the post object
+    $post = get_post( $item_id );
+    if ( null === $post ) {
+        return array();
+    }
+
+    if ( "entity" === $post->post_type ) {
+        if ( $results = wl_core_get_posts( array(
+            'get'            => $get,
+            'post_type'      => 'post',
+            'post_status'    => $post_status,
+            'related_to'     => $item_id,
+            'as'             => 'subject',
+            'with_predicate' => $predicate,
+        ) )
+        ) {
+            return $results;
+        }
+    } else {
+        if ( $results = wl_core_get_posts( array(
+            'get'            => $get,
+            'post_type'      => 'post',
+            'post_status'    => $post_status,
+            'post__not_in'   => array( $item_id ),
+            'related_to__in' => wl_core_get_related_entity_ids( $post->ID ),
+            'as'             => 'subject',
+            'with_predicate' => $predicate,
+        ) )
+        ) {
+            return $results;
+        }
+    }
+
+    // If wl_core_get_posts return false then an empty array is returned
+    return array();
 }
 
 /**
@@ -417,77 +417,77 @@ 
  */
 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();
-
-	// 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";
-
-	// Sql add post type filter
-	$sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args['post_type'] );
-
-	// 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'] ) . ")";
-	}
-	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 clausole
-		$sql .= $wpdb->prepare( " AND r.predicate = %s", $args['with_predicate'] );
-	}
-	// 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();
+
+    // 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";
+
+    // Sql add post type filter
+    $sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args['post_type'] );
+
+    // 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'] ) . ")";
+    }
+    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 clausole
+        $sql .= $wpdb->prepare( " AND r.predicate = %s", $args['with_predicate'] );
+    }
+    // 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;
 
 }
 
@@ -503,73 +503,73 @@ 
  */
 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 );
-
-	// wl_write_log( "Going to execute sql statement: $sql_statement " );
-	// $results = array();
-
-	// 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 );
+
+    // wl_write_log( "Going to execute sql statement: $sql_statement " );
+    // $results = array();
+
+    // 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 +88 added lines, -88 removed lines

@@ -7,14 +7,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,
-	) );
+	));
 }
 
 /**
@@ -24,7 +24,7 @@ 
  */
 function wl_core_get_validation_rules() {
 
-	return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+	return unserialize(WL_CORE_GET_POSTS_VALIDATION_RULES);
 }
 
 /**
@@ -35,7 +35,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;
 }
@@ -50,15 +50,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;
 	}
 
@@ -74,7 +74,7 @@ 
 			'predicate'  => $predicate,
 			'object_id'  => $object_id,
 		),
-		array( '%d', '%s', '%d' )
+		array('%d', '%s', '%d')
 	);
 
 	// Return record id
@@ -91,22 +91,22 @@ 
  *
  * @return (boolean) False for failure. True for success.
  */
-function wl_core_delete_relation_instance( $subject_id, $predicate, $object_id ) {
+function wl_core_delete_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;
 	}
 
 	// Prepare interaction with db
 	global $wpdb;
 
-	wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]" );
+	wl_write_log("Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]");
 
 	// @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
 	$wpdb->delete(
@@ -116,7 +116,7 @@ 
 			'predicate'  => $predicate,
 			'object_id'  => $object_id,
 		),
-		array( '%d', '%s', '%d' )
+		array('%d', '%s', '%d')
 	);
 
 	return true;
@@ -132,27 +132,27 @@ 
  *
  * @return (integer|boolean) Return the relation instances IDs or false
  */
-function wl_core_add_relation_instances( $subject_id, $predicate, $object_ids ) {
+function wl_core_add_relation_instances($subject_id, $predicate, $object_ids) {
 
 	// Checks on subject and object
-	if ( ! is_numeric( $subject_id ) ) {
+	if ( ! is_numeric($subject_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;
 	}
 
 	// Check $object_ids is an array
-	if ( ! is_array( $object_ids ) || empty( $object_ids ) ) {
+	if ( ! is_array($object_ids) || empty($object_ids)) {
 		return false;
 	}
 
 	// Call method to check and add each single relation
 	$inserted_records_ids = array();
-	foreach ( $object_ids as $object_id ) {
-		$new_record_id          = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
+	foreach ($object_ids as $object_id) {
+		$new_record_id          = wl_core_add_relation_instance($subject_id, $predicate, $object_id);
 		$inserted_records_ids[] = $new_record_id;
 	}
 
@@ -167,10 +167,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;
 	}
 
@@ -185,7 +185,7 @@ 
 		array(
 			'subject_id' => $subject_id,
 		),
-		array( '%d' )
+		array('%d')
 	);
 
 	return true;
@@ -202,16 +202,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;
 	}
 
@@ -234,11 +234,11 @@ 
  *
  * @return array Array of post entity objects.
  */
-function wl_core_get_related_entities( $subject_id, $filters = array() ) {
+function wl_core_get_related_entities($subject_id, $filters = array()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_entities("posts", $subject_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -257,11 +257,11 @@ 
  *
  * @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()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_entities("post_ids", $subject_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -276,16 +276,16 @@ 
  *
  * @return array Array of ids.
  */
-function wl_core_inner_get_related_entities( $get, $item_id, $predicate = null, $post_status = null ) {
+function wl_core_inner_get_related_entities($get, $item_id, $predicate = null, $post_status = null) {
 
-	if ( $results = wl_core_get_posts( array(
+	if ($results = wl_core_get_posts(array(
 		'get'            => $get,
 		'post_type'      => 'entity',
 		'post_status'    => $post_status,
 		'related_to'     => $item_id,
 		'as'             => 'object',
 		'with_predicate' => $predicate,
-	) )
+	))
 	) {
 		return $results;
 	}
@@ -310,11 +310,11 @@ 
  *
  * @return array Array of objects.
  */
-function wl_core_get_related_posts( $object_id, $filters = array() ) {
+function wl_core_get_related_posts($object_id, $filters = array()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_posts( "posts", $object_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_posts("posts", $object_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -333,11 +333,11 @@ 
  *
  * @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()) {
 
-	$filters = wl_core_validate_filters_for_related( $filters );
+	$filters = wl_core_validate_filters_for_related($filters);
 
-	return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters['predicate'], $filters['status'] );
+	return wl_core_inner_get_related_posts("post_ids", $object_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -351,36 +351,36 @@ 
  *
  * @return array Array of objects.
  */
-function wl_core_inner_get_related_posts( $get, $item_id, $predicate = null, $post_status = null ) {
+function wl_core_inner_get_related_posts($get, $item_id, $predicate = null, $post_status = null) {
 
 	// Retrieve the post object
-	$post = get_post( $item_id );
-	if ( null === $post ) {
+	$post = get_post($item_id);
+	if (null === $post) {
 		return array();
 	}
 
-	if ( "entity" === $post->post_type ) {
-		if ( $results = wl_core_get_posts( array(
+	if ("entity" === $post->post_type) {
+		if ($results = wl_core_get_posts(array(
 			'get'            => $get,
 			'post_type'      => 'post',
 			'post_status'    => $post_status,
 			'related_to'     => $item_id,
 			'as'             => 'subject',
 			'with_predicate' => $predicate,
-		) )
+		))
 		) {
 			return $results;
 		}
 	} else {
-		if ( $results = wl_core_get_posts( array(
+		if ($results = wl_core_get_posts(array(
 			'get'            => $get,
 			'post_type'      => 'post',
 			'post_status'    => $post_status,
-			'post__not_in'   => array( $item_id ),
-			'related_to__in' => wl_core_get_related_entity_ids( $post->ID ),
+			'post__not_in'   => array($item_id),
+			'related_to__in' => wl_core_get_related_entity_ids($post->ID),
 			'as'             => 'subject',
 			'with_predicate' => $predicate,
-		) )
+		))
 		) {
 			return $results;
 		}
@@ -415,7 +415,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;
@@ -425,7 +425,7 @@ 
 	// 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;
@@ -435,16 +435,16 @@ 
 	}
 
 	// 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";
 
 	// Sql add post type filter
-	$sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args['post_type'] );
+	$sql .= $wpdb->prepare(" AND p.post_type = %s AND", $args['post_type']);
 
 	// 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
@@ -453,36 +453,36 @@ 
 	// 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']).")";
 	}
-	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 clausole
-		$sql .= $wpdb->prepare( " AND r.predicate = %s", $args['with_predicate'] );
+		$sql .= $wpdb->prepare(" AND r.predicate = %s", $args['with_predicate']);
 	}
 	// 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'] ) ) {
+	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 .= ";";
@@ -501,23 +501,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;
 	}
 
@@ -531,18 +531,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;
 			}
 		}
@@ -552,21 +552,21 @@ 
 	global $wpdb;
 
 	// Build sql statement with given arguments
-	$sql_statement = wl_core_sql_query_builder( $args );
+	$sql_statement = wl_core_sql_query_builder($args);
 
 	// wl_write_log( "Going to execute sql statement: $sql_statement " );
 	// $results = array();
 
 	// 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/configuration/wordlift_configuration_settings.php

Indentation +70 added lines, -70 removed lines

@@ -10,10 +10,10 @@ 
  */
 function wl_configuration_set( $settings, $key, $value ) {
 
-	$options         = get_option( $settings );
-	$options         = isset( $options ) ? $options : array();
-	$options[ $key ] = $value;
-	update_option( $settings, $options );
+    $options         = get_option( $settings );
+    $options         = isset( $options ) ? $options : array();
+    $options[ $key ] = $value;
+    update_option( $settings, $options );
 }
 
 
@@ -28,7 +28,7 @@ 
  */
 function wl_configuration_get_key() {
 
-	return Wordlift_Configuration_Service::get_instance()->get_key();
+    return Wordlift_Configuration_Service::get_instance()->get_key();
 
 //	$options = get_option( 'wl_general_settings' );
 //
@@ -50,7 +50,7 @@ 
  */
 function wl_configuration_set_key( $value ) {
 
-	Wordlift_Configuration_Service::get_instance()->set_key( $value );
+    Wordlift_Configuration_Service::get_instance()->set_key( $value );
 
 //	wl_configuration_set( 'wl_general_settings', 'key', $value );
 
@@ -67,7 +67,7 @@ 
  */
 function wl_configuration_get_site_language() {
 
-	return Wordlift_Configuration_Service::get_instance()->get_language_code();
+    return Wordlift_Configuration_Service::get_instance()->get_language_code();
 
 //	$options = get_option( 'wl_general_settings' );
 //
@@ -85,7 +85,7 @@ 
  */
 function wl_configuration_set_site_language( $value ) {
 
-	Wordlift_Configuration_Service::get_instance()->set_language_code( $value );
+    Wordlift_Configuration_Service::get_instance()->set_language_code( $value );
 
 //	wl_configuration_set( 'wl_general_settings', 'site_language', $value );
 }
@@ -99,9 +99,9 @@ 
  */
 function wl_configuration_get_api_url() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['api_url'] ) ? '' : $options['api_url'] );
+    return ( empty( $options['api_url'] ) ? '' : $options['api_url'] );
 
 }
 
@@ -116,7 +116,7 @@ 
  */
 function wl_configuration_set_api_url( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'api_url', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'api_url', $value );
 }
 
 /**
@@ -128,9 +128,9 @@ 
  */
 function wl_configuration_get_redlink_key() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_key'] ) ? '' : $options['redlink_key'] );
+    return ( empty( $options['redlink_key'] ) ? '' : $options['redlink_key'] );
 
 }
 
@@ -145,7 +145,7 @@ 
  */
 function wl_configuration_set_redlink_key( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_key', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_key', $value );
 }
 
 /**
@@ -157,9 +157,9 @@ 
  */
 function wl_configuration_get_redlink_user_id() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_user_id'] ) ? '' : $options['redlink_user_id'] );
+    return ( empty( $options['redlink_user_id'] ) ? '' : $options['redlink_user_id'] );
 
 }
 
@@ -174,7 +174,7 @@ 
  */
 function wl_configuration_set_redlink_user_id( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_user_id', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_user_id', $value );
 }
 
 /**
@@ -186,9 +186,9 @@ 
  */
 function wl_configuration_get_redlink_dataset_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_dataset_name'] ) ? '' : $options['redlink_dataset_name'] );
+    return ( empty( $options['redlink_dataset_name'] ) ? '' : $options['redlink_dataset_name'] );
 }
 
 
@@ -203,7 +203,7 @@ 
  */
 function wl_configuration_set_redlink_dataset_name( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_name', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_name', $value );
 }
 
 /**
@@ -218,7 +218,7 @@ 
  */
 function wl_configuration_get_redlink_dataset_uri() {
 
-	return Wordlift_Configuration_Service::get_instance()->get_dataset_uri();
+    return Wordlift_Configuration_Service::get_instance()->get_dataset_uri();
 }
 
 /**
@@ -233,7 +233,7 @@ 
  */
 function wl_configuration_set_redlink_dataset_uri( $value ) {
 
-	Wordlift_Configuration_Service::get_instance()->set_dataset_uri( $value );
+    Wordlift_Configuration_Service::get_instance()->set_dataset_uri( $value );
 }
 
 /**
@@ -245,9 +245,9 @@ 
  */
 function wl_configuration_get_redlink_application_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+    $options = get_option( 'wl_advanced_settings', '' );
 
-	return ( empty( $options['redlink_application_name'] ) ? '' : $options['redlink_application_name'] );
+    return ( empty( $options['redlink_application_name'] ) ? '' : $options['redlink_application_name'] );
 }
 
 
@@ -260,7 +260,7 @@ 
  */
 function wl_configuration_set_redlink_application_name( $value ) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_application_name', $value );
+    wl_configuration_set( 'wl_advanced_settings', 'redlink_application_name', $value );
 }
 
 /**
@@ -277,18 +277,18 @@ 
  */
 function wl_configuration_get_analyzer_url() {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "analyses?key=$key"
-		       . ( defined( 'WL_EXCLUDE_IMAGES_REGEX' ) ? '&exclimage=' . urlencode( WL_EXCLUDE_IMAGES_REGEX ) : '' );
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "analyses?key=$key"
+                . ( defined( 'WL_EXCLUDE_IMAGES_REGEX' ) ? '&exclimage=' . urlencode( WL_EXCLUDE_IMAGES_REGEX ) : '' );
+    }
 
-	// Otherwise use Redlink.
-	$app_key       = wl_configuration_get_redlink_key();
-	$analysis_name = wl_configuration_get_redlink_application_name();
+    // Otherwise use Redlink.
+    $app_key       = wl_configuration_get_redlink_key();
+    $analysis_name = wl_configuration_get_redlink_application_name();
 
-	$ldpath = <<<EOF
+    $ldpath = <<<EOF
         @prefix ex: <http://example.org/>;
         @prefix cal: <http://www.w3.org/2002/12/cal#>;
         @prefix gn: <http://www.geonames.org/ontology#>;
@@ -297,8 +297,8 @@ 
         vcard:locality = lode:atPlace/gn:name :: xsd:string;
 EOF;
 
-	return wl_configuration_get_api_url() . "/analysis/$analysis_name/enhance?key=$app_key" .
-	       '&enhancer.engines.dereference.ldpath=' . urlencode( $ldpath );
+    return wl_configuration_get_api_url() . "/analysis/$analysis_name/enhance?key=$app_key" .
+            '&enhancer.engines.dereference.ldpath=' . urlencode( $ldpath );
 
 }
 
@@ -316,9 +316,9 @@ 
  */
 function wl_configuration_get_accounts_by_key_dataset_uri( $key ) {
 
-	return Wordlift_Configuration_Service::get_instance()->get_accounts_by_key_dataset_uri( $key );
+    return Wordlift_Configuration_Service::get_instance()->get_accounts_by_key_dataset_uri( $key );
 
-	//return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
+    //return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
 }
 
 
@@ -334,19 +334,19 @@ 
  */
 function wl_configuration_get_query_select_url( $output, $dataset = null ) {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		// TODO: handle the output format for WordLift.
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries?q=";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        // TODO: handle the output format for WordLift.
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries?q=";
+    }
 
-	// If no dataset has been specified then use the default configured, otherwise use the one provided.
-	$redlink_dataset = ( empty( $dataset ) ? wl_configuration_get_redlink_dataset_name() : $dataset );
-	$redlink_key     = wl_configuration_get_redlink_key();
+    // If no dataset has been specified then use the default configured, otherwise use the one provided.
+    $redlink_dataset = ( empty( $dataset ) ? wl_configuration_get_redlink_dataset_name() : $dataset );
+    $redlink_key     = wl_configuration_get_redlink_key();
 
-	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
+    // construct the API URL.
+    return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
 
 }
 
@@ -359,18 +359,18 @@ 
  */
 function wl_configuration_get_query_update_url() {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries";
+    }
 
-	// get the configuration.
-	$redlink_dataset = wl_configuration_get_redlink_dataset_name();
-	$redlink_key     = wl_configuration_get_redlink_key();
+    // get the configuration.
+    $redlink_dataset = wl_configuration_get_redlink_dataset_name();
+    $redlink_key     = wl_configuration_get_redlink_key();
 
-	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/update?key=$redlink_key";
+    // construct the API URL.
+    return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/update?key=$redlink_key";
 
 }
 
@@ -384,17 +384,17 @@ 
  */
 function wl_configuration_get_dataset_index_url() {
 
-	// If the WordLift Key is set, we use WordLift.
-	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/index";
-	}
+    // If the WordLift Key is set, we use WordLift.
+    $key = wl_configuration_get_key();
+    if ( ! empty( $key ) ) {
+        return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/index";
+    }
 
-	// get the configuration.
-	$redlink_dataset = wl_configuration_get_redlink_dataset_name();
-	$redlink_key     = wl_configuration_get_redlink_key();
+    // get the configuration.
+    $redlink_dataset = wl_configuration_get_redlink_dataset_name();
+    $redlink_key     = wl_configuration_get_redlink_key();
 
-	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/release?key=$redlink_key";
+    // construct the API URL.
+    return wl_configuration_get_api_url() . "/data/$redlink_dataset/release?key=$redlink_key";
 
 }
\ No newline at end of file

Spacing +49 added lines, -49 removed lines

@@ -8,12 +8,12 @@ 
  * @param string $key      The setting name.
  * @param string $value    The setting value.
  */
-function wl_configuration_set( $settings, $key, $value ) {
+function wl_configuration_set($settings, $key, $value) {
 
-	$options         = get_option( $settings );
-	$options         = isset( $options ) ? $options : array();
-	$options[ $key ] = $value;
-	update_option( $settings, $options );
+	$options         = get_option($settings);
+	$options         = isset($options) ? $options : array();
+	$options[$key] = $value;
+	update_option($settings, $options);
 }
 
 
@@ -48,9 +48,9 @@ 
  *
  * @param string $value The WordLift key.
  */
-function wl_configuration_set_key( $value ) {
+function wl_configuration_set_key($value) {
 
-	Wordlift_Configuration_Service::get_instance()->set_key( $value );
+	Wordlift_Configuration_Service::get_instance()->set_key($value);
 
 //	wl_configuration_set( 'wl_general_settings', 'key', $value );
 
@@ -83,9 +83,9 @@ 
  *
  * @param string $value The two-letter language code.
  */
-function wl_configuration_set_site_language( $value ) {
+function wl_configuration_set_site_language($value) {
 
-	Wordlift_Configuration_Service::get_instance()->set_language_code( $value );
+	Wordlift_Configuration_Service::get_instance()->set_language_code($value);
 
 //	wl_configuration_set( 'wl_general_settings', 'site_language', $value );
 }
@@ -99,9 +99,9 @@ 
  */
 function wl_configuration_get_api_url() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['api_url'] ) ? '' : $options['api_url'] );
+	return (empty($options['api_url']) ? '' : $options['api_url']);
 
 }
 
@@ -114,9 +114,9 @@ 
  *
  * @param string $value The API URL.
  */
-function wl_configuration_set_api_url( $value ) {
+function wl_configuration_set_api_url($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'api_url', $value );
+	wl_configuration_set('wl_advanced_settings', 'api_url', $value);
 }
 
 /**
@@ -128,9 +128,9 @@ 
  */
 function wl_configuration_get_redlink_key() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_key'] ) ? '' : $options['redlink_key'] );
+	return (empty($options['redlink_key']) ? '' : $options['redlink_key']);
 
 }
 
@@ -143,9 +143,9 @@ 
  *
  * @param string $value The Redlink application key.
  */
-function wl_configuration_set_redlink_key( $value ) {
+function wl_configuration_set_redlink_key($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_key', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_key', $value);
 }
 
 /**
@@ -157,9 +157,9 @@ 
  */
 function wl_configuration_get_redlink_user_id() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_user_id'] ) ? '' : $options['redlink_user_id'] );
+	return (empty($options['redlink_user_id']) ? '' : $options['redlink_user_id']);
 
 }
 
@@ -172,9 +172,9 @@ 
  *
  * @param string $value The Redlink user id.
  */
-function wl_configuration_set_redlink_user_id( $value ) {
+function wl_configuration_set_redlink_user_id($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_user_id', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_user_id', $value);
 }
 
 /**
@@ -186,9 +186,9 @@ 
  */
 function wl_configuration_get_redlink_dataset_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_dataset_name'] ) ? '' : $options['redlink_dataset_name'] );
+	return (empty($options['redlink_dataset_name']) ? '' : $options['redlink_dataset_name']);
 }
 
 
@@ -201,9 +201,9 @@ 
  *
  * @param string $value The Redlink dataset name.
  */
-function wl_configuration_set_redlink_dataset_name( $value ) {
+function wl_configuration_set_redlink_dataset_name($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_dataset_name', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_dataset_name', $value);
 }
 
 /**
@@ -231,9 +231,9 @@ 
  *
  * @param string $value The Redlink dataset URI.
  */
-function wl_configuration_set_redlink_dataset_uri( $value ) {
+function wl_configuration_set_redlink_dataset_uri($value) {
 
-	Wordlift_Configuration_Service::get_instance()->set_dataset_uri( $value );
+	Wordlift_Configuration_Service::get_instance()->set_dataset_uri($value);
 }
 
 /**
@@ -245,9 +245,9 @@ 
  */
 function wl_configuration_get_redlink_application_name() {
 
-	$options = get_option( 'wl_advanced_settings', '' );
+	$options = get_option('wl_advanced_settings', '');
 
-	return ( empty( $options['redlink_application_name'] ) ? '' : $options['redlink_application_name'] );
+	return (empty($options['redlink_application_name']) ? '' : $options['redlink_application_name']);
 }
 
 
@@ -258,9 +258,9 @@ 
  *
  * @param string $value The Redlink application name.
  */
-function wl_configuration_set_redlink_application_name( $value ) {
+function wl_configuration_set_redlink_application_name($value) {
 
-	wl_configuration_set( 'wl_advanced_settings', 'redlink_application_name', $value );
+	wl_configuration_set('wl_advanced_settings', 'redlink_application_name', $value);
 }
 
 /**
@@ -279,9 +279,9 @@ 
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "analyses?key=$key"
-		       . ( defined( 'WL_EXCLUDE_IMAGES_REGEX' ) ? '&exclimage=' . urlencode( WL_EXCLUDE_IMAGES_REGEX ) : '' );
+	if ( ! empty($key)) {
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."analyses?key=$key"
+		       . (defined('WL_EXCLUDE_IMAGES_REGEX') ? '&exclimage='.urlencode(WL_EXCLUDE_IMAGES_REGEX) : '');
 	}
 
 	// Otherwise use Redlink.
@@ -297,8 +297,8 @@ 
         vcard:locality = lode:atPlace/gn:name :: xsd:string;
 EOF;
 
-	return wl_configuration_get_api_url() . "/analysis/$analysis_name/enhance?key=$app_key" .
-	       '&enhancer.engines.dereference.ldpath=' . urlencode( $ldpath );
+	return wl_configuration_get_api_url()."/analysis/$analysis_name/enhance?key=$app_key".
+	       '&enhancer.engines.dereference.ldpath='.urlencode($ldpath);
 
 }
 
@@ -314,9 +314,9 @@ 
  *
  * @return string The API URI.
  */
-function wl_configuration_get_accounts_by_key_dataset_uri( $key ) {
+function wl_configuration_get_accounts_by_key_dataset_uri($key) {
 
-	return Wordlift_Configuration_Service::get_instance()->get_accounts_by_key_dataset_uri( $key );
+	return Wordlift_Configuration_Service::get_instance()->get_accounts_by_key_dataset_uri($key);
 
 	//return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "accounts/key=$key/dataset_uri";
 }
@@ -332,21 +332,21 @@ 
  *
  * @return string The URL to call to perform the SELECT query.
  */
-function wl_configuration_get_query_select_url( $output, $dataset = null ) {
+function wl_configuration_get_query_select_url($output, $dataset = null) {
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
+	if ( ! empty($key)) {
 		// TODO: handle the output format for WordLift.
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries?q=";
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."datasets/key=$key/queries?q=";
 	}
 
 	// If no dataset has been specified then use the default configured, otherwise use the one provided.
-	$redlink_dataset = ( empty( $dataset ) ? wl_configuration_get_redlink_dataset_name() : $dataset );
+	$redlink_dataset = (empty($dataset) ? wl_configuration_get_redlink_dataset_name() : $dataset);
 	$redlink_key     = wl_configuration_get_redlink_key();
 
 	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
+	return wl_configuration_get_api_url()."/data/$redlink_dataset/sparql/select?key=$redlink_key&out=$output&query=";
 
 }
 
@@ -361,8 +361,8 @@ 
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/queries";
+	if ( ! empty($key)) {
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."datasets/key=$key/queries";
 	}
 
 	// get the configuration.
@@ -370,7 +370,7 @@ 
 	$redlink_key     = wl_configuration_get_redlink_key();
 
 	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/sparql/update?key=$redlink_key";
+	return wl_configuration_get_api_url()."/data/$redlink_dataset/sparql/update?key=$redlink_key";
 
 }
 
@@ -386,8 +386,8 @@ 
 
 	// If the WordLift Key is set, we use WordLift.
 	$key = wl_configuration_get_key();
-	if ( ! empty( $key ) ) {
-		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE . "datasets/key=$key/index";
+	if ( ! empty($key)) {
+		return WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE."datasets/key=$key/index";
 	}
 
 	// get the configuration.
@@ -395,6 +395,6 @@ 
 	$redlink_key     = wl_configuration_get_redlink_key();
 
 	// construct the API URL.
-	return wl_configuration_get_api_url() . "/data/$redlink_dataset/release?key=$redlink_key";
+	return wl_configuration_get_api_url()."/data/$redlink_dataset/release?key=$redlink_key";
 
 }
\ No newline at end of file

src/admin/class-wordlift-admin-language-select-element.php

Indentation +26 added lines, -26 removed lines

@@ -18,48 +18,48 @@
  */
 class Wordlift_Admin_Language_Select_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
 
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
-			'name'        => uniqid( 'wl-input-' ),
-			'value'       => '',
-			'description' => false,
-		) );
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'          => uniqid( 'wl-input-' ),
+            'name'        => uniqid( 'wl-input-' ),
+            'value'       => '',
+            'description' => false,
+        ) );
 
-		$description = $params['description'] ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+        $description = $params['description'] ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
 
-		?>
+        ?>
 		<select id="<?php echo esc_attr( $params['id'] ); ?>"
 		        name="<?php echo esc_attr( $params['name'] ); ?>">
 			<?php
-			// Print all the supported language, preselecting the one configured
-			// in WP (or English if not supported). We now use the `Wordlift_Languages`
-			// class which provides the list of languages supported by WordLift.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/349
+            // Print all the supported language, preselecting the one configured
+            // in WP (or English if not supported). We now use the `Wordlift_Languages`
+            // class which provides the list of languages supported by WordLift.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/349
 
-			// Get WordLift's supported languages.
-			$languages = Wordlift_Languages::get_languages();
+            // Get WordLift's supported languages.
+            $languages = Wordlift_Languages::get_languages();
 
-			// If we support WP's configured language, then use that, otherwise use English by default.
-			$language = isset( $languages[ $params['value'] ] ) ? $params['value'] : 'en';
+            // If we support WP's configured language, then use that, otherwise use English by default.
+            $language = isset( $languages[ $params['value'] ] ) ? $params['value'] : 'en';
 
-			foreach ( $languages as $code => $label ) { ?>
+            foreach ( $languages as $code => $label ) { ?>
 				<option value="<?php echo esc_attr( $code ); ?>"
 					<?php echo selected( $code, $language, false ) ?>><?php
-					echo esc_html( $label ) ?></option>
+                    echo esc_html( $label ) ?></option>
 			<?php } ?>
 		</select>
 		<?php echo $description; ?>
 
 		<?php
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -21,21 +21,21 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'          => uniqid( 'wl-input-' ),
-			'name'        => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'          => uniqid('wl-input-'),
+			'name'        => uniqid('wl-input-'),
 			'value'       => '',
 			'description' => false,
-		) );
+		));
 
-		$description = $params['description'] ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+		$description = $params['description'] ? '<p>'.wp_kses($params['description'], array('a' => array('href' => array()))).'</p>' : '';
 
 		?>
-		<select id="<?php echo esc_attr( $params['id'] ); ?>"
-		        name="<?php echo esc_attr( $params['name'] ); ?>">
+		<select id="<?php echo esc_attr($params['id']); ?>"
+		        name="<?php echo esc_attr($params['name']); ?>">
 			<?php
 			// Print all the supported language, preselecting the one configured
 			// in WP (or English if not supported). We now use the `Wordlift_Languages`
@@ -47,12 +47,12 @@ 
 			$languages = Wordlift_Languages::get_languages();
 
 			// If we support WP's configured language, then use that, otherwise use English by default.
-			$language = isset( $languages[ $params['value'] ] ) ? $params['value'] : 'en';
+			$language = isset($languages[$params['value']]) ? $params['value'] : 'en';
 
-			foreach ( $languages as $code => $label ) { ?>
-				<option value="<?php echo esc_attr( $code ); ?>"
-					<?php echo selected( $code, $language, false ) ?>><?php
-					echo esc_html( $label ) ?></option>
+			foreach ($languages as $code => $label) { ?>
+				<option value="<?php echo esc_attr($code); ?>"
+					<?php echo selected($code, $language, false) ?>><?php
+					echo esc_html($label) ?></option>
 			<?php } ?>
 		</select>
 		<?php echo $description; ?>

src/admin/class-wordlift-entity-type-settings.php

Indentation +168 added lines, -168 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -30,188 +30,188 @@ 
  */
 class Wordlift_Admin_Entity_Type_Settings {
 
-	/**
-	 * Handle menu registration.
-	 *
-	 * The registration is required, although we do not want to actually to add
-	 * an item to the menu, in order to "whitelist" the access to the settings page in
-	 * the admin.
-	 *
-	 * @since 3.11.0
-	 */
-	public function admin_menu() {
-
-		/*
+    /**
+     * Handle menu registration.
+     *
+     * The registration is required, although we do not want to actually to add
+     * an item to the menu, in order to "whitelist" the access to the settings page in
+     * the admin.
+     *
+     * @since 3.11.0
+     */
+    public function admin_menu() {
+
+        /*
 		 * Before anything else check if an settings form was submitted.
 		 * This has to be done before any output happens in order to be able to
 		 * display proper "die" error messages and redirect.
 		 */
-		if ( isset( $_GET['page'] ) && ( 'wl_entity_type_settings' === $_GET['page'] ) ) {
+        if ( isset( $_GET['page'] ) && ( 'wl_entity_type_settings' === $_GET['page'] ) ) {
 
-			// Validate inputs. Do not return on invalid parameters or capabilities.
-			$this->validate_proper_term();
+            // Validate inputs. Do not return on invalid parameters or capabilities.
+            $this->validate_proper_term();
 
-			// If proper form submission, handle it and redirect back to the settings page.
-			if ( isset( $_POST['action'] ) && ( 'wl_edit_entity_type_term' === $_POST['action'] ) ) {
-				$this->handle_form_submission();
-			}
+            // If proper form submission, handle it and redirect back to the settings page.
+            if ( isset( $_POST['action'] ) && ( 'wl_edit_entity_type_term' === $_POST['action'] ) ) {
+                $this->handle_form_submission();
+            }
 
-			// Register admin notices handler.
-			add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+            // Register admin notices handler.
+            add_action( 'admin_notices', array( $this, 'admin_notice' ) );
 
-		}
+        }
 
-		/*
+        /*
 		 * Use a null parent slug to prevent the menu from actually appearing
 		 * in the admin menu.
 		 */
-		// @todo: use the new {@link Wordlift_Admin_Page}.
-		add_submenu_page(
-			null,
-			__( 'Edit Entity term', 'wordlift' ),
-			__( 'Edit Entity term', 'wordlift' ),
-			'manage_options',
-			'wl_entity_type_settings',
-			array( $this, 'render' )
-		);
-	}
-
-	/**
-	 * Output admin notices if needed, based on the message url parameter.
-	 * A value of 1 indicates that a successful save was done.
-	 *
-	 * @since 3.11.0
-	 */
-	function admin_notice() {
-		if ( isset( $_GET['message'] ) && ( '1' === $_GET['message'] ) ) {
-			?>
+        // @todo: use the new {@link Wordlift_Admin_Page}.
+        add_submenu_page(
+            null,
+            __( 'Edit Entity term', 'wordlift' ),
+            __( 'Edit Entity term', 'wordlift' ),
+            'manage_options',
+            'wl_entity_type_settings',
+            array( $this, 'render' )
+        );
+    }
+
+    /**
+     * Output admin notices if needed, based on the message url parameter.
+     * A value of 1 indicates that a successful save was done.
+     *
+     * @since 3.11.0
+     */
+    function admin_notice() {
+        if ( isset( $_GET['message'] ) && ( '1' === $_GET['message'] ) ) {
+            ?>
 			<div class="notice notice-success is-dismissible">
 				<p><?php esc_html_e( 'Settings saved', 'wordlift' ) ?></p>
 			</div>
 			<?php
-		}
-	}
-
-	/**
-	 * Validate the existence of the entity type indicated by the tag_ID url
-	 * parameter before doing any processing. Done before any output to mimic
-	 * the way WordPress handles same situation with "normal" term editing screens.
-	 *
-	 * @since 3.11.0
-	 */
-	function validate_proper_term() {
-
-		// Validate capabilities.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
-				403
-			);
-		}
-
-		// Get the term id and the actual term.
-		$term_id = (int) $_REQUEST['tag_ID'];
-		$term    = get_term( $term_id, 'wl_entity_type' );
-
-		if ( ! $term instanceof WP_Term ) {
-			wp_die( __( 'You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift' ) );
-		}
-
-	}
-
-	/**
-	 * Handle the form submission of the settings form. On successful
-	 * handling redirect tp the setting edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	function handle_form_submission() {
-
-		$term_id = (int) $_POST['tag_ID'];
-
-		// Check the nonce.
-		check_admin_referer( 'update-entity_type_term_' . $term_id );
-
-		$term = get_term( $term_id, 'wl_entity_type' );
-
-		$this->set_setting(
-			$term_id,
-			trim( wp_unslash( $_POST['title'] ) ),
-			wp_unslash( $_POST['description'] )
-		);
-
-		// Redirect back to the term settings page and indicate a save was done.
-		$url = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1" );
-
-		wp_redirect( $url );
-		exit;
-
-	}
-
-	/**
-	 * Render the settings page for the term.
-	 *
-	 * Access and parameter validity is assumed to be done earlier.
-	 *
-	 * @since 3.11.0
-	 */
-	function render() {
-
-		// Set variables used by the partial
-		$term_id  = absint( $_REQUEST['tag_ID'] );
-		$settings = $this->get_setting( $term_id );
-
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-entity-type-settings.php';
-
-	}
-
-	/**
-	 * Store the entity type term settings in the DB
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param    integer $term_id     The ID of the entity type term
-	 * @param    string  $title       The override for the terms title.
-	 * @param    string  $description The override for the terms description.
-	 *
-	 */
-	function set_setting( $term_id, $title, $description ) {
-
-		$settings             = get_option( 'wl_entity_type_settings', array() );
-		$settings[ $term_id ] = array(
-			'title'       => $title,
-			'description' => $description,
-		);
-		update_option( 'wl_entity_type_settings', $settings );
-
-	}
-
-	/**
-	 * Retrieve the entity type term settings from the DB
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param    integer $term_id The ID of the entity type term
-	 *
-	 * @return    null|array {
-	 *                null is returned when there are no settings otherwise
-	 *                an array is returned with following fields
-	 *
-	 * @type    string    title    The overriding title for the term
-	 * @type    string    description    The overriding description for the term
-	 *            }
-	 */
-	function get_setting( $term_id ) {
-
-		$settings = get_option( 'wl_entity_type_settings', array() );
-
-		if ( isset( $settings[ $term_id ] ) ) {
-			return $settings[ $term_id ];
-		} else {
-			null;
-		}
-
-	}
+        }
+    }
+
+    /**
+     * Validate the existence of the entity type indicated by the tag_ID url
+     * parameter before doing any processing. Done before any output to mimic
+     * the way WordPress handles same situation with "normal" term editing screens.
+     *
+     * @since 3.11.0
+     */
+    function validate_proper_term() {
+
+        // Validate capabilities.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die(
+                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+                403
+            );
+        }
+
+        // Get the term id and the actual term.
+        $term_id = (int) $_REQUEST['tag_ID'];
+        $term    = get_term( $term_id, 'wl_entity_type' );
+
+        if ( ! $term instanceof WP_Term ) {
+            wp_die( __( 'You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift' ) );
+        }
+
+    }
+
+    /**
+     * Handle the form submission of the settings form. On successful
+     * handling redirect tp the setting edit page.
+     *
+     * @since 3.11.0
+     */
+    function handle_form_submission() {
+
+        $term_id = (int) $_POST['tag_ID'];
+
+        // Check the nonce.
+        check_admin_referer( 'update-entity_type_term_' . $term_id );
+
+        $term = get_term( $term_id, 'wl_entity_type' );
+
+        $this->set_setting(
+            $term_id,
+            trim( wp_unslash( $_POST['title'] ) ),
+            wp_unslash( $_POST['description'] )
+        );
+
+        // Redirect back to the term settings page and indicate a save was done.
+        $url = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1" );
+
+        wp_redirect( $url );
+        exit;
+
+    }
+
+    /**
+     * Render the settings page for the term.
+     *
+     * Access and parameter validity is assumed to be done earlier.
+     *
+     * @since 3.11.0
+     */
+    function render() {
+
+        // Set variables used by the partial
+        $term_id  = absint( $_REQUEST['tag_ID'] );
+        $settings = $this->get_setting( $term_id );
+
+        include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-entity-type-settings.php';
+
+    }
+
+    /**
+     * Store the entity type term settings in the DB
+     *
+     * @since 3.11.0
+     *
+     * @param    integer $term_id     The ID of the entity type term
+     * @param    string  $title       The override for the terms title.
+     * @param    string  $description The override for the terms description.
+     *
+     */
+    function set_setting( $term_id, $title, $description ) {
+
+        $settings             = get_option( 'wl_entity_type_settings', array() );
+        $settings[ $term_id ] = array(
+            'title'       => $title,
+            'description' => $description,
+        );
+        update_option( 'wl_entity_type_settings', $settings );
+
+    }
+
+    /**
+     * Retrieve the entity type term settings from the DB
+     *
+     * @since 3.11.0
+     *
+     * @param    integer $term_id The ID of the entity type term
+     *
+     * @return    null|array {
+     *                null is returned when there are no settings otherwise
+     *                an array is returned with following fields
+     *
+     * @type    string    title    The overriding title for the term
+     * @type    string    description    The overriding description for the term
+     *            }
+     */
+    function get_setting( $term_id ) {
+
+        $settings = get_option( 'wl_entity_type_settings', array() );
+
+        if ( isset( $settings[ $term_id ] ) ) {
+            return $settings[ $term_id ];
+        } else {
+            null;
+        }
+
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -12,7 +12,7 @@ 
  * @since      3.11.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -46,18 +46,18 @@ 
 		 * This has to be done before any output happens in order to be able to
 		 * display proper "die" error messages and redirect.
 		 */
-		if ( isset( $_GET['page'] ) && ( 'wl_entity_type_settings' === $_GET['page'] ) ) {
+		if (isset($_GET['page']) && ('wl_entity_type_settings' === $_GET['page'])) {
 
 			// Validate inputs. Do not return on invalid parameters or capabilities.
 			$this->validate_proper_term();
 
 			// If proper form submission, handle it and redirect back to the settings page.
-			if ( isset( $_POST['action'] ) && ( 'wl_edit_entity_type_term' === $_POST['action'] ) ) {
+			if (isset($_POST['action']) && ('wl_edit_entity_type_term' === $_POST['action'])) {
 				$this->handle_form_submission();
 			}
 
 			// Register admin notices handler.
-			add_action( 'admin_notices', array( $this, 'admin_notice' ) );
+			add_action('admin_notices', array($this, 'admin_notice'));
 
 		}
 
@@ -68,11 +68,11 @@ 
 		// @todo: use the new {@link Wordlift_Admin_Page}.
 		add_submenu_page(
 			null,
-			__( 'Edit Entity term', 'wordlift' ),
-			__( 'Edit Entity term', 'wordlift' ),
+			__('Edit Entity term', 'wordlift'),
+			__('Edit Entity term', 'wordlift'),
 			'manage_options',
 			'wl_entity_type_settings',
-			array( $this, 'render' )
+			array($this, 'render')
 		);
 	}
 
@@ -83,10 +83,10 @@ 
 	 * @since 3.11.0
 	 */
 	function admin_notice() {
-		if ( isset( $_GET['message'] ) && ( '1' === $_GET['message'] ) ) {
+		if (isset($_GET['message']) && ('1' === $_GET['message'])) {
 			?>
 			<div class="notice notice-success is-dismissible">
-				<p><?php esc_html_e( 'Settings saved', 'wordlift' ) ?></p>
+				<p><?php esc_html_e('Settings saved', 'wordlift') ?></p>
 			</div>
 			<?php
 		}
@@ -102,20 +102,20 @@ 
 	function validate_proper_term() {
 
 		// Validate capabilities.
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 				403
 			);
 		}
 
 		// Get the term id and the actual term.
 		$term_id = (int) $_REQUEST['tag_ID'];
-		$term    = get_term( $term_id, 'wl_entity_type' );
+		$term    = get_term($term_id, 'wl_entity_type');
 
-		if ( ! $term instanceof WP_Term ) {
-			wp_die( __( 'You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift' ) );
+		if ( ! $term instanceof WP_Term) {
+			wp_die(__('You attempted to edit an entity type term that doesn&#8217;t exist.', 'wordlift'));
 		}
 
 	}
@@ -131,20 +131,20 @@ 
 		$term_id = (int) $_POST['tag_ID'];
 
 		// Check the nonce.
-		check_admin_referer( 'update-entity_type_term_' . $term_id );
+		check_admin_referer('update-entity_type_term_'.$term_id);
 
-		$term = get_term( $term_id, 'wl_entity_type' );
+		$term = get_term($term_id, 'wl_entity_type');
 
 		$this->set_setting(
 			$term_id,
-			trim( wp_unslash( $_POST['title'] ) ),
-			wp_unslash( $_POST['description'] )
+			trim(wp_unslash($_POST['title'])),
+			wp_unslash($_POST['description'])
 		);
 
 		// Redirect back to the term settings page and indicate a save was done.
-		$url = admin_url( "admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1" );
+		$url = admin_url("admin.php?page=wl_entity_type_settings&tag_ID=$term->term_id&message=1");
 
-		wp_redirect( $url );
+		wp_redirect($url);
 		exit;
 
 	}
@@ -159,10 +159,10 @@ 
 	function render() {
 
 		// Set variables used by the partial
-		$term_id  = absint( $_REQUEST['tag_ID'] );
-		$settings = $this->get_setting( $term_id );
+		$term_id  = absint($_REQUEST['tag_ID']);
+		$settings = $this->get_setting($term_id);
 
-		include plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/wordlift-admin-entity-type-settings.php';
+		include plugin_dir_path(dirname(__FILE__)).'admin/partials/wordlift-admin-entity-type-settings.php';
 
 	}
 
@@ -176,14 +176,14 @@ 
 	 * @param    string  $description The override for the terms description.
 	 *
 	 */
-	function set_setting( $term_id, $title, $description ) {
+	function set_setting($term_id, $title, $description) {
 
-		$settings             = get_option( 'wl_entity_type_settings', array() );
-		$settings[ $term_id ] = array(
+		$settings             = get_option('wl_entity_type_settings', array());
+		$settings[$term_id] = array(
 			'title'       => $title,
 			'description' => $description,
 		);
-		update_option( 'wl_entity_type_settings', $settings );
+		update_option('wl_entity_type_settings', $settings);
 
 	}
 
@@ -202,12 +202,12 @@ 
 	 * @type    string    description    The overriding description for the term
 	 *            }
 	 */
-	function get_setting( $term_id ) {
+	function get_setting($term_id) {
 
-		$settings = get_option( 'wl_entity_type_settings', array() );
+		$settings = get_option('wl_entity_type_settings', array());
 
-		if ( isset( $settings[ $term_id ] ) ) {
-			return $settings[ $term_id ];
+		if (isset($settings[$term_id])) {
+			return $settings[$term_id];
 		} else {
 			null;
 		}

src/admin/wordlift_admin.php

Indentation +29 added lines, -29 removed lines

@@ -15,21 +15,21 @@ 
  */
 function wl_serialize_entity( $entity ) {
 
-	$entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
+    $entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
 	
-	$type   = wl_entity_type_taxonomy_get_type( $entity->ID );
-	$images = wl_get_image_urls( $entity->ID );
+    $type   = wl_entity_type_taxonomy_get_type( $entity->ID );
+    $images = wl_get_image_urls( $entity->ID );
 
-	return array(
-		'id'         	=> wl_get_entity_uri( $entity->ID ),
-		'label'      	=> $entity->post_title,
-		'description'	=> $entity->post_content,
-		'sameAs'     	=> wl_schema_get_value( $entity->ID, 'sameAs' ),
-		'mainType'      => str_replace( 'wl-', '', $type['css_class'] ),
-		'types'      	=> wl_get_entity_rdf_types( $entity->ID ),
-		'images' 		=> $images,
+    return array(
+        'id'         	=> wl_get_entity_uri( $entity->ID ),
+        'label'      	=> $entity->post_title,
+        'description'	=> $entity->post_content,
+        'sameAs'     	=> wl_schema_get_value( $entity->ID, 'sameAs' ),
+        'mainType'      => str_replace( 'wl-', '', $type['css_class'] ),
+        'types'      	=> wl_get_entity_rdf_types( $entity->ID ),
+        'images' 		=> $images,
 
-	);
+    );
 }
 
 /**
@@ -43,22 +43,22 @@ 
  */
 function wl_remove_text_annotations( $data ) {
 
-	// Remove blank elements that can interfere with annoataions removing
-	// See https://github.com/insideout10/wordlift-plugin/issues/234
-	// Just blank attributes without any attribtues are cleaned up
-	$pattern = '/<(\w+)><\/\1>/im';
-	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
-	}
-	// Remove text annotations
-	//    <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">
-	$pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
-	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
-	}
-	return $data;
+    // Remove blank elements that can interfere with annoataions removing
+    // See https://github.com/insideout10/wordlift-plugin/issues/234
+    // Just blank attributes without any attribtues are cleaned up
+    $pattern = '/<(\w+)><\/\1>/im';
+    // Remove the pattern while it is found (match nested annotations).
+    while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
+        $data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+    }
+    // Remove text annotations
+    //    <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">
+    $pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
+    // Remove the pattern while it is found (match nested annotations).
+    while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
+        $data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+    }
+    return $data;
 }
 
 add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
@@ -74,5 +74,5 @@ 
  */
 function wl_admin_metaboxes_add_css_class( $classes = array() ){
 	
-	return array_merge( $classes, array( 'wl-metabox' ) );
+    return array_merge( $classes, array( 'wl-metabox' ) );
 }

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  */
 
 // Add the Admin menu.
-require_once( 'wordlift_admin_menu.php' );
+require_once('wordlift_admin_menu.php');
 
 /**
  * Serialize an entity post.
@@ -13,20 +13,20 @@ 
  *
  * @return array mixed The entity data array.
  */
-function wl_serialize_entity( $entity ) {
+function wl_serialize_entity($entity) {
 
-	$entity = ( is_numeric( $entity ) ) ? get_post( $entity ) : $entity;
+	$entity = (is_numeric($entity)) ? get_post($entity) : $entity;
 	
-	$type   = wl_entity_type_taxonomy_get_type( $entity->ID );
-	$images = wl_get_image_urls( $entity->ID );
+	$type   = wl_entity_type_taxonomy_get_type($entity->ID);
+	$images = wl_get_image_urls($entity->ID);
 
 	return array(
-		'id'         	=> wl_get_entity_uri( $entity->ID ),
+		'id'         	=> wl_get_entity_uri($entity->ID),
 		'label'      	=> $entity->post_title,
 		'description'	=> $entity->post_content,
-		'sameAs'     	=> wl_schema_get_value( $entity->ID, 'sameAs' ),
-		'mainType'      => str_replace( 'wl-', '', $type['css_class'] ),
-		'types'      	=> wl_get_entity_rdf_types( $entity->ID ),
+		'sameAs'     	=> wl_schema_get_value($entity->ID, 'sameAs'),
+		'mainType'      => str_replace('wl-', '', $type['css_class']),
+		'types'      	=> wl_get_entity_rdf_types($entity->ID),
 		'images' 		=> $images,
 
 	);
@@ -41,27 +41,27 @@ 
  *
  * @return array mixed The post data array.
  */
-function wl_remove_text_annotations( $data ) {
+function wl_remove_text_annotations($data) {
 
 	// Remove blank elements that can interfere with annoataions removing
 	// See https://github.com/insideout10/wordlift-plugin/issues/234
 	// Just blank attributes without any attribtues are cleaned up
 	$pattern = '/<(\w+)><\/\1>/im';
 	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+	while (1 === preg_match($pattern, $data['post_content'])) {		
+		$data['post_content'] = preg_replace($pattern, '$2', $data['post_content'], -1, $count); 
 	}
 	// Remove text annotations
 	//    <span class="textannotation" id="urn:enhancement-777cbed4-b131-00fb-54a4-ed9b26ae57ea">
 	$pattern = '/<(\w+)[^>]*\sclass=\\\"textannotation(?![^\\"]*\sdisambiguated)[^\\"]*\\\"[^>]*>([^<]+)<\/\1>/im';
 	// Remove the pattern while it is found (match nested annotations).
-	while ( 1 === preg_match( $pattern, $data['post_content'] ) ) {		
-		$data['post_content'] = preg_replace( $pattern, '$2', $data['post_content'], -1, $count ); 
+	while (1 === preg_match($pattern, $data['post_content'])) {		
+		$data['post_content'] = preg_replace($pattern, '$2', $data['post_content'], -1, $count); 
 	}
 	return $data;
 }
 
-add_filter( 'wp_insert_post_data', 'wl_remove_text_annotations', '98', 1 );
+add_filter('wp_insert_post_data', 'wl_remove_text_annotations', '98', 1);
 
 /**
  * Adds wl-metabox CSS class to a metabox.
@@ -72,7 +72,7 @@ 
  *
  * @return array The updated list of CSS classes.
  */
-function wl_admin_metaboxes_add_css_class( $classes = array() ){
+function wl_admin_metaboxes_add_css_class($classes = array()) {
 	
-	return array_merge( $classes, array( 'wl-metabox' ) );
+	return array_merge($classes, array('wl-metabox'));
 }