insideout10 / wordlift-plugin

src/admin/wordlift_admin_ajax_related_posts.php

Indentation +39 added lines, -39 removed lines

@@ -16,57 +16,57 @@
  */
 function wordlift_ajax_related_posts( $http_raw_data = null ) {
 
-	// Extract filtering conditions
-	if ( ! isset( $_GET["post_id"] ) || ! is_numeric( $_GET["post_id"] ) ) {
-		wp_die( 'Post id missing or invalid!' );
+    // Extract filtering conditions
+    if ( ! isset( $_GET["post_id"] ) || ! is_numeric( $_GET["post_id"] ) ) {
+        wp_die( 'Post id missing or invalid!' );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the current post
-	$post_id = (int) $_GET["post_id"];
-	$post    = get_post( $post_id );
+    // Get the current post
+    $post_id = (int) $_GET["post_id"];
+    $post    = get_post( $post_id );
 
-	Wordlift_Log_Service::get_logger( 'wordlift_ajax_related_posts' )->trace( "Going to find posts related to current with post id: $post_id ..." );
+    Wordlift_Log_Service::get_logger( 'wordlift_ajax_related_posts' )->trace( "Going to find posts related to current with post id: $post_id ..." );
 
-	// Extract filtering conditions
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+    // Extract filtering conditions
+    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
+    $filtering_entity_uris = json_decode( $filtering_entity_uris );
 
-	$filtering_entity_ids = wl_get_entity_post_ids_by_uris( $filtering_entity_uris );
-	$related_posts        = array();
+    $filtering_entity_ids = wl_get_entity_post_ids_by_uris( $filtering_entity_uris );
+    $related_posts        = array();
 
-	// If the current post is an entity, related posts to the current entity are
-	// returned.
-	$entity_service = Wordlift_Entity_Service::get_instance();
+    // If the current post is an entity, related posts to the current entity are
+    // returned.
+    $entity_service = Wordlift_Entity_Service::get_instance();
 
-	if ( $entity_service->is_entity( $post->ID ) ) {
-		$filtering_entity_ids = array( $post_id );
-	}
+    if ( $entity_service->is_entity( $post->ID ) ) {
+        $filtering_entity_ids = array( $post_id );
+    }
 
-	if ( ! empty( $filtering_entity_ids ) ) {
+    if ( ! empty( $filtering_entity_ids ) ) {
 
-		$related_posts = Wordlift_Relation_Service::get_instance()
-		                                          ->get_article_subjects( $filtering_entity_ids, '*', null, 'publish', array( $post_id ), 5 );
+        $related_posts = Wordlift_Relation_Service::get_instance()
+                                                    ->get_article_subjects( $filtering_entity_ids, '*', null, 'publish', array( $post_id ), 5 );
 
-		foreach ( $related_posts as $post_obj ) {
+        foreach ( $related_posts as $post_obj ) {
 
-			/**
-			 * Use the thumbnail.
-			 *
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-			 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-			 *
-			 * @since 3.19.3 We're using the medium size image.
-			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->link      = get_edit_post_link( $post_obj->ID, 'none' );
-			$post_obj->permalink = get_post_permalink( $post_obj->ID );
-		}
-	}
+            /**
+             * Use the thumbnail.
+             *
+             * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+             * @see https://github.com/insideout10/wordlift-plugin/issues/837
+             *
+             * @since 3.19.3 We're using the medium size image.
+             */
+            $thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
+            $post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+            $post_obj->link      = get_edit_post_link( $post_obj->ID, 'none' );
+            $post_obj->permalink = get_post_permalink( $post_obj->ID );
+        }
+    }
 
-	wl_core_send_json( $related_posts );
+    wl_core_send_json( $related_posts );
 
 }
 

Spacing +19 added lines, -19 removed lines

@@ -14,42 +14,42 @@ 
  *
  * @param null $http_raw_data
  */
-function wordlift_ajax_related_posts( $http_raw_data = null ) {
+function wordlift_ajax_related_posts($http_raw_data = null) {
 
 	// Extract filtering conditions
-	if ( ! isset( $_GET["post_id"] ) || ! is_numeric( $_GET["post_id"] ) ) {
-		wp_die( 'Post id missing or invalid!' );
+	if ( ! isset($_GET["post_id"]) || ! is_numeric($_GET["post_id"])) {
+		wp_die('Post id missing or invalid!');
 
 		return;
 	}
 
 	// Get the current post
 	$post_id = (int) $_GET["post_id"];
-	$post    = get_post( $post_id );
+	$post    = get_post($post_id);
 
-	Wordlift_Log_Service::get_logger( 'wordlift_ajax_related_posts' )->trace( "Going to find posts related to current with post id: $post_id ..." );
+	Wordlift_Log_Service::get_logger('wordlift_ajax_related_posts')->trace("Going to find posts related to current with post id: $post_id ...");
 
 	// Extract filtering conditions
-	$filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents( "php://input" ) : $http_raw_data;
-	$filtering_entity_uris = json_decode( $filtering_entity_uris );
+	$filtering_entity_uris = (null == $http_raw_data) ? file_get_contents("php://input") : $http_raw_data;
+	$filtering_entity_uris = json_decode($filtering_entity_uris);
 
-	$filtering_entity_ids = wl_get_entity_post_ids_by_uris( $filtering_entity_uris );
+	$filtering_entity_ids = wl_get_entity_post_ids_by_uris($filtering_entity_uris);
 	$related_posts        = array();
 
 	// If the current post is an entity, related posts to the current entity are
 	// returned.
 	$entity_service = Wordlift_Entity_Service::get_instance();
 
-	if ( $entity_service->is_entity( $post->ID ) ) {
-		$filtering_entity_ids = array( $post_id );
+	if ($entity_service->is_entity($post->ID)) {
+		$filtering_entity_ids = array($post_id);
 	}
 
-	if ( ! empty( $filtering_entity_ids ) ) {
+	if ( ! empty($filtering_entity_ids)) {
 
 		$related_posts = Wordlift_Relation_Service::get_instance()
-		                                          ->get_article_subjects( $filtering_entity_ids, '*', null, 'publish', array( $post_id ), 5 );
+		                                          ->get_article_subjects($filtering_entity_ids, '*', null, 'publish', array($post_id), 5);
 
-		foreach ( $related_posts as $post_obj ) {
+		foreach ($related_posts as $post_obj) {
 
 			/**
 			 * Use the thumbnail.
@@ -59,15 +59,15 @@ 
 			 *
 			 * @since 3.19.3 We're using the medium size image.
 			 */
-			$thumbnail           = get_the_post_thumbnail_url( $post_obj, 'medium' );
-			$post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->link      = get_edit_post_link( $post_obj->ID, 'none' );
-			$post_obj->permalink = get_post_permalink( $post_obj->ID );
+			$thumbnail           = get_the_post_thumbnail_url($post_obj, 'medium');
+			$post_obj->thumbnail = ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+			$post_obj->link      = get_edit_post_link($post_obj->ID, 'none');
+			$post_obj->permalink = get_post_permalink($post_obj->ID);
 		}
 	}
 
-	wl_core_send_json( $related_posts );
+	wl_core_send_json($related_posts);
 
 }
 
-add_action( 'wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts' );
+add_action('wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts');

src/admin/class-wordlift-admin-term-adapter.php

Indentation +124 added lines, -124 removed lines

@@ -16,78 +16,78 @@ 
  */
 class Wordlift_Admin_Term_Adapter {
 
-	/**
-	 * The meta key holding the entity id.
-	 *
-	 * @since 3.20.0
-	 */
-	const META_KEY = '_wl_entity_id';
-
-	/**
-	 * Create a Wordlift_Admin_Term_Adapter instance.
-	 *
-	 * @since 3.20.0
-	 */
-	public function __construct() {
-
-		add_action( 'registered_taxonomy', array( $this, 'add_action', ) );
-		add_action( 'edit_term', array( $this, 'edit_term', ), 10, 3 );
-		$this->add_settings();
-
-	}
-
-	/**
-	 * Hook in to WordLift admin settings and add the term page specific
-	 * settings.
-	 * @since 3.26.1
-	 */
-	public function add_settings() {
-		add_filter( 'wl_admin_settings', function ( $params ) {
-			$params['show_local_entities'] = true;
-			return $params;
-		} );
-	}
-
-	/**
-	 * Add the form fields to the entity edit screen.
-	 *
-	 * @param object $tag Current taxonomy term object.
-	 * @param string $taxonomy Current taxonomy slug.
-	 *
-	 * @since 3.20.0
-	 *
-	 */
-	public function edit_form_fields( $tag, $taxonomy ) {
-
-	    // If disabled via filter, return;
-		if ( ! apply_filters( 'wl_feature__enable__term-entity', true ) ) {
-		    return;
+    /**
+     * The meta key holding the entity id.
+     *
+     * @since 3.20.0
+     */
+    const META_KEY = '_wl_entity_id';
+
+    /**
+     * Create a Wordlift_Admin_Term_Adapter instance.
+     *
+     * @since 3.20.0
+     */
+    public function __construct() {
+
+        add_action( 'registered_taxonomy', array( $this, 'add_action', ) );
+        add_action( 'edit_term', array( $this, 'edit_term', ), 10, 3 );
+        $this->add_settings();
+
+    }
+
+    /**
+     * Hook in to WordLift admin settings and add the term page specific
+     * settings.
+     * @since 3.26.1
+     */
+    public function add_settings() {
+        add_filter( 'wl_admin_settings', function ( $params ) {
+            $params['show_local_entities'] = true;
+            return $params;
+        } );
+    }
+
+    /**
+     * Add the form fields to the entity edit screen.
+     *
+     * @param object $tag Current taxonomy term object.
+     * @param string $taxonomy Current taxonomy slug.
+     *
+     * @since 3.20.0
+     *
+     */
+    public function edit_form_fields( $tag, $taxonomy ) {
+
+        // If disabled via filter, return;
+        if ( ! apply_filters( 'wl_feature__enable__term-entity', true ) ) {
+            return;
         }
 
-		global $wp_version;
+        global $wp_version;
 
-		// Enqueue the JavaScript app.
-		if ( version_compare( $wp_version, '5.0', '>=' ) ) {
-			$term_asset = include plugin_dir_path( dirname( __FILE__ ) ) . 'js/dist/term.asset.php';
-			wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.js', array_merge( array( 'wp-util' ), $term_asset['dependencies'] ), Wordlift::get_instance()->get_version(), true );
-		} else {
-			wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.full.js', array( 'wp-util' ), Wordlift::get_instance()->get_version(), true );
-		}
+        // Enqueue the JavaScript app.
+        if ( version_compare( $wp_version, '5.0', '>=' ) ) {
+            $term_asset = include plugin_dir_path( dirname( __FILE__ ) ) . 'js/dist/term.asset.php';
+            wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.js', array_merge( array( 'wp-util' ), $term_asset['dependencies'] ), Wordlift::get_instance()->get_version(), true );
+        } else {
+            wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.full.js', array( 'wp-util' ), Wordlift::get_instance()->get_version(), true );
+        }
 
-		wp_enqueue_style( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.css', array(), Wordlift::get_instance()->get_version() );
+        wp_enqueue_style( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.css', array(), Wordlift::get_instance()->get_version() );
 
-		$values = get_term_meta( $tag->term_id, self::META_KEY );
+        $values = get_term_meta( $tag->term_id, self::META_KEY );
 
-		/**
-		 * @since 3.31.3
+        /**
+         * @since 3.31.3
          * @see https://github.com/insideout10/wordlift-plugin/issues/1446
          * This field should be hidden by default
-		 */
-		if ( ! $values ) {
-		    return;
+         */
+        if ( ! $values ) {
+            return;
         }
 
-		?>
+        ?>
         <tr class="form-field term-name-wrap">
             <th scope="row"><label for="wl-entity-id"><?php _ex( 'Entity', 'term entity', 'wordlift' ); ?></label></th>
             <td>
@@ -99,69 +99,69 @@ 
             </td>
         </tr>
 		<?php
-	}
-
-	/**
-	 * Bind the new fields to the edit term screen.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param string $taxonomy The taxonomy name.
-	 */
-	public function add_action( $taxonomy ) {
-		/**
-		 * Filter wl_feature__enable__taxonomy_term_entity_mapping renamed to wl_feature__enable__term-entity.
+    }
+
+    /**
+     * Bind the new fields to the edit term screen.
+     *
+     * @since 3.20.0
+     *
+     * @param string $taxonomy The taxonomy name.
+     */
+    public function add_action( $taxonomy ) {
+        /**
+         * Filter wl_feature__enable__taxonomy_term_entity_mapping renamed to wl_feature__enable__term-entity.
          **/
 
-		add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_form_fields' ), 10, 2 );
-
-	}
-
-	/**
-	 * Hook to the edit term to handle our own custom fields.
-	 *
-	 * @since 3.20.0
-	 *
-	 * @param int    $term_id The term id.
-	 * @param int    $tt_id The term taxonomy id.
-	 * @param string $taxonomy The taxonomy.
-	 */
-	public function edit_term( $term_id, $tt_id, $taxonomy ) {
-
-		// Bail if the action isn't related to the term currently being edited.
-		if ( ! isset( $_POST['tag_ID'] ) || $term_id !== (int) $_POST['tag_ID'] ) {
-			return;
-		}
-
-		// Delete.
-		if ( ! isset( $_POST['wl_entity_id'] ) || ! is_array( $_POST['wl_entity_id'] ) || empty( $_POST['wl_entity_id'] ) ) {
-			delete_term_meta( $term_id, self::META_KEY );
-
-			return;
-		}
-
-		// Update.
-		//
-		// Only use mb_* functions when mbstring is available.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/693.
-		if ( extension_loaded( 'mbstring' ) ) {
-			mb_regex_encoding( 'UTF-8' );
-
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-			}, array() );
-		} else {
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, preg_split( "/\x{2063}/u", wp_unslash( $item ) ) );
-			}, array() );
-		}
-
-		delete_term_meta( $term_id, self::META_KEY );
-		foreach ( array_unique( array_filter( $merged ) ) as $single ) {
-			add_term_meta( $term_id, self::META_KEY, $single );
-		}
-
-	}
+        add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_form_fields' ), 10, 2 );
+
+    }
+
+    /**
+     * Hook to the edit term to handle our own custom fields.
+     *
+     * @since 3.20.0
+     *
+     * @param int    $term_id The term id.
+     * @param int    $tt_id The term taxonomy id.
+     * @param string $taxonomy The taxonomy.
+     */
+    public function edit_term( $term_id, $tt_id, $taxonomy ) {
+
+        // Bail if the action isn't related to the term currently being edited.
+        if ( ! isset( $_POST['tag_ID'] ) || $term_id !== (int) $_POST['tag_ID'] ) {
+            return;
+        }
+
+        // Delete.
+        if ( ! isset( $_POST['wl_entity_id'] ) || ! is_array( $_POST['wl_entity_id'] ) || empty( $_POST['wl_entity_id'] ) ) {
+            delete_term_meta( $term_id, self::META_KEY );
+
+            return;
+        }
+
+        // Update.
+        //
+        // Only use mb_* functions when mbstring is available.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/693.
+        if ( extension_loaded( 'mbstring' ) ) {
+            mb_regex_encoding( 'UTF-8' );
+
+            $merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
+                return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
+            }, array() );
+        } else {
+            $merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
+                return array_merge( $carry, preg_split( "/\x{2063}/u", wp_unslash( $item ) ) );
+            }, array() );
+        }
+
+        delete_term_meta( $term_id, self::META_KEY );
+        foreach ( array_unique( array_filter( $merged ) ) as $single ) {
+            add_term_meta( $term_id, self::META_KEY, $single );
+        }
+
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -30,8 +30,8 @@ 
 	 */
 	public function __construct() {
 
-		add_action( 'registered_taxonomy', array( $this, 'add_action', ) );
-		add_action( 'edit_term', array( $this, 'edit_term', ), 10, 3 );
+		add_action('registered_taxonomy', array($this, 'add_action',));
+		add_action('edit_term', array($this, 'edit_term',), 10, 3);
 		$this->add_settings();
 
 	}
@@ -42,7 +42,7 @@ 
 	 * @since 3.26.1
 	 */
 	public function add_settings() {
-		add_filter( 'wl_admin_settings', function ( $params ) {
+		add_filter('wl_admin_settings', function($params) {
 			$params['show_local_entities'] = true;
 			return $params;
 		} );
@@ -57,45 +57,45 @@ 
 	 * @since 3.20.0
 	 *
 	 */
-	public function edit_form_fields( $tag, $taxonomy ) {
+	public function edit_form_fields($tag, $taxonomy) {
 
 	    // If disabled via filter, return;
-		if ( ! apply_filters( 'wl_feature__enable__term-entity', true ) ) {
+		if ( ! apply_filters('wl_feature__enable__term-entity', true)) {
 		    return;
         }
 
 		global $wp_version;
 
 		// Enqueue the JavaScript app.
-		if ( version_compare( $wp_version, '5.0', '>=' ) ) {
-			$term_asset = include plugin_dir_path( dirname( __FILE__ ) ) . 'js/dist/term.asset.php';
-			wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.js', array_merge( array( 'wp-util' ), $term_asset['dependencies'] ), Wordlift::get_instance()->get_version(), true );
+		if (version_compare($wp_version, '5.0', '>=')) {
+			$term_asset = include plugin_dir_path(dirname(__FILE__)).'js/dist/term.asset.php';
+			wp_enqueue_script('wl-term', plugin_dir_url(dirname(__FILE__)).'js/dist/term.js', array_merge(array('wp-util'), $term_asset['dependencies']), Wordlift::get_instance()->get_version(), true);
 		} else {
-			wp_enqueue_script( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.full.js', array( 'wp-util' ), Wordlift::get_instance()->get_version(), true );
+			wp_enqueue_script('wl-term', plugin_dir_url(dirname(__FILE__)).'js/dist/term.full.js', array('wp-util'), Wordlift::get_instance()->get_version(), true);
 		}
 
-		wp_enqueue_style( 'wl-term', plugin_dir_url( dirname( __FILE__ ) ) . 'js/dist/term.css', array(), Wordlift::get_instance()->get_version() );
+		wp_enqueue_style('wl-term', plugin_dir_url(dirname(__FILE__)).'js/dist/term.css', array(), Wordlift::get_instance()->get_version());
 
-		$values = get_term_meta( $tag->term_id, self::META_KEY );
+		$values = get_term_meta($tag->term_id, self::META_KEY);
 
 		/**
 		 * @since 3.31.3
          * @see https://github.com/insideout10/wordlift-plugin/issues/1446
          * This field should be hidden by default
 		 */
-		if ( ! $values ) {
+		if ( ! $values) {
 		    return;
         }
 
 		?>
         <tr class="form-field term-name-wrap">
-            <th scope="row"><label for="wl-entity-id"><?php _ex( 'Entity', 'term entity', 'wordlift' ); ?></label></th>
+            <th scope="row"><label for="wl-entity-id"><?php _ex('Entity', 'term entity', 'wordlift'); ?></label></th>
             <td>
-				<?php foreach ( $values as $value ) { ?>
-                    <input type="text" name="wl_entity_id[]" value="<?php echo esc_attr( $value ); ?>"/>
+				<?php foreach ($values as $value) { ?>
+                    <input type="text" name="wl_entity_id[]" value="<?php echo esc_attr($value); ?>"/>
 				<?php } ?>
                 <div id="wl-term-entity-id"></div>
-                <p class="description"><?php _e( 'The entity bound to the term.', 'wordlift' ); ?></p>
+                <p class="description"><?php _e('The entity bound to the term.', 'wordlift'); ?></p>
             </td>
         </tr>
 		<?php
@@ -108,12 +108,12 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy name.
 	 */
-	public function add_action( $taxonomy ) {
+	public function add_action($taxonomy) {
 		/**
 		 * Filter wl_feature__enable__taxonomy_term_entity_mapping renamed to wl_feature__enable__term-entity.
          **/
 
-		add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_form_fields' ), 10, 2 );
+		add_action("{$taxonomy}_edit_form_fields", array($this, 'edit_form_fields'), 10, 2);
 
 	}
 
@@ -126,16 +126,16 @@ 
 	 * @param int    $tt_id The term taxonomy id.
 	 * @param string $taxonomy The taxonomy.
 	 */
-	public function edit_term( $term_id, $tt_id, $taxonomy ) {
+	public function edit_term($term_id, $tt_id, $taxonomy) {
 
 		// Bail if the action isn't related to the term currently being edited.
-		if ( ! isset( $_POST['tag_ID'] ) || $term_id !== (int) $_POST['tag_ID'] ) {
+		if ( ! isset($_POST['tag_ID']) || $term_id !== (int) $_POST['tag_ID']) {
 			return;
 		}
 
 		// Delete.
-		if ( ! isset( $_POST['wl_entity_id'] ) || ! is_array( $_POST['wl_entity_id'] ) || empty( $_POST['wl_entity_id'] ) ) {
-			delete_term_meta( $term_id, self::META_KEY );
+		if ( ! isset($_POST['wl_entity_id']) || ! is_array($_POST['wl_entity_id']) || empty($_POST['wl_entity_id'])) {
+			delete_term_meta($term_id, self::META_KEY);
 
 			return;
 		}
@@ -145,21 +145,21 @@ 
 		// Only use mb_* functions when mbstring is available.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/693.
-		if ( extension_loaded( 'mbstring' ) ) {
-			mb_regex_encoding( 'UTF-8' );
+		if (extension_loaded('mbstring')) {
+			mb_regex_encoding('UTF-8');
 
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, mb_split( "\x{2063}", wp_unslash( $item ) ) );
-			}, array() );
+			$merged = array_reduce((array) $_POST['wl_entity_id'], function($carry, $item) {
+				return array_merge($carry, mb_split("\x{2063}", wp_unslash($item)));
+			}, array());
 		} else {
-			$merged = array_reduce( (array) $_POST['wl_entity_id'], function ( $carry, $item ) {
-				return array_merge( $carry, preg_split( "/\x{2063}/u", wp_unslash( $item ) ) );
-			}, array() );
+			$merged = array_reduce((array) $_POST['wl_entity_id'], function($carry, $item) {
+				return array_merge($carry, preg_split("/\x{2063}/u", wp_unslash($item)));
+			}, array());
 		}
 
-		delete_term_meta( $term_id, self::META_KEY );
-		foreach ( array_unique( array_filter( $merged ) ) as $single ) {
-			add_term_meta( $term_id, self::META_KEY, $single );
+		delete_term_meta($term_id, self::META_KEY);
+		foreach (array_unique(array_filter($merged)) as $single) {
+			add_term_meta($term_id, self::META_KEY, $single);
 		}
 
 	}

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +268 added lines, -268 removed lines

@@ -20,32 +20,32 @@ 
  */
 function wl_shortcode_navigator_data() {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	// So that the endpoint can be used remotely
-	header( 'Access-Control-Allow-Origin: *' );
+    // So that the endpoint can be used remotely
+    header( 'Access-Control-Allow-Origin: *' );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_navigator_get_data();
+    $results = _wl_navigator_get_data();
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 }
 
 /**
@@ -60,240 +60,240 @@ 
  */
 function wl_network_navigator_wp_json( $request ) {
 
-	// Create the cache key.
-	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+    // Create the cache key.
+    $cache_key_params = $_REQUEST;
+    unset( $cache_key_params['uniqid'] );
+    $cache_key = array( 'request_params' => $cache_key_params );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+    // Create the TTL cache and try to get the results.
+    $cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
+    $cache_results = $cache->get( $cache_key );
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
 
-		return $cache_results;
-	}
+        return $cache_results;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = _wl_network_navigator_get_data( $request );
+    $results = _wl_network_navigator_get_data( $request );
 
-	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+    // Put the result before sending the json to the client, since sending the json will terminate us.
+    $cache->put( $cache_key, $results );
 
-	return $results;
+    return $results;
 
 }
 
 function _wl_navigator_get_data() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
-
-		return array();
-	}
-
-	// Post ID must be defined
-	if ( ! isset( $_GET['uniqid'] ) ) {
-		wp_send_json_error( 'No uniqid given' );
-
-		return array();
-	}
-
-	// Limit the results (defaults to 4)
-	$navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
-	$existing_post_types = get_post_types();
-	$post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
-	$current_post_id     = (int) $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
-
-	$navigator_id = (string) $_GET['uniqid'];
-
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
-
-		return array();
-	}
-
-	// Determine navigator type and call respective _get_results
-	if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
-
-		$referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
-	} else {
-		$referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
-			'ID',
-			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
-
-	}
-
-	// loop over them and take the first one which is not already in the $related_posts
-	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'id'        => $referencing_post->ID,
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => html_entity_decode( $referencing_post->post_title, ENT_QUOTES, 'UTF-8' ),
-				'thumbnail' => $thumbnail,
-				'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
-			),
-			'entity' => array(
-				'id'        => $referencing_post->entity_id,
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$results[] = $result;
-	}
-
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	// Add filler posts if needed
-	$filler_count = $navigator_length - count( $results );
-	if ( $filler_count > 0 ) {
-		$referencing_post_ids = array_map( function ( $p ) {
-			return $p->ID;
-		}, $referencing_posts );
-		/**
-		 * @since 3.27.8
-		 * Filler posts are fetched using this util.
-		 */
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id, $post_types );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
-		$results                 = array_merge( $results, $filler_posts );
-	}
-
-	// Apply filters after fillers are added
-	foreach ( $results as $result_index => $result ) {
-		$results[ $result_index ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
-		$results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
-	}
-
-	$results = apply_filters( 'wl_navigator_results', $results, $navigator_id );
-
-	return $results;
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_send_json_error( 'No post_id given' );
+
+        return array();
+    }
+
+    // Post ID must be defined
+    if ( ! isset( $_GET['uniqid'] ) ) {
+        wp_send_json_error( 'No uniqid given' );
+
+        return array();
+    }
+
+    // Limit the results (defaults to 4)
+    $navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
+    $navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
+    $order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
+    $post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
+    $post_types          = explode( ',', $post_types );
+    $existing_post_types = get_post_types();
+    $post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
+    $current_post_id     = (int) $_GET['post_id'];
+    $current_post        = get_post( $current_post_id );
+
+    $navigator_id = (string) $_GET['uniqid'];
+
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_send_json_error( 'No valid post_id given' );
+
+        return array();
+    }
+
+    // Determine navigator type and call respective _get_results
+    if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+
+        $referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset, $post_types );
+    } else {
+        $referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
+            'ID',
+            'post_title',
+        ), $order_by, $navigator_length, $navigator_offset, $post_types );
+
+    }
+
+    // loop over them and take the first one which is not already in the $related_posts
+    $results = array();
+    foreach ( $referencing_posts as $referencing_post ) {
+        $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'id'        => $referencing_post->ID,
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => html_entity_decode( $referencing_post->post_title, ENT_QUOTES, 'UTF-8' ),
+                'thumbnail' => $thumbnail,
+                'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
+            ),
+            'entity' => array(
+                'id'        => $referencing_post->entity_id,
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $results[] = $result;
+    }
+
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    // Add filler posts if needed
+    $filler_count = $navigator_length - count( $results );
+    if ( $filler_count > 0 ) {
+        $referencing_post_ids = array_map( function ( $p ) {
+            return $p->ID;
+        }, $referencing_posts );
+        /**
+         * @since 3.27.8
+         * Filler posts are fetched using this util.
+         */
+        $filler_posts_util       = new Filler_Posts_Util( $current_post_id, $post_types );
+        $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
+        $filler_posts            = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
+        $results                 = array_merge( $results, $filler_posts );
+    }
+
+    // Apply filters after fillers are added
+    foreach ( $results as $result_index => $result ) {
+        $results[ $result_index ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
+        $results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+    }
+
+    $results = apply_filters( 'wl_navigator_results', $results, $navigator_id );
+
+    return $results;
 }
 
 function _wl_network_navigator_get_data( $request ) {
 
-	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
-	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-
-	$entities = $request['entities'];
-
-	// Post ID has to match an existing item
-	if ( ! isset( $entities ) || empty( $entities ) ) {
-		wp_send_json_error( 'No valid entities provided' );
-	}
-
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
-		'ID',
-		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
-
-	// loop over them and take the first one which is not already in the $related_posts
-	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
-
-		/**
-		 * Use the thumbnail.
-		 *
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/837
-		 *
-		 * @since 3.19.3 We're using the medium size image.
-		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
-
-		$result = array(
-			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => $referencing_post->post_title,
-				'thumbnail' => $thumbnail,
-			),
-			'entity' => array(
-				'label'     => $serialized_entity['label'],
-				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
-			),
-		);
-
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
-
-		$results[] = $result;
-
-	}
-
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
-	}
-
-	$results = apply_filters( 'wl_network_navigator_results', $results, $navigator_id );
-
-	return $results;
+    // Limit the results (defaults to 4)
+    $navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
+    $navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+    $navigator_id     = $request['uniqid'];
+    $order_by         = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
+
+    $entities = $request['entities'];
+
+    // Post ID has to match an existing item
+    if ( ! isset( $entities ) || empty( $entities ) ) {
+        wp_send_json_error( 'No valid entities provided' );
+    }
+
+    $referencing_posts = _wl_network_navigator_get_results( $entities, array(
+        'ID',
+        'post_title',
+    ), $order_by, $navigator_length, $navigator_offset );
+
+    // loop over them and take the first one which is not already in the $related_posts
+    $results = array();
+    foreach ( $referencing_posts as $referencing_post ) {
+        $serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+
+        /**
+         * Use the thumbnail.
+         *
+         * @see https://github.com/insideout10/wordlift-plugin/issues/825 related issue.
+         * @see https://github.com/insideout10/wordlift-plugin/issues/837
+         *
+         * @since 3.19.3 We're using the medium size image.
+         */
+        $thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+
+        $result = array(
+            'post'   => array(
+                'permalink' => get_permalink( $referencing_post->ID ),
+                'title'     => $referencing_post->post_title,
+                'thumbnail' => $thumbnail,
+            ),
+            'entity' => array(
+                'label'     => $serialized_entity['label'],
+                'mainType'  => $serialized_entity['mainType'],
+                'permalink' => get_permalink( $referencing_post->entity_id ),
+            ),
+        );
+
+        $result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
+        $result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+
+        $results[] = $result;
+
+    }
+
+    if ( count( $results ) < $navigator_length ) {
+        $results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+    }
+
+    $results = apply_filters( 'wl_network_navigator_results', $results, $navigator_id );
+
+    return $results;
 
 }
 
 function _wl_network_navigator_get_results(
-	$entities, $fields = array(
-	'ID',
-	'post_title',
+    $entities, $fields = array(
+    'ID',
+    'post_title',
 ), $order_by = 'ID DESC', $limit = 10, $offset = 0
 ) {
-	global $wpdb;
-
-	$select = implode( ', ', array_map( function ( $item ) {
-		return "p.$item AS $item";
-	}, (array) $fields ) );
-
-	$order_by = implode( ', ', array_map( function ( $item ) {
-		return "p.$item";
-	}, (array) $order_by ) );
-
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
-		if ( isset( $entity ) ) {
-			return $entity->ID;
-		}
-	}, $entities ) );
-
-	/** @noinspection SqlNoDataSourceInspection */
-	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+    global $wpdb;
+
+    $select = implode( ', ', array_map( function ( $item ) {
+        return "p.$item AS $item";
+    }, (array) $fields ) );
+
+    $order_by = implode( ', ', array_map( function ( $item ) {
+        return "p.$item";
+    }, (array) $order_by ) );
+
+    $entities_in = implode( ',', array_map( function ( $item ) {
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
+        if ( isset( $entity ) ) {
+            return $entity->ID;
+        }
+    }, $entities ) );
+
+    /** @noinspection SqlNoDataSourceInspection */
+    return $wpdb->get_results(
+        $wpdb->prepare( <<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -319,8 +319,8 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
-	);
+            , $limit, $offset, $select, $order_by )
+    );
 
 }
 
@@ -332,9 +332,9 @@ 
  */
 function wl_shortcode_navigator_ajax() {
 
-	// Temporary blocking the Navigator.
-	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+    // Temporary blocking the Navigator.
+    $results = wl_shortcode_navigator_data();
+    wl_core_send_json( $results );
 
 }
 
@@ -346,16 +346,16 @@ 
  */
 function wl_shortcode_navigator_wp_json() {
 
-	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
-		ob_clean();
-	}
+    $results = wl_shortcode_navigator_data();
+    if ( ob_get_contents() ) {
+        ob_clean();
+    }
 
-	return array(
-		'items' => array(
-			array( 'values' => $results ),
-		),
-	);
+    return array(
+        'items' => array(
+            array( 'values' => $results ),
+        ),
+    );
 
 }
 
@@ -363,22 +363,22 @@ 
  * Adding `rest_api_init` action for amp backend of navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
-		'methods'             => 'GET',
-		'permission_callback' => '__return_true',
-		'callback'            => 'wl_shortcode_navigator_wp_json'
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+        'methods'             => 'GET',
+        'permission_callback' => '__return_true',
+        'callback'            => 'wl_shortcode_navigator_wp_json'
+    ) );
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
-		'methods'             => 'GET',
-		'callback'            => 'wl_network_navigator_wp_json',
-		'permission_callback' => '__return_true',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+        'methods'             => 'GET',
+        'callback'            => 'wl_network_navigator_wp_json',
+        'permission_callback' => '__return_true',
+    ) );
 } );
 
 /**
@@ -387,23 +387,23 @@ 
  * @since 2.2.0
  */
 add_action( 'plugins_loaded', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
-
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+    $action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+        return;
+    }
+
+    remove_action( 'plugins_loaded', 'rocket_init' );
+    remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+    remove_action( 'plugins_loaded', 'wpseo_init', 14 );
 }, 0 );
 
 add_action( 'init', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
-		return;
-	}
+    $action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
+    if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+        return;
+    }
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
+    remove_action( 'init', 'wp_widgets_init', 1 );
+    remove_action( 'init', 'gglcptch_init' );
 }, 0 );
 

Spacing +110 added lines, -110 removed lines

@@ -22,28 +22,28 @@ 
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("navigator", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
 	// So that the endpoint can be used remotely
-	header( 'Access-Control-Allow-Origin: *' );
+	header('Access-Control-Allow-Origin: *');
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
 	$results = _wl_navigator_get_data();
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 }
@@ -58,29 +58,29 @@ 
  * @since 3.22.6
  *
  */
-function wl_network_navigator_wp_json( $request ) {
+function wl_network_navigator_wp_json($request) {
 
 	// Create the cache key.
 	$cache_key_params = $_REQUEST;
-	unset( $cache_key_params['uniqid'] );
-	$cache_key = array( 'request_params' => $cache_key_params );
+	unset($cache_key_params['uniqid']);
+	$cache_key = array('request_params' => $cache_key_params);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "network-navigator", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("network-navigator", 8 * 60 * 60); // 8 hours.
+	$cache_results = $cache->get($cache_key);
 
-	if ( isset( $cache_results ) ) {
-		header( 'X-WordLift-Cache: HIT' );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
 
 		return $cache_results;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
-	$results = _wl_network_navigator_get_data( $request );
+	$results = _wl_network_navigator_get_data($request);
 
 	// Put the result before sending the json to the client, since sending the json will terminate us.
-	$cache->put( $cache_key, $results );
+	$cache->put($cache_key, $results);
 
 	return $results;
 
@@ -89,58 +89,58 @@ 
 function _wl_navigator_get_data() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_send_json_error( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_send_json_error('No post_id given');
 
 		return array();
 	}
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['uniqid'] ) ) {
-		wp_send_json_error( 'No uniqid given' );
+	if ( ! isset($_GET['uniqid'])) {
+		wp_send_json_error('No uniqid given');
 
 		return array();
 	}
 
 	// Limit the results (defaults to 4)
-	$navigator_length    = isset( $_GET['limit'] ) ? intval( $_GET['limit'] ) : 4;
-	$navigator_offset    = isset( $_GET['offset'] ) ? intval( $_GET['offset'] ) : 0;
-	$order_by            = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
+	$navigator_length    = isset($_GET['limit']) ? intval($_GET['limit']) : 4;
+	$navigator_offset    = isset($_GET['offset']) ? intval($_GET['offset']) : 0;
+	$order_by            = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
+	$post_types          = isset($_GET['post_types']) ? (string) $_GET['post_types'] : '';
+	$post_types          = explode(',', $post_types);
 	$existing_post_types = get_post_types();
-	$post_types          = array_values( array_intersect( $existing_post_types, $post_types ) );
+	$post_types          = array_values(array_intersect($existing_post_types, $post_types));
 	$current_post_id     = (int) $_GET['post_id'];
-	$current_post        = get_post( $current_post_id );
+	$current_post        = get_post($current_post_id);
 
 	$navigator_id = (string) $_GET['uniqid'];
 
 	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_send_json_error( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_send_json_error('No valid post_id given');
 
 		return array();
 	}
 
 	// Determine navigator type and call respective _get_results
-	if ( get_post_type( $current_post_id ) === Wordlift_Entity_Service::TYPE_NAME ) {
+	if (get_post_type($current_post_id) === Wordlift_Entity_Service::TYPE_NAME) {
 
-		$referencing_posts = Navigator_Data::entity_navigator_get_results( $current_post_id, array(
+		$referencing_posts = Navigator_Data::entity_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
+		), $order_by, $navigator_length, $navigator_offset, $post_types);
 	} else {
-		$referencing_posts = Navigator_Data::post_navigator_get_results( $current_post_id, array(
+		$referencing_posts = Navigator_Data::post_navigator_get_results($current_post_id, array(
 			'ID',
 			'post_title',
-		), $order_by, $navigator_length, $navigator_offset, $post_types );
+		), $order_by, $navigator_length, $navigator_offset, $post_types);
 
 	}
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -150,21 +150,21 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
 				'id'        => $referencing_post->ID,
-				'permalink' => get_permalink( $referencing_post->ID ),
-				'title'     => html_entity_decode( $referencing_post->post_title, ENT_QUOTES, 'UTF-8' ),
+				'permalink' => get_permalink($referencing_post->ID),
+				'title'     => html_entity_decode($referencing_post->post_title, ENT_QUOTES, 'UTF-8'),
 				'thumbnail' => $thumbnail,
-				'srcset'    => Srcset_Util::get_srcset( $referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET )
+				'srcset'    => Srcset_Util::get_srcset($referencing_post->ID, Srcset_Util::NAVIGATOR_WIDGET)
 			),
 			'entity' => array(
 				'id'        => $referencing_post->entity_id,
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
@@ -172,61 +172,61 @@ 
 	}
 
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
 	// Add filler posts if needed
-	$filler_count = $navigator_length - count( $results );
-	if ( $filler_count > 0 ) {
-		$referencing_post_ids = array_map( function ( $p ) {
+	$filler_count = $navigator_length - count($results);
+	if ($filler_count > 0) {
+		$referencing_post_ids = array_map(function($p) {
 			return $p->ID;
-		}, $referencing_posts );
+		}, $referencing_posts);
 		/**
 		 * @since 3.27.8
 		 * Filler posts are fetched using this util.
 		 */
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id, $post_types );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_response( $filler_count, $post_ids_to_be_excluded );
-		$results                 = array_merge( $results, $filler_posts );
+		$filler_posts_util       = new Filler_Posts_Util($current_post_id, $post_types);
+		$post_ids_to_be_excluded = array_merge(array($current_post_id), $referencing_post_ids);
+		$filler_posts            = $filler_posts_util->get_filler_response($filler_count, $post_ids_to_be_excluded);
+		$results                 = array_merge($results, $filler_posts);
 	}
 
 	// Apply filters after fillers are added
-	foreach ( $results as $result_index => $result ) {
-		$results[ $result_index ]['post']   = apply_filters( 'wl_navigator_data_post', $result['post'], intval( $result['post']['id'] ), $navigator_id );
-		$results[ $result_index ]['entity'] = apply_filters( 'wl_navigator_data_entity', $result['entity'], intval( $result['entity']['id'] ), $navigator_id );
+	foreach ($results as $result_index => $result) {
+		$results[$result_index]['post']   = apply_filters('wl_navigator_data_post', $result['post'], intval($result['post']['id']), $navigator_id);
+		$results[$result_index]['entity'] = apply_filters('wl_navigator_data_entity', $result['entity'], intval($result['entity']['id']), $navigator_id);
 	}
 
-	$results = apply_filters( 'wl_navigator_results', $results, $navigator_id );
+	$results = apply_filters('wl_navigator_results', $results, $navigator_id);
 
 	return $results;
 }
 
-function _wl_network_navigator_get_data( $request ) {
+function _wl_network_navigator_get_data($request) {
 
 	// Limit the results (defaults to 4)
-	$navigator_length = isset( $request['limit'] ) ? intval( $request['limit'] ) : 4;
-	$navigator_offset = isset( $request['offset'] ) ? intval( $request['offset'] ) : 0;
+	$navigator_length = isset($request['limit']) ? intval($request['limit']) : 4;
+	$navigator_offset = isset($request['offset']) ? intval($request['offset']) : 0;
 	$navigator_id     = $request['uniqid'];
-	$order_by         = isset( $_GET['sort'] ) ? sanitize_sql_orderby( $_GET['sort'] ) : 'ID DESC';
+	$order_by         = isset($_GET['sort']) ? sanitize_sql_orderby($_GET['sort']) : 'ID DESC';
 
 	$entities = $request['entities'];
 
 	// Post ID has to match an existing item
-	if ( ! isset( $entities ) || empty( $entities ) ) {
-		wp_send_json_error( 'No valid entities provided' );
+	if ( ! isset($entities) || empty($entities)) {
+		wp_send_json_error('No valid entities provided');
 	}
 
-	$referencing_posts = _wl_network_navigator_get_results( $entities, array(
+	$referencing_posts = _wl_network_navigator_get_results($entities, array(
 		'ID',
 		'post_title',
-	), $order_by, $navigator_length, $navigator_offset );
+	), $order_by, $navigator_length, $navigator_offset);
 
 	// loop over them and take the first one which is not already in the $related_posts
 	$results = array();
-	foreach ( $referencing_posts as $referencing_post ) {
-		$serialized_entity = wl_serialize_entity( $referencing_post->entity_id );
+	foreach ($referencing_posts as $referencing_post) {
+		$serialized_entity = wl_serialize_entity($referencing_post->entity_id);
 
 		/**
 		 * Use the thumbnail.
@@ -236,33 +236,33 @@ 
 		 *
 		 * @since 3.19.3 We're using the medium size image.
 		 */
-		$thumbnail = get_the_post_thumbnail_url( $referencing_post, 'medium' );
+		$thumbnail = get_the_post_thumbnail_url($referencing_post, 'medium');
 
 		$result = array(
 			'post'   => array(
-				'permalink' => get_permalink( $referencing_post->ID ),
+				'permalink' => get_permalink($referencing_post->ID),
 				'title'     => $referencing_post->post_title,
 				'thumbnail' => $thumbnail,
 			),
 			'entity' => array(
 				'label'     => $serialized_entity['label'],
 				'mainType'  => $serialized_entity['mainType'],
-				'permalink' => get_permalink( $referencing_post->entity_id ),
+				'permalink' => get_permalink($referencing_post->entity_id),
 			),
 		);
 
-		$result['post']   = apply_filters( 'wl_network_navigator_data_post', $result['post'], intval( $referencing_post->ID ), $navigator_id );
-		$result['entity'] = apply_filters( 'wl_network_navigator_data_entity', $result['entity'], intval( $referencing_post->entity_id ), $navigator_id );
+		$result['post']   = apply_filters('wl_network_navigator_data_post', $result['post'], intval($referencing_post->ID), $navigator_id);
+		$result['entity'] = apply_filters('wl_network_navigator_data_entity', $result['entity'], intval($referencing_post->entity_id), $navigator_id);
 
 		$results[] = $result;
 
 	}
 
-	if ( count( $results ) < $navigator_length ) {
-		$results = apply_filters( 'wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length );
+	if (count($results) < $navigator_length) {
+		$results = apply_filters('wl_network_navigator_data_placeholder', $results, $navigator_id, $navigator_offset, $navigator_length);
 	}
 
-	$results = apply_filters( 'wl_network_navigator_results', $results, $navigator_id );
+	$results = apply_filters('wl_network_navigator_results', $results, $navigator_id);
 
 	return $results;
 
@@ -276,24 +276,24 @@ 
 ) {
 	global $wpdb;
 
-	$select = implode( ', ', array_map( function ( $item ) {
+	$select = implode(', ', array_map(function($item) {
 		return "p.$item AS $item";
-	}, (array) $fields ) );
+	}, (array) $fields));
 
-	$order_by = implode( ', ', array_map( function ( $item ) {
+	$order_by = implode(', ', array_map(function($item) {
 		return "p.$item";
-	}, (array) $order_by ) );
+	}, (array) $order_by));
 
-	$entities_in = implode( ',', array_map( function ( $item ) {
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( urldecode( $item ) );
-		if ( isset( $entity ) ) {
+	$entities_in = implode(',', array_map(function($item) {
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri(urldecode($item));
+		if (isset($entity)) {
 			return $entity->ID;
 		}
-	}, $entities ) );
+	}, $entities));
 
 	/** @noinspection SqlNoDataSourceInspection */
 	return $wpdb->get_results(
-		$wpdb->prepare( <<<EOF
+		$wpdb->prepare(<<<EOF
 SELECT %3\$s, p2.ID as entity_id
  FROM {$wpdb->prefix}wl_relation_instances r1
 	-- get the ID of the post entity in common between the object and the subject 2. 
@@ -319,7 +319,7 @@ 
  LIMIT %1\$d
  OFFSET %2\$d
 EOF
-			, $limit, $offset, $select, $order_by )
+			, $limit, $offset, $select, $order_by)
 	);
 
 }
@@ -334,12 +334,12 @@ 
 
 	// Temporary blocking the Navigator.
 	$results = wl_shortcode_navigator_data();
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax' );
-add_action( 'wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax' );
+add_action('wp_ajax_wl_navigator', 'wl_shortcode_navigator_ajax');
+add_action('wp_ajax_nopriv_wl_navigator', 'wl_shortcode_navigator_ajax');
 
 /**
  * wp-json call for the navigator widget
@@ -347,13 +347,13 @@ 
 function wl_shortcode_navigator_wp_json() {
 
 	$results = wl_shortcode_navigator_data();
-	if ( ob_get_contents() ) {
+	if (ob_get_contents()) {
 		ob_clean();
 	}
 
 	return array(
 		'items' => array(
-			array( 'values' => $results ),
+			array('values' => $results),
 		),
 	);
 
@@ -362,23 +362,23 @@ 
 /**
  * Adding `rest_api_init` action for amp backend of navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/navigator', array(
 		'methods'             => 'GET',
 		'permission_callback' => '__return_true',
 		'callback'            => 'wl_shortcode_navigator_wp_json'
-	) );
+	));
 } );
 
 /**
  * Adding `rest_api_init` action for backend of network navigator
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/network-navigator', array(
 		'methods'             => 'GET',
 		'callback'            => 'wl_network_navigator_wp_json',
 		'permission_callback' => '__return_true',
-	) );
+	));
 } );
 
 /**
@@ -386,24 +386,24 @@ 
  *
  * @since 2.2.0
  */
-add_action( 'plugins_loaded', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('plugins_loaded', function() {
+	$action = array_key_exists('action', $_REQUEST) ? (string) $_REQUEST['action'] : '';
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $action) {
 		return;
 	}
 
-	remove_action( 'plugins_loaded', 'rocket_init' );
-	remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-	remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-}, 0 );
+	remove_action('plugins_loaded', 'rocket_init');
+	remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+	remove_action('plugins_loaded', 'wpseo_init', 14);
+}, 0);
 
-add_action( 'init', function () {
-	$action = array_key_exists( 'action', $_REQUEST ) ? (string) $_REQUEST['action'] : '';
-	if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX || 'wl_navigator' !== $action ) {
+add_action('init', function() {
+	$action = array_key_exists('action', $_REQUEST) ? (string) $_REQUEST['action'] : '';
+	if ( ! defined('DOING_AJAX') || ! DOING_AJAX || 'wl_navigator' !== $action) {
 		return;
 	}
 
-	remove_action( 'init', 'wp_widgets_init', 1 );
-	remove_action( 'init', 'gglcptch_init' );
-}, 0 );
+	remove_action('init', 'wp_widgets_init', 1);
+	remove_action('init', 'gglcptch_init');
+}, 0);
 

src/shortcodes/wordlift_shortcode_geomap.php

Indentation +73 added lines, -73 removed lines

@@ -11,42 +11,42 @@ 
  * Print both global or post related places in json. It's executed via Ajax
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+    $map_data = ( is_numeric( $post_id )
+        ? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
+        : wl_shortcode_geomap_ajax_all_posts() );
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+    wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
 
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
-		. " FROM {$wpdb->posts} p1 "
-		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
-		. "  ON ri.object_id = p1.ID AND ri.predicate = %s"
-		. " INNER JOIN {$wpdb->postmeta} pm1"
-		. "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
-		. " INNER JOIN {$wpdb->postmeta} pm2"
-		. "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
-		. " WHERE p1.post_status = %s",
-		'where',
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		'publish'
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
+        . " FROM {$wpdb->posts} p1 "
+        . " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
+        . "  ON ri.object_id = p1.ID AND ri.predicate = %s"
+        . " INNER JOIN {$wpdb->postmeta} pm1"
+        . "  ON pm1.post_id = p1.ID AND pm1.meta_key = %s AND '0' != pm1.meta_value"
+        . " INNER JOIN {$wpdb->postmeta} pm2"
+        . "  ON pm2.post_id = p1.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value"
+        . " WHERE p1.post_status = %s",
+        'where',
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        'publish'
+    ) );
 }
 
 function wl_shortcode_geomap_ajax_single_post( $post_id ) {
-	global $wpdb;
+    global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
-		"
+    return $wpdb->get_results( $wpdb->prepare(
+        "
 		SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude
 		 FROM {$wpdb->prefix}wl_relation_instances ri
 		 INNER JOIN {$wpdb->posts} p2
@@ -65,69 +65,69 @@ 
 		  ON pm2.post_id = p.ID AND pm2.meta_key = %s AND '0' != pm2.meta_value
 		 WHERE p.ID = %s
 		",
-		'publish',
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		$post_id,
-		'where',
-		// UNION
-		'wl_geo_latitude',
-		'wl_geo_longitude',
-		$post_id
-	) );
+        'publish',
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        $post_id,
+        'where',
+        // UNION
+        'wl_geo_latitude',
+        'wl_geo_longitude',
+        $post_id
+    ) );
 }
 
 function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
 
-	global $wpdb;
-
-	return $wpdb->get_results( $wpdb->prepare(
-		"SELECT p.ID, p.post_title"
-		. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-		" INNER JOIN {$wpdb->posts} p" .
-		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
-		" WHERE ri.object_id = %d AND ri.predicate = %s",
-		'publish',
-		$exclude_post_id,
-		$post_id,
-		'where'
-	) );
+    global $wpdb;
+
+    return $wpdb->get_results( $wpdb->prepare(
+        "SELECT p.ID, p.post_title"
+        . " FROM {$wpdb->prefix}wl_relation_instances ri" .
+        " INNER JOIN {$wpdb->posts} p" .
+        "  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
+        " WHERE ri.object_id = %d AND ri.predicate = %s",
+        'publish',
+        $exclude_post_id,
+        $post_id,
+        'where'
+    ) );
 }
 
 function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
 
-	$boundaries = array();
-	$features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
+    $boundaries = array();
+    $features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
 
-		$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-		$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+        $thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
+        $thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
 
-		// Related posts.
-		$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-		$subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
+        // Related posts.
+        $subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
+        $subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
 
-			$permalink = get_permalink( $subject->ID );
+            $permalink = get_permalink( $subject->ID );
 
-			return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-		}, '' );
-		$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+            return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
+        }, '' );
+        $subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
 
-		$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-		$latitude      = floatval( $item->latitude );
-		$longitude     = floatval( $item->longitude );
-		$coordinates   = array( $latitude, $longitude, );
-		$geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
+        $popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
+        $latitude      = floatval( $item->latitude );
+        $longitude     = floatval( $item->longitude );
+        $coordinates   = array( $latitude, $longitude, );
+        $geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
 
-		$boundaries[] = array( $longitude, $latitude, );
+        $boundaries[] = array( $longitude, $latitude, );
 
-		return array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $popup_content ),
-			'geometry'   => $geometry,
-		);
-	}, $results );
+        return array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $popup_content ),
+            'geometry'   => $geometry,
+        );
+    }, $results );
 
-	return array( 'features' => $features, 'boundaries' => $boundaries, );
+    return array( 'features' => $features, 'boundaries' => $boundaries, );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );

Spacing +37 added lines, -37 removed lines

@@ -12,20 +12,20 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$map_data = ( is_numeric( $post_id )
-		? wl_shortcode_geomap_ajax_single_post( (int) $post_id )
-		: wl_shortcode_geomap_ajax_all_posts() );
+	$map_data = (is_numeric($post_id)
+		? wl_shortcode_geomap_ajax_single_post((int) $post_id)
+		: wl_shortcode_geomap_ajax_all_posts());
 
-	wl_core_send_json( wl_shortcode_geomap_format_results( $map_data, $post_id ) );
+	wl_core_send_json(wl_shortcode_geomap_format_results($map_data, $post_id));
 
 }
 
 function wl_shortcode_geomap_ajax_all_posts() {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT DISTINCT p1.ID, p1.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude"
 		. " FROM {$wpdb->posts} p1 "
 		. " INNER JOIN {$wpdb->prefix}wl_relation_instances ri"
@@ -39,13 +39,13 @@ 
 		'wl_geo_latitude',
 		'wl_geo_longitude',
 		'publish'
-	) );
+	));
 }
 
-function wl_shortcode_geomap_ajax_single_post( $post_id ) {
+function wl_shortcode_geomap_ajax_single_post($post_id) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"
 		SELECT p2.ID, p2.post_title, pm1.meta_value AS longitude, pm2.meta_value AS latitude
 		 FROM {$wpdb->prefix}wl_relation_instances ri
@@ -74,61 +74,61 @@ 
 		'wl_geo_latitude',
 		'wl_geo_longitude',
 		$post_id
-	) );
+	));
 }
 
-function wl_shortcode_geomap_get_subjects( $post_id, $exclude_post_id ) {
+function wl_shortcode_geomap_get_subjects($post_id, $exclude_post_id) {
 
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		"SELECT p.ID, p.post_title"
-		. " FROM {$wpdb->prefix}wl_relation_instances ri" .
-		" INNER JOIN {$wpdb->posts} p" .
-		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d" .
+		. " FROM {$wpdb->prefix}wl_relation_instances ri".
+		" INNER JOIN {$wpdb->posts} p".
+		"  ON p.ID = ri.subject_id AND p.post_status = %s AND p.ID != %d".
 		" WHERE ri.object_id = %d AND ri.predicate = %s",
 		'publish',
 		$exclude_post_id,
 		$post_id,
 		'where'
-	) );
+	));
 }
 
-function wl_shortcode_geomap_format_results( $results, $post_id = null ) {
+function wl_shortcode_geomap_format_results($results, $post_id = null) {
 
 	$boundaries = array();
-	$features   = array_map( function ( $item ) use ( &$boundaries, $post_id ) {
+	$features   = array_map(function($item) use (&$boundaries, $post_id) {
 
-		$thumbnail_url  = get_the_post_thumbnail_url( $item->ID );
-		$thumbnail_html = ( $thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '' );
+		$thumbnail_url  = get_the_post_thumbnail_url($item->ID);
+		$thumbnail_html = ($thumbnail_url ? "<img src='$thumbnail_url' width='100%'>" : '');
 
 		// Related posts.
-		$subjects            = wl_shortcode_geomap_get_subjects( $item->ID, $post_id );
-		$subjects_inner_html = array_reduce( $subjects, function ( $carry, $subject ) {
+		$subjects            = wl_shortcode_geomap_get_subjects($item->ID, $post_id);
+		$subjects_inner_html = array_reduce($subjects, function($carry, $subject) {
 
-			$permalink = get_permalink( $subject->ID );
+			$permalink = get_permalink($subject->ID);
 
-			return $carry . sprintf( '<li><a href="%s">%s</a></li>', $permalink, esc_html( $subject->post_title ) );
-		}, '' );
-		$subjects_html       = ( ! empty( $subjects_inner_html ) ? '<ul>' . $subjects_inner_html . '</ul>' : '' );
+			return $carry.sprintf('<li><a href="%s">%s</a></li>', $permalink, esc_html($subject->post_title));
+		}, '');
+		$subjects_html = ( ! empty($subjects_inner_html) ? '<ul>'.$subjects_inner_html.'</ul>' : '');
 
-		$popup_content = sprintf( '<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink( $item->ID ), $thumbnail_html, esc_html( $item->post_title ), $subjects_html );
-		$latitude      = floatval( $item->latitude );
-		$longitude     = floatval( $item->longitude );
-		$coordinates   = array( $latitude, $longitude, );
-		$geometry      = array( 'type' => 'Point', 'coordinates' => $coordinates, );
+		$popup_content = sprintf('<a href="%s"><h6>%s</h6>%s</a>%s', get_permalink($item->ID), $thumbnail_html, esc_html($item->post_title), $subjects_html);
+		$latitude      = floatval($item->latitude);
+		$longitude     = floatval($item->longitude);
+		$coordinates   = array($latitude, $longitude,);
+		$geometry      = array('type' => 'Point', 'coordinates' => $coordinates,);
 
-		$boundaries[] = array( $longitude, $latitude, );
+		$boundaries[] = array($longitude, $latitude,);
 
 		return array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $popup_content ),
+			'properties' => array('popupContent' => $popup_content),
 			'geometry'   => $geometry,
 		);
-	}, $results );
+	}, $results);
 
-	return array( 'features' => $features, 'boundaries' => $boundaries, );
+	return array('features' => $features, 'boundaries' => $boundaries,);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');

src/shortcodes/class-wordlift-shortcode-rest.php

Indentation +83 added lines, -83 removed lines

@@ -10,116 +10,116 @@
  */
 abstract class Wordlift_Shortcode_REST {
 
-	/**
-	 * The cache_ttl, set by extending classes.
-	 */
-	const CACHE_TTL = 86400; // 24 hours
+    /**
+     * The cache_ttl, set by extending classes.
+     */
+    const CACHE_TTL = 86400; // 24 hours
 
-	public function __construct( $endpoint, $args ) {
+    public function __construct( $endpoint, $args ) {
 
-		$scope          = $this;
-		$this->endpoint = $endpoint;
-		$this->args     = $args;
+        $scope          = $this;
+        $this->endpoint = $endpoint;
+        $this->args     = $args;
 
-		// Register rest route with callback
-		add_action( 'rest_api_init', function () use ( $scope ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $scope->endpoint, array(
-				'methods'  => WP_REST_Server::READABLE,
-				'permission_callback' => '__return_true',
-				'callback' => array( $scope, 'rest_callback' ),
-				'args'     => $scope->args
-			) );
-		} );
+        // Register rest route with callback
+        add_action( 'rest_api_init', function () use ( $scope ) {
+            register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $scope->endpoint, array(
+                'methods'  => WP_REST_Server::READABLE,
+                'permission_callback' => '__return_true',
+                'callback' => array( $scope, 'rest_callback' ),
+                'args'     => $scope->args
+            ) );
+        } );
 
-		// Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
-		add_action( 'plugins_loaded', function () use ( $scope ) {
+        // Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
+        add_action( 'plugins_loaded', function () use ( $scope ) {
 
-			if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
-				return;
-			}
+            if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+                return;
+            }
 
-			remove_action( 'plugins_loaded', 'rocket_init' );
-			remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-			remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-		}, 0 );
+            remove_action( 'plugins_loaded', 'rocket_init' );
+            remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
+            remove_action( 'plugins_loaded', 'wpseo_init', 14 );
+        }, 0 );
 
-		add_action( 'init', function () use ( $scope ) {
+        add_action( 'init', function () use ( $scope ) {
 
-			if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
-				return;
-			}
+            if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+                return;
+            }
 
-			remove_action( 'init', 'wp_widgets_init', 1 );
-			remove_action( 'init', 'gglcptch_init' );
-		}, 0 );
+            remove_action( 'init', 'wp_widgets_init', 1 );
+            remove_action( 'init', 'gglcptch_init' );
+        }, 0 );
 
-	}
+    }
 
-	public abstract function get_data( $request );
+    public abstract function get_data( $request );
 
-	public function rest_callback( WP_REST_Request $request ) {
+    public function rest_callback( WP_REST_Request $request ) {
 
-		// Respond from origin if TTL is 0
-		if ( static::CACHE_TTL == 0 ) {
+        // Respond from origin if TTL is 0
+        if ( static::CACHE_TTL == 0 ) {
 
-			$data     = $this->get_data( $request );
-			$response = rest_ensure_response( $data );
-			if ( is_wp_error( $data ) ) {
-				return $response;
-			}
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'MISS' );
+            $data     = $this->get_data( $request );
+            $response = rest_ensure_response( $data );
+            if ( is_wp_error( $data ) ) {
+                return $response;
+            }
+            $response->header( 'Access-Control-Allow-Origin', '*' );
+            $response->header( 'X-WordLift-Cache', 'MISS' );
 
-			return $response;
-		}
+            return $response;
+        }
 
-		// Create the cache key.
-		$cache_key_params = $request->get_params();
-		unset( $cache_key_params['uniqid'] );
-		unset( $cache_key_params['rest_route'] );
-		$cache_key = array( 'request_params' => $cache_key_params );
+        // Create the cache key.
+        $cache_key_params = $request->get_params();
+        unset( $cache_key_params['uniqid'] );
+        unset( $cache_key_params['rest_route'] );
+        $cache_key = array( 'request_params' => $cache_key_params );
 
-		// Create the TTL cache and try to get the results.
-		$cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
-		$cache_results = $cache->get( $cache_key );
+        // Create the TTL cache and try to get the results.
+        $cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
+        $cache_results = $cache->get( $cache_key );
 
-		if ( isset( $cache_results ) ) {
+        if ( isset( $cache_results ) ) {
 
-			$response = rest_ensure_response( $cache_results );
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'HIT' );
+            $response = rest_ensure_response( $cache_results );
+            $response->header( 'Access-Control-Allow-Origin', '*' );
+            $response->header( 'X-WordLift-Cache', 'HIT' );
 
-			return $response;
-		}
+            return $response;
+        }
 
-		$data     = $this->get_data( $request );
-		$response = rest_ensure_response( $data );
-		if ( is_wp_error( $data ) ) {
-			return $response;
-		}
-		$response->header( 'Access-Control-Allow-Origin', '*' );
-		$response->header( 'X-WordLift-Cache', 'MISS' );
+        $data     = $this->get_data( $request );
+        $response = rest_ensure_response( $data );
+        if ( is_wp_error( $data ) ) {
+            return $response;
+        }
+        $response->header( 'Access-Control-Allow-Origin', '*' );
+        $response->header( 'X-WordLift-Cache', 'MISS' );
 
-		// Put the result before sending the json to the client, since sending the json will terminate us.
-		$cache->put( $cache_key, $data );
+        // Put the result before sending the json to the client, since sending the json will terminate us.
+        $cache->put( $cache_key, $data );
 
-		return $response;
+        return $response;
 
-	}
+    }
 
-	private function is_endpoint() {
-		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
+    private function is_endpoint() {
+        $compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
 
-		// Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
+        // Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
 
-		if ( $_SERVER['REQUEST_URI'] && strpos( (string) $_SERVER['REQUEST_URI'], $compare_route ) ) {
-			return true;
-		}
-		if ( ! empty( $_GET['rest_route'] ) && strpos( (string) $_GET['rest_route'], $compare_route ) ) {
-			return true;
-		}
+        if ( $_SERVER['REQUEST_URI'] && strpos( (string) $_SERVER['REQUEST_URI'], $compare_route ) ) {
+            return true;
+        }
+        if ( ! empty( $_GET['rest_route'] ) && strpos( (string) $_GET['rest_route'], $compare_route ) ) {
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

Spacing +42 added lines, -42 removed lines

@@ -15,107 +15,107 @@
 	 */
 	const CACHE_TTL = 86400; // 24 hours
 
-	public function __construct( $endpoint, $args ) {
+	public function __construct($endpoint, $args) {
 
 		$scope          = $this;
 		$this->endpoint = $endpoint;
 		$this->args     = $args;
 
 		// Register rest route with callback
-		add_action( 'rest_api_init', function () use ( $scope ) {
-			register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, $scope->endpoint, array(
+		add_action('rest_api_init', function() use ($scope) {
+			register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, $scope->endpoint, array(
 				'methods'  => WP_REST_Server::READABLE,
 				'permission_callback' => '__return_true',
-				'callback' => array( $scope, 'rest_callback' ),
+				'callback' => array($scope, 'rest_callback'),
 				'args'     => $scope->args
-			) );
+			));
 		} );
 
 		// Optimizations: disable unneeded plugins on this specific REST call. WPSeo is slowing down the responses quite a bit.
-		add_action( 'plugins_loaded', function () use ( $scope ) {
+		add_action('plugins_loaded', function() use ($scope) {
 
-			if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+			if ( ! defined('REST_REQUEST') || ! REST_REQUEST || ! $scope->is_endpoint()) {
 				return;
 			}
 
-			remove_action( 'plugins_loaded', 'rocket_init' );
-			remove_action( 'plugins_loaded', 'wpseo_premium_init', 14 );
-			remove_action( 'plugins_loaded', 'wpseo_init', 14 );
-		}, 0 );
+			remove_action('plugins_loaded', 'rocket_init');
+			remove_action('plugins_loaded', 'wpseo_premium_init', 14);
+			remove_action('plugins_loaded', 'wpseo_init', 14);
+		}, 0);
 
-		add_action( 'init', function () use ( $scope ) {
+		add_action('init', function() use ($scope) {
 
-			if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST || ! $scope->is_endpoint() ) {
+			if ( ! defined('REST_REQUEST') || ! REST_REQUEST || ! $scope->is_endpoint()) {
 				return;
 			}
 
-			remove_action( 'init', 'wp_widgets_init', 1 );
-			remove_action( 'init', 'gglcptch_init' );
-		}, 0 );
+			remove_action('init', 'wp_widgets_init', 1);
+			remove_action('init', 'gglcptch_init');
+		}, 0);
 
 	}
 
-	public abstract function get_data( $request );
+	public abstract function get_data($request);
 
-	public function rest_callback( WP_REST_Request $request ) {
+	public function rest_callback(WP_REST_Request $request) {
 
 		// Respond from origin if TTL is 0
-		if ( static::CACHE_TTL == 0 ) {
+		if (static::CACHE_TTL == 0) {
 
-			$data     = $this->get_data( $request );
-			$response = rest_ensure_response( $data );
-			if ( is_wp_error( $data ) ) {
+			$data     = $this->get_data($request);
+			$response = rest_ensure_response($data);
+			if (is_wp_error($data)) {
 				return $response;
 			}
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'MISS' );
+			$response->header('Access-Control-Allow-Origin', '*');
+			$response->header('X-WordLift-Cache', 'MISS');
 
 			return $response;
 		}
 
 		// Create the cache key.
 		$cache_key_params = $request->get_params();
-		unset( $cache_key_params['uniqid'] );
-		unset( $cache_key_params['rest_route'] );
-		$cache_key = array( 'request_params' => $cache_key_params );
+		unset($cache_key_params['uniqid']);
+		unset($cache_key_params['rest_route']);
+		$cache_key = array('request_params' => $cache_key_params);
 
 		// Create the TTL cache and try to get the results.
-		$cache         = new Ttl_Cache( $this->endpoint, static::CACHE_TTL );
-		$cache_results = $cache->get( $cache_key );
+		$cache         = new Ttl_Cache($this->endpoint, static::CACHE_TTL);
+		$cache_results = $cache->get($cache_key);
 
-		if ( isset( $cache_results ) ) {
+		if (isset($cache_results)) {
 
-			$response = rest_ensure_response( $cache_results );
-			$response->header( 'Access-Control-Allow-Origin', '*' );
-			$response->header( 'X-WordLift-Cache', 'HIT' );
+			$response = rest_ensure_response($cache_results);
+			$response->header('Access-Control-Allow-Origin', '*');
+			$response->header('X-WordLift-Cache', 'HIT');
 
 			return $response;
 		}
 
-		$data     = $this->get_data( $request );
-		$response = rest_ensure_response( $data );
-		if ( is_wp_error( $data ) ) {
+		$data     = $this->get_data($request);
+		$response = rest_ensure_response($data);
+		if (is_wp_error($data)) {
 			return $response;
 		}
-		$response->header( 'Access-Control-Allow-Origin', '*' );
-		$response->header( 'X-WordLift-Cache', 'MISS' );
+		$response->header('Access-Control-Allow-Origin', '*');
+		$response->header('X-WordLift-Cache', 'MISS');
 
 		// Put the result before sending the json to the client, since sending the json will terminate us.
-		$cache->put( $cache_key, $data );
+		$cache->put($cache_key, $data);
 
 		return $response;
 
 	}
 
 	private function is_endpoint() {
-		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE . $this->endpoint;
+		$compare_route = WL_REST_ROUTE_DEFAULT_NAMESPACE.$this->endpoint;
 
 		// Directly accessing $_SERVER['REQUEST_URI'] or $_GET['rest_route'] here as it's too early to use global $wp reliably
 
-		if ( $_SERVER['REQUEST_URI'] && strpos( (string) $_SERVER['REQUEST_URI'], $compare_route ) ) {
+		if ($_SERVER['REQUEST_URI'] && strpos((string) $_SERVER['REQUEST_URI'], $compare_route)) {
 			return true;
 		}
-		if ( ! empty( $_GET['rest_route'] ) && strpos( (string) $_GET['rest_route'], $compare_route ) ) {
+		if ( ! empty($_GET['rest_route']) && strpos((string) $_GET['rest_route'], $compare_route)) {
 			return true;
 		}
 

src/modules/core/wordlift_core_entity_api.php

Indentation +84 added lines, -84 removed lines

@@ -20,54 +20,54 @@ 
  */
 function wl_entity_get_by_title( $title, $autocomplete = false, $include_alias = true ) {
 
-	global $wpdb;
-
-	// Search by substring
-	if ( $autocomplete ) {
-		$title = '%' . $title . '%';
-	}
-
-	// The title is a LIKE query.
-	$query = "SELECT DISTINCT p.ID AS id, p.post_title AS title, t.name AS schema_type_name, t.slug AS type_slug"
-			 . " FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t"
-			 . "  WHERE p.post_title LIKE %s"
-			 . "   AND t.term_id = tt.term_id"
-			 . "   AND tt.taxonomy = %s"
-			 . "   AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-			 . "   AND tr.object_id = p.ID"
-			 // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
-			 . "   AND p.post_status != 'trash'";
-
-	$params = array(
-		$title,
-		Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-	);
-
-	if ( $include_alias ) {
-
-		$query .= " UNION"
-				  . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
-				  . "  FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t, $wpdb->postmeta m"
-				  . "   WHERE m.meta_key = %s AND m.meta_value LIKE %s"
-				  . "    AND m.post_id = p.ID"
-				  . "    AND t.term_id = tt.term_id"
-				  . "    AND tt.taxonomy = %s"
-				  . "    AND tt.term_taxonomy_id = tr.term_taxonomy_id"
-				  . "    AND tr.object_id = p.ID"
-				  // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
-				  . "    AND p.post_status != 'trash'";
-
-		$params = array_merge( $params, array(
-			Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
-			$title,
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-		) );
-	}
-
-	return $wpdb->get_results( $wpdb->prepare(
-		$query,
-		$params
-	) );
+    global $wpdb;
+
+    // Search by substring
+    if ( $autocomplete ) {
+        $title = '%' . $title . '%';
+    }
+
+    // The title is a LIKE query.
+    $query = "SELECT DISTINCT p.ID AS id, p.post_title AS title, t.name AS schema_type_name, t.slug AS type_slug"
+                . " FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t"
+                . "  WHERE p.post_title LIKE %s"
+                . "   AND t.term_id = tt.term_id"
+                . "   AND tt.taxonomy = %s"
+                . "   AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+                . "   AND tr.object_id = p.ID"
+                // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
+                . "   AND p.post_status != 'trash'";
+
+    $params = array(
+        $title,
+        Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+    );
+
+    if ( $include_alias ) {
+
+        $query .= " UNION"
+                    . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
+                    . "  FROM $wpdb->posts p, $wpdb->term_taxonomy tt, $wpdb->term_relationships tr, $wpdb->terms t, $wpdb->postmeta m"
+                    . "   WHERE m.meta_key = %s AND m.meta_value LIKE %s"
+                    . "    AND m.post_id = p.ID"
+                    . "    AND t.term_id = tt.term_id"
+                    . "    AND tt.taxonomy = %s"
+                    . "    AND tt.term_taxonomy_id = tr.term_taxonomy_id"
+                    . "    AND tr.object_id = p.ID"
+                    // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
+                    . "    AND p.post_status != 'trash'";
+
+        $params = array_merge( $params, array(
+            Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
+            $title,
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+        ) );
+    }
+
+    return $wpdb->get_results( $wpdb->prepare(
+        $query,
+        $params
+    ) );
 }
 
 /**
@@ -77,42 +77,42 @@ 
  */
 function wl_entity_ajax_get_by_title() {
 
-	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/438.
-	// Get the title to search.
-	if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
-		@ob_clean();
-		wp_send_json_error( 'The title parameter is required.' );
-	}
-
-	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/438.
-	$title = $_POST['title'] ?: $_GET['title'];
-	$title = (string) $title;
-
-	// Are we searching for a specific title or for a containing title?
-	$autocomplete = isset( $_GET['autocomplete'] );
-
-	// Are we searching also for the aliases?
-	$include_alias = isset( $_GET['alias'] );
-
-	// Get the edit link.
-	$post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
-	$edit_link        = $post_type_object->_edit_link . '&action=edit';
-
-	// Prepare the response with the edit link.
-	$response = array(
-		'edit_link' => $edit_link,
-		'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
-	);
-
-	// Clean any buffer.
-	@ob_clean();
-
-	// Send the success response.
-	wp_send_json_success( $response );
+    // `wl_entity_metaboxes_utilities.js` still uses `GET`.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/438.
+    // Get the title to search.
+    if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
+        @ob_clean();
+        wp_send_json_error( 'The title parameter is required.' );
+    }
+
+    // `wl_entity_metaboxes_utilities.js` still uses `GET`.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/438.
+    $title = $_POST['title'] ?: $_GET['title'];
+    $title = (string) $title;
+
+    // Are we searching for a specific title or for a containing title?
+    $autocomplete = isset( $_GET['autocomplete'] );
+
+    // Are we searching also for the aliases?
+    $include_alias = isset( $_GET['alias'] );
+
+    // Get the edit link.
+    $post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
+    $edit_link        = $post_type_object->_edit_link . '&action=edit';
+
+    // Prepare the response with the edit link.
+    $response = array(
+        'edit_link' => $edit_link,
+        'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
+    );
+
+    // Clean any buffer.
+    @ob_clean();
+
+    // Send the success response.
+    wp_send_json_success( $response );
 
 }
 

Spacing +17 added lines, -17 removed lines

@@ -18,13 +18,13 @@ 
  *
  * @return array An array of WP_Post instances.
  */
-function wl_entity_get_by_title( $title, $autocomplete = false, $include_alias = true ) {
+function wl_entity_get_by_title($title, $autocomplete = false, $include_alias = true) {
 
 	global $wpdb;
 
 	// Search by substring
-	if ( $autocomplete ) {
-		$title = '%' . $title . '%';
+	if ($autocomplete) {
+		$title = '%'.$title.'%';
 	}
 
 	// The title is a LIKE query.
@@ -43,7 +43,7 @@ 
 		Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 	);
 
-	if ( $include_alias ) {
+	if ($include_alias) {
 
 		$query .= " UNION"
 				  . "  SELECT DISTINCT p.ID AS id, CONCAT( m.meta_value, ' (', p.post_title, ')' ) AS title, t.name AS schema_type_name, t.slug AS type_slug"
@@ -57,17 +57,17 @@ 
 				  // Ensure we don't load entities from the trash, see https://github.com/insideout10/wordlift-plugin/issues/278.
 				  . "    AND p.post_status != 'trash'";
 
-		$params = array_merge( $params, array(
+		$params = array_merge($params, array(
 			Wordlift_Entity_Service::ALTERNATIVE_LABEL_META_KEY,
 			$title,
 			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-		) );
+		));
 	}
 
-	return $wpdb->get_results( $wpdb->prepare(
+	return $wpdb->get_results($wpdb->prepare(
 		$query,
 		$params
-	) );
+	));
 }
 
 /**
@@ -81,9 +81,9 @@ 
 	//
 	// See https://github.com/insideout10/wordlift-plugin/issues/438.
 	// Get the title to search.
-	if ( empty( $_POST['title'] ) && empty( $_GET['title'] ) ) {
+	if (empty($_POST['title']) && empty($_GET['title'])) {
 		@ob_clean();
-		wp_send_json_error( 'The title parameter is required.' );
+		wp_send_json_error('The title parameter is required.');
 	}
 
 	// `wl_entity_metaboxes_utilities.js` still uses `GET`.
@@ -93,27 +93,27 @@ 
 	$title = (string) $title;
 
 	// Are we searching for a specific title or for a containing title?
-	$autocomplete = isset( $_GET['autocomplete'] );
+	$autocomplete = isset($_GET['autocomplete']);
 
 	// Are we searching also for the aliases?
-	$include_alias = isset( $_GET['alias'] );
+	$include_alias = isset($_GET['alias']);
 
 	// Get the edit link.
-	$post_type_object = get_post_type_object( Wordlift_Entity_Service::TYPE_NAME );
-	$edit_link        = $post_type_object->_edit_link . '&action=edit';
+	$post_type_object = get_post_type_object(Wordlift_Entity_Service::TYPE_NAME);
+	$edit_link        = $post_type_object->_edit_link.'&action=edit';
 
 	// Prepare the response with the edit link.
 	$response = array(
 		'edit_link' => $edit_link,
-		'results'   => wl_entity_get_by_title( $title, $autocomplete, $include_alias ),
+		'results'   => wl_entity_get_by_title($title, $autocomplete, $include_alias),
 	);
 
 	// Clean any buffer.
 	@ob_clean();
 
 	// Send the success response.
-	wp_send_json_success( $response );
+	wp_send_json_success($response);
 
 }
 
-add_action( 'wp_ajax_entity_by_title', 'wl_entity_ajax_get_by_title' );
+add_action('wp_ajax_entity_by_title', 'wl_entity_ajax_get_by_title');

src/modules/linked_data/wordlift_linked_data.php

Indentation +425 added lines, -425 removed lines

@@ -20,60 +20,60 @@ 
  */
 function wl_linked_data_save_post( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
-
-	$log->trace( "Saving post $post_id to Linked Data..." );
-
-	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
-
-		return;
-	}
-
-	// Get the post type and check whether it supports the editor.
-	//
-	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
-	/**
-	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
-	 *
-	 * @since 3.19.4
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
-	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
-
-	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
-
-		return;
-	}
-
-	/**
-	 * Only process valid post types
-	 *
-	 * @since 3.25.6
-	 *
-	 */
-	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
-
-	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types ) ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
-
-		return;
-	}
-
-	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
-
-	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
-
-	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+
+    $log->trace( "Saving post $post_id to Linked Data..." );
+
+    // If it's not numeric exit from here.
+    if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
+        $log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+
+        return;
+    }
+
+    // Get the post type and check whether it supports the editor.
+    //
+    // @see https://github.com/insideout10/wordlift-plugin/issues/659.
+    $post_type = get_post_type( $post_id );
+    /**
+     * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
+     *
+     * @since 3.19.4
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/847.
+     */
+    $is_editor_supported = wl_post_type_supports_editor( $post_type );
+
+    // Bail out if it's not an entity.
+    if ( ! $is_editor_supported ) {
+        $log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+
+        return;
+    }
+
+    /**
+     * Only process valid post types
+     *
+     * @since 3.25.6
+     *
+     */
+    $supported_types = Wordlift_Entity_Service::valid_entity_post_types();
+
+    // Bail out if it's not a valid entity.
+    if ( ! in_array( $post_type, $supported_types ) ) {
+        $log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+
+        return;
+    }
+
+    // Unhook this function so it doesn't loop infinitely.
+    remove_action( 'save_post', 'wl_linked_data_save_post' );
+
+    // raise the *wl_linked_data_save_post* event.
+    do_action( 'wl_linked_data_save_post', $post_id );
+
+    // Re-hook this function.
+    add_action( 'save_post', 'wl_linked_data_save_post' );
 }
 
 add_action( 'save_post', 'wl_linked_data_save_post' );
@@ -88,176 +88,176 @@ 
  */
 function wl_linked_data_save_post_and_related_entities( $post_id ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+    $log->trace( "Saving $post_id to Linked Data along with related entities..." );
 
-	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+    // Ignore auto-saves
+    if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+        $log->trace( 'Doing autosave, skipping...' );
 
-		return;
-	}
+        return;
+    }
 
-	// get the current post.
-	$post = get_post( $post_id );
+    // get the current post.
+    $post = get_post( $post_id );
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+    remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 
-	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
+    // wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
-	// Get the entity service instance.
-	$entity_service = Wordlift_Entity_Service::get_instance();
+    // Get the entity service instance.
+    $entity_service = Wordlift_Entity_Service::get_instance();
 
-	// Store mapping between tmp new entities uris and real new entities uri
-	$entities_uri_mapping = array();
+    // Store mapping between tmp new entities uris and real new entities uri
+    $entities_uri_mapping = array();
 
-	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
-
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+    // Save the entities coming with POST data.
+    if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
+        wl_write_log( json_encode( $_POST['wl_entities'] ) );
+        wl_write_log( "]" );
+        wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
+        wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
+        wl_write_log( "]" );
 
-		$entities_via_post = $_POST['wl_entities'];
-
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+        $entities_via_post = $_POST['wl_entities'];
+
+        foreach ( $entities_via_post as $entity_uri => $entity ) {
 
-			// Only if the current entity is created from scratch let's avoid to
-			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
-				$entity['main_type'] : null;
-
-			// Look if current entity uri matches an internal existing entity, meaning:
-			// 1. when $entity_uri is an internal uri
-			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+            // Only if the current entity is created from scratch let's avoid to
+            // create more than one entity with same label & entity type.
+            $entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+                $entity['main_type'] : null;
+
+            // Look if current entity uri matches an internal existing entity, meaning:
+            // 1. when $entity_uri is an internal uri
+            // 2. when $entity_uri is an external uri used as sameAs of an internal entity
+            $ie = $entity_service->get_entity_post_by_uri( $entity_uri );
 
-			// Dont save the entities which are not found, but also local.
-			if ( $ie === null &&  Wordlift_Entity_Uri_Service::get_instance()->is_internal( $entity_uri ) ) {
-				continue;
-			}
-
-			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
-				Wordlift_Uri_Service::get_instance()->build_uri(
-					$entity['label'],
-					Wordlift_Entity_Service::TYPE_NAME,
-					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
-
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
-
-			// Local entities have a tmp uri with 'local-entity-' prefix
-			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
-				// Override the entity obj
-				$entity['uri'] = $uri;
-			}
-
-			// Update entity data with related post
-			$entity['related_post_id'] = $post_id;
-
-			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
-			}
-
-		}
-
-	}
-
-	// Replace tmp uris in content post if needed
-	$updated_post_content = $post->post_content;
-
-	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
-		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
-				continue;
-			}
-
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
-		}
-
-		// Update the post content.
-		/**
-		 * Note: wp_update_post do stripslashes before saving the
-		 * content, so add the slashes to prevent back slash getting
-		 * removed.
-		 */
-		wp_update_post( array(
-			'ID'           => $post->ID,
-			'post_content' => addslashes( $updated_post_content ),
-		) );
-	}
-	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
-
-
-	$relations = Object_Relation_Service::get_instance()
-	                                    ->get_relations_from_content( $updated_post_content, Object_Type_Enum::POST );
-
-	// Save relation instances
-	foreach ( $relations as $relation ) {
-
-		wl_core_add_relation_instance(
-			// subject id.
-			$post_id,
-			// what, where, when, who
-			$relation->get_relation_type(),
-			// object id.
-			$relation->get_object_id(),
-			// Subject type.
-			$relation->get_subject_type(),
-			// Object type.
-			$relation->get_object_type()
-		);
-
-	}
-
-	if ( isset( $_POST['wl_entities'] ) ) {
-		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
-			$_POST['wl_metadata'] : array();
-
-		$fields = array(
-			Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
-			Wordlift_Schema_Service::FIELD_TOPIC,
-		);
-
-		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
-
-		foreach ( $fields as $field ) {
-
-			// Delete current values
-			delete_post_meta( $post->ID, $field );
-			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
-
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
-
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
-				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
-				}
-			}
-		}
-	}
-
-	// Push the post to Redlink.
-	do_action( 'wl_legacy_linked_data__push', $post->ID );
-
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+            // Dont save the entities which are not found, but also local.
+            if ( $ie === null &&  Wordlift_Entity_Uri_Service::get_instance()->is_internal( $entity_uri ) ) {
+                continue;
+            }
+
+            // Detect the uri depending if is an existing or a new entity
+            $uri = ( null === $ie ) ?
+                Wordlift_Uri_Service::get_instance()->build_uri(
+                    $entity['label'],
+                    Wordlift_Entity_Service::TYPE_NAME,
+                    $entity_type
+                ) : wl_get_entity_uri( $ie->ID );
+
+            wl_write_log( "Map $entity_uri on $uri" );
+            $entities_uri_mapping[ $entity_uri ] = $uri;
+
+            // Local entities have a tmp uri with 'local-entity-' prefix
+            // These uris need to be rewritten here and replaced in the content
+            if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+                // Override the entity obj
+                $entity['uri'] = $uri;
+            }
+
+            // Update entity data with related post
+            $entity['related_post_id'] = $post_id;
+
+            // Save the entity if is a new entity
+            if ( null === $ie ) {
+                wl_save_entity( $entity );
+            }
+
+        }
+
+    }
+
+    // Replace tmp uris in content post if needed
+    $updated_post_content = $post->post_content;
+
+    // Update the post content if we found mappings of new entities.
+    if ( ! empty( $entities_uri_mapping ) ) {
+        // Save each entity and store the post id.
+        foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
+            if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+                continue;
+            }
+
+            $updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+        }
+
+        // Update the post content.
+        /**
+         * Note: wp_update_post do stripslashes before saving the
+         * content, so add the slashes to prevent back slash getting
+         * removed.
+         */
+        wp_update_post( array(
+            'ID'           => $post->ID,
+            'post_content' => addslashes( $updated_post_content ),
+        ) );
+    }
+    // Reset previously saved instances.
+    wl_core_delete_relation_instances( $post_id );
+
+
+    $relations = Object_Relation_Service::get_instance()
+                                        ->get_relations_from_content( $updated_post_content, Object_Type_Enum::POST );
+
+    // Save relation instances
+    foreach ( $relations as $relation ) {
+
+        wl_core_add_relation_instance(
+            // subject id.
+            $post_id,
+            // what, where, when, who
+            $relation->get_relation_type(),
+            // object id.
+            $relation->get_object_id(),
+            // Subject type.
+            $relation->get_subject_type(),
+            // Object type.
+            $relation->get_object_type()
+        );
+
+    }
+
+    if ( isset( $_POST['wl_entities'] ) ) {
+        // Save post metadata if available
+        $metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+            $_POST['wl_metadata'] : array();
+
+        $fields = array(
+            Wordlift_Schema_Service::FIELD_LOCATION_CREATED,
+            Wordlift_Schema_Service::FIELD_TOPIC,
+        );
+
+        // Unlink topic taxonomy terms
+        Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+
+        foreach ( $fields as $field ) {
+
+            // Delete current values
+            delete_post_meta( $post->ID, $field );
+            // Retrieve the entity uri
+            $uri = ( isset( $metadata_via_post[ $field ] ) ) ?
+                stripslashes( $metadata_via_post[ $field ] ) : '';
+
+            $entity = $entity_service->get_entity_post_by_uri( $uri );
+
+            if ( $entity ) {
+                add_post_meta( $post->ID, $field, $entity->ID, true );
+                // Set also the topic taxonomy
+                if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
+                    Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+                }
+            }
+        }
+    }
+
+    // Push the post to Redlink.
+    do_action( 'wl_legacy_linked_data__push', $post->ID );
+
+    add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
 }
 
 add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
@@ -280,203 +280,203 @@ 
  */
 function wl_save_entity( $entity_data ) {
 
-	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/image.php' );
-	}
+    // Required for REST API calls
+    if ( ! function_exists( 'wp_crop_image' ) ) {
+        require_once( ABSPATH . 'wp-admin/includes/image.php' );
+    }
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
 
-	$uri = $entity_data['uri'];
-	/*
+    $uri = $entity_data['uri'];
+    /*
 	 * Data is coming from a $_POST, sanitize it.
 	 *
 	 * @since 3.19.4
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
-	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
-	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
-
-	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
-
-	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
-
-		return $post;
-	}
-
-	// Prepare properties of the new entity.
-	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
-		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
-		'post_title'   => $label,
-		'post_content' => $description,
-		'post_excerpt' => '',
-		// Ensure we're using a valid slug. We're not overwriting an existing
-		// entity with a post_name already set, since this call is made only for
-		// new entities.
-		//
-		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
-	);
-
-	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
-	// the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
-	// Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
-	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
-	// is created when saving a post.
-	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		) );
-	}
-
-	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
-	// save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
-	// to the save_post and restore them after we saved the entity.
-	// see https://github.com/insideout10/wordlift-plugin/issues/203
-	// see https://github.com/insideout10/wordlift-plugin/issues/156
-	// see https://github.com/insideout10/wordlift-plugin/issues/148
-	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
-
-
-	$log->trace( 'Going to insert new post...' );
-
-	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
-
-	// Setting the alternative labels for this entity.
-	Wordlift_Entity_Service::get_instance()
-	                       ->set_alternative_labels( $post_id, $synonyms );
-
-	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
-
-	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
-			$wpseo_metabox,
-			'save_postdata',
-		) );
-	}
-
-	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
-			$seo_ultimate,
-			'save_postmeta_box',
-		), 10, 2 );
-	}
-
-	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
-
-		// inform an error occurred.
-		return null;
-	}
-
-	wl_set_entity_main_type( $post_id, $type_uri );
-
-	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
-
-	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
-
-	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
-	}
-
-	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
-
-	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
-	}
-
-	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
-
-	foreach ( $images as $image_remote_url ) {
-
-		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
-			// Do nothing.
-			continue;
-		}
-
-		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
-
-		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
-			continue;
-		}
-
-		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
-
-		if ( false === $image || is_wp_error( $image ) ) {
-			continue;
-		}
-
-		// Get the local URL.
-		$filename     = $image['path'];
-		$url          = $image['url'];
-		$content_type = $image['content_type'];
-
-		$attachment = array(
-			'guid'           => $url,
-			// post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
-			'post_title'     => $label,
-			// Set the title to the post title.
-			'post_content'   => '',
-			'post_status'    => 'inherit',
-			'post_mime_type' => $content_type,
-		);
+    $label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+    $type_uri         = $entity_data['main_type'];
+    $entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+    $description      = $entity_data['description'];
+    $images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
+    $same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
+    $related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
+    $other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+
+    // Get the synonyms.
+    $synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+
+    // Check whether an entity already exists with the provided URI.
+    if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
+        $log->debug( "Post already exists for URI $uri." );
+
+        return $post;
+    }
+
+    // Prepare properties of the new entity.
+    $params = array(
+        'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+        'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
+        'post_title'   => $label,
+        'post_content' => $description,
+        'post_excerpt' => '',
+        // Ensure we're using a valid slug. We're not overwriting an existing
+        // entity with a post_name already set, since this call is made only for
+        // new entities.
+        //
+        // See https://github.com/insideout10/wordlift-plugin/issues/282
+        'post_name'    => sanitize_title( $label ),
+    );
+
+    // If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
+    // the local SEO form values to the created entity (https://github.com/insideout10/wordlift-plugin/issues/156)
+    // Same thing applies to SEO Ultimate (https://github.com/insideout10/wordlift-plugin/issues/148)
+    // This does NOT affect saving an entity from the entity admin page since this function is called when an entity
+    // is created when saving a post.
+    global $wpseo_metabox, $seo_ultimate;
+    if ( isset( $wpseo_metabox ) ) {
+        remove_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    if ( isset( $seo_ultimate ) ) {
+        remove_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ) );
+    }
+
+    // The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
+    // save_post in order to save additional inputs from the edit page. In order to avoid issues, we pop all the hooks
+    // to the save_post and restore them after we saved the entity.
+    // see https://github.com/insideout10/wordlift-plugin/issues/203
+    // see https://github.com/insideout10/wordlift-plugin/issues/156
+    // see https://github.com/insideout10/wordlift-plugin/issues/148
+    global $wp_filter;
+    $save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+
+
+    $log->trace( 'Going to insert new post...' );
+
+    // create or update the post.
+    $post_id = wp_insert_post( $params, true );
+
+    // Setting the alternative labels for this entity.
+    Wordlift_Entity_Service::get_instance()
+                            ->set_alternative_labels( $post_id, $synonyms );
+
+    // Restore all the existing filters.
+    is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+
+    // If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
+    if ( isset( $wpseo_metabox ) ) {
+        add_action( 'wp_insert_post', array(
+            $wpseo_metabox,
+            'save_postdata',
+        ) );
+    }
+
+    // If SEO Ultimate is installed, add back the hook we removed a few lines above.
+    if ( isset( $seo_ultimate ) ) {
+        add_action( 'save_post', array(
+            $seo_ultimate,
+            'save_postmeta_box',
+        ), 10, 2 );
+    }
+
+    // TODO: handle errors.
+    if ( is_wp_error( $post_id ) ) {
+        $log->error( 'An error occurred: ' . $post_id->get_error_message() );
+
+        // inform an error occurred.
+        return null;
+    }
+
+    wl_set_entity_main_type( $post_id, $type_uri );
+
+    // Save the entity types.
+    wl_set_entity_rdf_types( $post_id, $entity_types );
+
+    // Get a dataset URI for the entity.
+    $wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+
+    // Add the uri to the sameAs data if it's not a local URI.
+    if ( $wl_uri !== $uri ) {
+        array_push( $same_as, $uri );
+    }
+
+    // Save the sameAs data for the entity.
+    wl_schema_set_value( $post_id, 'sameAs', $same_as );
+
+    // Save the other properties (latitude, langitude, startDate, endDate, etc.)
+    foreach ( $other_properties as $property_name => $property_value ) {
+        wl_schema_set_value( $post_id, $property_name, $property_value );
+    }
+
+    // Call hooks.
+    do_action( 'wl_save_entity', $post_id );
+
+    foreach ( $images as $image_remote_url ) {
+
+        // Check if image is already present in local DB
+        if ( strpos( $image_remote_url, site_url() ) !== false ) {
+            // Do nothing.
+            continue;
+        }
+
+        // Check if there is an existing attachment for this post ID and source URL.
+        $existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+
+        // Skip if an existing image is found.
+        if ( null !== $existing_image ) {
+            continue;
+        }
+
+        // Save the image and get the local path.
+        $image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+
+        if ( false === $image || is_wp_error( $image ) ) {
+            continue;
+        }
+
+        // Get the local URL.
+        $filename     = $image['path'];
+        $url          = $image['url'];
+        $content_type = $image['content_type'];
+
+        $attachment = array(
+            'guid'           => $url,
+            // post_title, post_content (the value for this key should be the empty string), post_status and post_mime_type
+            'post_title'     => $label,
+            // Set the title to the post title.
+            'post_content'   => '',
+            'post_status'    => 'inherit',
+            'post_mime_type' => $content_type,
+        );
 
-		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
-
-		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
-
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
-
-		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
-	}
-
-	// The entity is pushed to Redlink on save by the function hooked to save_post.
-	// save the entity in the triple store.
-	do_action( 'wl_legacy_linked_data__push', $post_id );
-
-	// finally return the entity post.
-	return get_post( $post_id );
+        // Create the attachment in WordPress and generate the related metadata.
+        $attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+
+        // Set the source URL for the image.
+        wl_set_source_url( $attachment_id, $image_remote_url );
+
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
+
+        // Set it as the featured image.
+        set_post_thumbnail( $post_id, $attachment_id );
+    }
+
+    // The entity is pushed to Redlink on save by the function hooked to save_post.
+    // save the entity in the triple store.
+    do_action( 'wl_legacy_linked_data__push', $post_id );
+
+    // finally return the entity post.
+    return get_post( $post_id );
 }
 
 /**
@@ -490,41 +490,41 @@ 
  */
 function wl_linked_data_content_get_embedded_entities( $content ) {
 
-	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+    // Remove quote escapes.
+    $content = str_replace( '\\"', '"', $content );
 
-	// Match all itemid attributes.
-	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
+    // Match all itemid attributes.
+    $pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
 
-	//	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
+    //	wl_write_log( "Getting entities embedded into content [ pattern :: $pattern ]" );
 
-	// Remove the pattern while it is found (match nested annotations).
-	$matches = array();
+    // Remove the pattern while it is found (match nested annotations).
+    $matches = array();
 
-	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+    // In case of errors, return an empty array.
+    if ( false === preg_match_all( $pattern, $content, $matches ) ) {
+        wl_write_log( "Found no entities embedded in content" );
 
-		return array();
-	}
+        return array();
+    }
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	$uris  = $matches[1];
-	// Collect the entities.
-	$entities = array();
-	foreach ( $uris as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+    $uris  = $matches[1];
+    // Collect the entities.
+    $entities = array();
+    foreach ( $uris as $uri ) {
+        $uri_d = html_entity_decode( $uri );
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+        $entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
-		}
-	}
+        if ( null !== $entity ) {
+            array_push( $entities, $entity->ID );
+        }
+    }
 
-	// $count = sizeof( $entities );
-	// wl_write_log( "Found $count entities embedded in content" );
+    // $count = sizeof( $entities );
+    // wl_write_log( "Found $count entities embedded in content" );
 
-	return $entities;
+    return $entities;
 }
\ No newline at end of file

Spacing +132 added lines, -132 removed lines

@@ -18,15 +18,15 @@ 
  * @since 3.0.0
  *
  */
-function wl_linked_data_save_post( $post_id ) {
+function wl_linked_data_save_post($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post');
 
-	$log->trace( "Saving post $post_id to Linked Data..." );
+	$log->trace("Saving post $post_id to Linked Data...");
 
 	// If it's not numeric exit from here.
-	if ( ! is_numeric( $post_id ) || is_numeric( wp_is_post_revision( $post_id ) ) ) {
-		$log->debug( "Skipping $post_id, because id is not numeric or is a post revision." );
+	if ( ! is_numeric($post_id) || is_numeric(wp_is_post_revision($post_id))) {
+		$log->debug("Skipping $post_id, because id is not numeric or is a post revision.");
 
 		return;
 	}
@@ -34,7 +34,7 @@ 
 	// Get the post type and check whether it supports the editor.
 	//
 	// @see https://github.com/insideout10/wordlift-plugin/issues/659.
-	$post_type = get_post_type( $post_id );
+	$post_type = get_post_type($post_id);
 	/**
 	 * Use `wl_post_type_supports_editor` which calls a filter to allow 3rd parties to change the setting.
 	 *
@@ -42,11 +42,11 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/847.
 	 */
-	$is_editor_supported = wl_post_type_supports_editor( $post_type );
+	$is_editor_supported = wl_post_type_supports_editor($post_type);
 
 	// Bail out if it's not an entity.
-	if ( ! $is_editor_supported ) {
-		$log->debug( "Skipping $post_id, because $post_type doesn't support the editor (content)." );
+	if ( ! $is_editor_supported) {
+		$log->debug("Skipping $post_id, because $post_type doesn't support the editor (content).");
 
 		return;
 	}
@@ -60,23 +60,23 @@ 
 	$supported_types = Wordlift_Entity_Service::valid_entity_post_types();
 
 	// Bail out if it's not a valid entity.
-	if ( ! in_array( $post_type, $supported_types ) ) {
-		$log->debug( "Skipping $post_id, because $post_type is not a valid entity." );
+	if ( ! in_array($post_type, $supported_types)) {
+		$log->debug("Skipping $post_id, because $post_type is not a valid entity.");
 
 		return;
 	}
 
 	// Unhook this function so it doesn't loop infinitely.
-	remove_action( 'save_post', 'wl_linked_data_save_post' );
+	remove_action('save_post', 'wl_linked_data_save_post');
 
 	// raise the *wl_linked_data_save_post* event.
-	do_action( 'wl_linked_data_save_post', $post_id );
+	do_action('wl_linked_data_save_post', $post_id);
 
 	// Re-hook this function.
-	add_action( 'save_post', 'wl_linked_data_save_post' );
+	add_action('save_post', 'wl_linked_data_save_post');
 }
 
-add_action( 'save_post', 'wl_linked_data_save_post' );
+add_action('save_post', 'wl_linked_data_save_post');
 
 /**
  * Save the post to the triple store. Also saves the entities locally and on the triple store.
@@ -86,23 +86,23 @@ 
  * @since 3.0.0
  *
  */
-function wl_linked_data_save_post_and_related_entities( $post_id ) {
+function wl_linked_data_save_post_and_related_entities($post_id) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_linked_data_save_post_and_related_entities' );
+	$log = Wordlift_Log_Service::get_logger('wl_linked_data_save_post_and_related_entities');
 
-	$log->trace( "Saving $post_id to Linked Data along with related entities..." );
+	$log->trace("Saving $post_id to Linked Data along with related entities...");
 
 	// Ignore auto-saves
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
-		$log->trace( 'Doing autosave, skipping...' );
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+		$log->trace('Doing autosave, skipping...');
 
 		return;
 	}
 
 	// get the current post.
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	remove_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	remove_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 	// wl_write_log( "[ post id :: $post_id ][ autosave :: false ][ post type :: $post->post_type ]" );
 
@@ -113,48 +113,48 @@ 
 	$entities_uri_mapping = array();
 
 	// Save the entities coming with POST data.
-	if ( isset( $_POST['wl_entities'] ) && isset( $_POST['wl_boxes'] ) ) {
+	if (isset($_POST['wl_entities']) && isset($_POST['wl_boxes'])) {
 
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_entities) :: " );
-		wl_write_log( json_encode( $_POST['wl_entities'] ) );
-		wl_write_log( "]" );
-		wl_write_log( "[ post id :: $post_id ][ POST(wl_boxes) :: " );
-		wl_write_log( json_encode( $_POST['wl_boxes'], true ) );
-		wl_write_log( "]" );
+		wl_write_log("[ post id :: $post_id ][ POST(wl_entities) :: ");
+		wl_write_log(json_encode($_POST['wl_entities']));
+		wl_write_log("]");
+		wl_write_log("[ post id :: $post_id ][ POST(wl_boxes) :: ");
+		wl_write_log(json_encode($_POST['wl_boxes'], true));
+		wl_write_log("]");
 
 		$entities_via_post = $_POST['wl_entities'];
 
-		foreach ( $entities_via_post as $entity_uri => $entity ) {
+		foreach ($entities_via_post as $entity_uri => $entity) {
 
 			// Only if the current entity is created from scratch let's avoid to
 			// create more than one entity with same label & entity type.
-			$entity_type = ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) ?
+			$entity_type = (preg_match('/^local-entity-.+/', $entity_uri) > 0) ?
 				$entity['main_type'] : null;
 
 			// Look if current entity uri matches an internal existing entity, meaning:
 			// 1. when $entity_uri is an internal uri
 			// 2. when $entity_uri is an external uri used as sameAs of an internal entity
-			$ie = $entity_service->get_entity_post_by_uri( $entity_uri );
+			$ie = $entity_service->get_entity_post_by_uri($entity_uri);
 
 			// Dont save the entities which are not found, but also local.
-			if ( $ie === null &&  Wordlift_Entity_Uri_Service::get_instance()->is_internal( $entity_uri ) ) {
+			if ($ie === null && Wordlift_Entity_Uri_Service::get_instance()->is_internal($entity_uri)) {
 				continue;
 			}
 
 			// Detect the uri depending if is an existing or a new entity
-			$uri = ( null === $ie ) ?
+			$uri = (null === $ie) ?
 				Wordlift_Uri_Service::get_instance()->build_uri(
 					$entity['label'],
 					Wordlift_Entity_Service::TYPE_NAME,
 					$entity_type
-				) : wl_get_entity_uri( $ie->ID );
+				) : wl_get_entity_uri($ie->ID);
 
-			wl_write_log( "Map $entity_uri on $uri" );
-			$entities_uri_mapping[ $entity_uri ] = $uri;
+			wl_write_log("Map $entity_uri on $uri");
+			$entities_uri_mapping[$entity_uri] = $uri;
 
 			// Local entities have a tmp uri with 'local-entity-' prefix
 			// These uris need to be rewritten here and replaced in the content
-			if ( preg_match( '/^local-entity-.+/', $entity_uri ) > 0 ) {
+			if (preg_match('/^local-entity-.+/', $entity_uri) > 0) {
 				// Override the entity obj
 				$entity['uri'] = $uri;
 			}
@@ -163,8 +163,8 @@ 
 			$entity['related_post_id'] = $post_id;
 
 			// Save the entity if is a new entity
-			if ( null === $ie ) {
-				wl_save_entity( $entity );
+			if (null === $ie) {
+				wl_save_entity($entity);
 			}
 
 		}
@@ -175,14 +175,14 @@ 
 	$updated_post_content = $post->post_content;
 
 	// Update the post content if we found mappings of new entities.
-	if ( ! empty( $entities_uri_mapping ) ) {
+	if ( ! empty($entities_uri_mapping)) {
 		// Save each entity and store the post id.
-		foreach ( $entities_uri_mapping as $tmp_uri => $uri ) {
-			if ( 1 !== preg_match( '@^(https?://|local-entity-)@', $tmp_uri ) ) {
+		foreach ($entities_uri_mapping as $tmp_uri => $uri) {
+			if (1 !== preg_match('@^(https?://|local-entity-)@', $tmp_uri)) {
 				continue;
 			}
 
-			$updated_post_content = str_replace( $tmp_uri, $uri, $updated_post_content );
+			$updated_post_content = str_replace($tmp_uri, $uri, $updated_post_content);
 		}
 
 		// Update the post content.
@@ -191,20 +191,20 @@ 
 		 * content, so add the slashes to prevent back slash getting
 		 * removed.
 		 */
-		wp_update_post( array(
+		wp_update_post(array(
 			'ID'           => $post->ID,
-			'post_content' => addslashes( $updated_post_content ),
-		) );
+			'post_content' => addslashes($updated_post_content),
+		));
 	}
 	// Reset previously saved instances.
-	wl_core_delete_relation_instances( $post_id );
+	wl_core_delete_relation_instances($post_id);
 
 
 	$relations = Object_Relation_Service::get_instance()
-	                                    ->get_relations_from_content( $updated_post_content, Object_Type_Enum::POST );
+	                                    ->get_relations_from_content($updated_post_content, Object_Type_Enum::POST);
 
 	// Save relation instances
-	foreach ( $relations as $relation ) {
+	foreach ($relations as $relation) {
 
 		wl_core_add_relation_instance(
 			// subject id.
@@ -221,9 +221,9 @@ 
 
 	}
 
-	if ( isset( $_POST['wl_entities'] ) ) {
+	if (isset($_POST['wl_entities'])) {
 		// Save post metadata if available
-		$metadata_via_post = ( isset( $_POST['wl_metadata'] ) ) ?
+		$metadata_via_post = (isset($_POST['wl_metadata'])) ?
 			$_POST['wl_metadata'] : array();
 
 		$fields = array(
@@ -232,35 +232,35 @@ 
 		);
 
 		// Unlink topic taxonomy terms
-		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for( $post->ID );
+		Wordlift_Topic_Taxonomy_Service::get_instance()->unlink_topic_for($post->ID);
 
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 
 			// Delete current values
-			delete_post_meta( $post->ID, $field );
+			delete_post_meta($post->ID, $field);
 			// Retrieve the entity uri
-			$uri = ( isset( $metadata_via_post[ $field ] ) ) ?
-				stripslashes( $metadata_via_post[ $field ] ) : '';
+			$uri = (isset($metadata_via_post[$field])) ?
+				stripslashes($metadata_via_post[$field]) : '';
 
-			$entity = $entity_service->get_entity_post_by_uri( $uri );
+			$entity = $entity_service->get_entity_post_by_uri($uri);
 
-			if ( $entity ) {
-				add_post_meta( $post->ID, $field, $entity->ID, true );
+			if ($entity) {
+				add_post_meta($post->ID, $field, $entity->ID, true);
 				// Set also the topic taxonomy
-				if ( $field === Wordlift_Schema_Service::FIELD_TOPIC ) {
-					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for( $post->ID, $entity );
+				if ($field === Wordlift_Schema_Service::FIELD_TOPIC) {
+					Wordlift_Topic_Taxonomy_Service::get_instance()->set_topic_for($post->ID, $entity);
 				}
 			}
 		}
 	}
 
 	// Push the post to Redlink.
-	do_action( 'wl_legacy_linked_data__push', $post->ID );
+	do_action('wl_legacy_linked_data__push', $post->ID);
 
-	add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+	add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 }
 
-add_action( 'wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities' );
+add_action('wl_linked_data_save_post', 'wl_linked_data_save_post_and_related_entities');
 
 /**
  * Save the specified data as an entity in WordPress. This method only create new entities. When an existing entity is
@@ -278,14 +278,14 @@ 
  *
  * @return null|WP_Post A post instance or null in case of failure.
  */
-function wl_save_entity( $entity_data ) {
+function wl_save_entity($entity_data) {
 
 	// Required for REST API calls
-	if ( ! function_exists( 'wp_crop_image' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+	if ( ! function_exists('wp_crop_image')) {
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 	}
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_save_entity' );
+	$log = Wordlift_Log_Service::get_logger('wl_save_entity');
 
 	$uri = $entity_data['uri'];
 	/*
@@ -295,28 +295,28 @@ 
 	 *
 	 * @see https://github.com/insideout10/wordlift-plugin/issues/841
 	 */
-	$label            = preg_replace( '/\xEF\xBB\xBF/', '', sanitize_text_field( $entity_data['label'] ) );
+	$label            = preg_replace('/\xEF\xBB\xBF/', '', sanitize_text_field($entity_data['label']));
 	$type_uri         = $entity_data['main_type'];
-	$entity_types     = isset( $entity_data['type'] ) ? $entity_data['type'] : array();
+	$entity_types     = isset($entity_data['type']) ? $entity_data['type'] : array();
 	$description      = $entity_data['description'];
-	$images           = isset( $entity_data['image'] ) ? (array) $entity_data['image'] : array();
-	$same_as          = isset( $entity_data['sameas'] ) ? (array) $entity_data['sameas'] : array();
-	$related_post_id  = isset( $entity_data['related_post_id'] ) ? $entity_data['related_post_id'] : null;
-	$other_properties = isset( $entity_data['properties'] ) ? $entity_data['properties'] : array();
+	$images           = isset($entity_data['image']) ? (array) $entity_data['image'] : array();
+	$same_as          = isset($entity_data['sameas']) ? (array) $entity_data['sameas'] : array();
+	$related_post_id  = isset($entity_data['related_post_id']) ? $entity_data['related_post_id'] : null;
+	$other_properties = isset($entity_data['properties']) ? $entity_data['properties'] : array();
 
 	// Get the synonyms.
-	$synonyms = isset( $entity_data['synonym'] ) ? $entity_data['synonym'] : array();
+	$synonyms = isset($entity_data['synonym']) ? $entity_data['synonym'] : array();
 
 	// Check whether an entity already exists with the provided URI.
-	if ( null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri ) ) {
-		$log->debug( "Post already exists for URI $uri." );
+	if (null !== $post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri)) {
+		$log->debug("Post already exists for URI $uri.");
 
 		return $post;
 	}
 
 	// Prepare properties of the new entity.
 	$params = array(
-		'post_status'  => ( is_numeric( $related_post_id ) ? get_post_status( $related_post_id ) : 'draft' ),
+		'post_status'  => (is_numeric($related_post_id) ? get_post_status($related_post_id) : 'draft'),
 		'post_type'    => Wordlift_Entity_Service::TYPE_NAME,
 		'post_title'   => $label,
 		'post_content' => $description,
@@ -326,7 +326,7 @@ 
 		// new entities.
 		//
 		// See https://github.com/insideout10/wordlift-plugin/issues/282
-		'post_name'    => sanitize_title( $label ),
+		'post_name'    => sanitize_title($label),
 	);
 
 	// If Yoast is installed and active, we temporary remove the save_postdata hook which causes Yoast to "pass over"
@@ -335,18 +335,18 @@ 
 	// This does NOT affect saving an entity from the entity admin page since this function is called when an entity
 	// is created when saving a post.
 	global $wpseo_metabox, $seo_ultimate;
-	if ( isset( $wpseo_metabox ) ) {
-		remove_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		remove_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
-	if ( isset( $seo_ultimate ) ) {
-		remove_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		remove_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		) );
+		));
 	}
 
 	// The fact that we're calling here wp_insert_post is causing issues with plugins (and ourselves too) that hook to
@@ -356,90 +356,90 @@ 
 	// see https://github.com/insideout10/wordlift-plugin/issues/156
 	// see https://github.com/insideout10/wordlift-plugin/issues/148
 	global $wp_filter;
-	$save_post_filters = is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
+	$save_post_filters = is_array($wp_filter['save_post']) ? $wp_filter['save_post'] : $wp_filter['save_post']->callbacks;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = array() : $wp_filter['save_post']->remove_all_filters();
 
 
-	$log->trace( 'Going to insert new post...' );
+	$log->trace('Going to insert new post...');
 
 	// create or update the post.
-	$post_id = wp_insert_post( $params, true );
+	$post_id = wp_insert_post($params, true);
 
 	// Setting the alternative labels for this entity.
 	Wordlift_Entity_Service::get_instance()
-	                       ->set_alternative_labels( $post_id, $synonyms );
+	                       ->set_alternative_labels($post_id, $synonyms);
 
 	// Restore all the existing filters.
-	is_array( $wp_filter['save_post'] ) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
+	is_array($wp_filter['save_post']) ? $wp_filter['save_post'] = $save_post_filters : $wp_filter['save_post']->callbacks = $save_post_filters;
 
 	// If Yoast is installed and active, we restore the Yoast save_postdata hook (https://github.com/insideout10/wordlift-plugin/issues/156)
-	if ( isset( $wpseo_metabox ) ) {
-		add_action( 'wp_insert_post', array(
+	if (isset($wpseo_metabox)) {
+		add_action('wp_insert_post', array(
 			$wpseo_metabox,
 			'save_postdata',
-		) );
+		));
 	}
 
 	// If SEO Ultimate is installed, add back the hook we removed a few lines above.
-	if ( isset( $seo_ultimate ) ) {
-		add_action( 'save_post', array(
+	if (isset($seo_ultimate)) {
+		add_action('save_post', array(
 			$seo_ultimate,
 			'save_postmeta_box',
-		), 10, 2 );
+		), 10, 2);
 	}
 
 	// TODO: handle errors.
-	if ( is_wp_error( $post_id ) ) {
-		$log->error( 'An error occurred: ' . $post_id->get_error_message() );
+	if (is_wp_error($post_id)) {
+		$log->error('An error occurred: '.$post_id->get_error_message());
 
 		// inform an error occurred.
 		return null;
 	}
 
-	wl_set_entity_main_type( $post_id, $type_uri );
+	wl_set_entity_main_type($post_id, $type_uri);
 
 	// Save the entity types.
-	wl_set_entity_rdf_types( $post_id, $entity_types );
+	wl_set_entity_rdf_types($post_id, $entity_types);
 
 	// Get a dataset URI for the entity.
-	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri( $post_id );
+	$wl_uri = Wordlift_Entity_Service::get_instance()->get_uri($post_id);
 
 	// Add the uri to the sameAs data if it's not a local URI.
-	if ( $wl_uri !== $uri ) {
-		array_push( $same_as, $uri );
+	if ($wl_uri !== $uri) {
+		array_push($same_as, $uri);
 	}
 
 	// Save the sameAs data for the entity.
-	wl_schema_set_value( $post_id, 'sameAs', $same_as );
+	wl_schema_set_value($post_id, 'sameAs', $same_as);
 
 	// Save the other properties (latitude, langitude, startDate, endDate, etc.)
-	foreach ( $other_properties as $property_name => $property_value ) {
-		wl_schema_set_value( $post_id, $property_name, $property_value );
+	foreach ($other_properties as $property_name => $property_value) {
+		wl_schema_set_value($post_id, $property_name, $property_value);
 	}
 
 	// Call hooks.
-	do_action( 'wl_save_entity', $post_id );
+	do_action('wl_save_entity', $post_id);
 
-	foreach ( $images as $image_remote_url ) {
+	foreach ($images as $image_remote_url) {
 
 		// Check if image is already present in local DB
-		if ( strpos( $image_remote_url, site_url() ) !== false ) {
+		if (strpos($image_remote_url, site_url()) !== false) {
 			// Do nothing.
 			continue;
 		}
 
 		// Check if there is an existing attachment for this post ID and source URL.
-		$existing_image = wl_get_attachment_for_source_url( $post_id, $image_remote_url );
+		$existing_image = wl_get_attachment_for_source_url($post_id, $image_remote_url);
 
 		// Skip if an existing image is found.
-		if ( null !== $existing_image ) {
+		if (null !== $existing_image) {
 			continue;
 		}
 
 		// Save the image and get the local path.
-		$image = Wordlift_Remote_Image_Service::save_from_url( $image_remote_url );
+		$image = Wordlift_Remote_Image_Service::save_from_url($image_remote_url);
 
-		if ( false === $image || is_wp_error( $image ) ) {
+		if (false === $image || is_wp_error($image)) {
 			continue;
 		}
 
@@ -459,24 +459,24 @@ 
 		);
 
 		// Create the attachment in WordPress and generate the related metadata.
-		$attachment_id = wp_insert_attachment( $attachment, $filename, $post_id );
+		$attachment_id = wp_insert_attachment($attachment, $filename, $post_id);
 
 		// Set the source URL for the image.
-		wl_set_source_url( $attachment_id, $image_remote_url );
+		wl_set_source_url($attachment_id, $image_remote_url);
 
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $filename);
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		// Set it as the featured image.
-		set_post_thumbnail( $post_id, $attachment_id );
+		set_post_thumbnail($post_id, $attachment_id);
 	}
 
 	// The entity is pushed to Redlink on save by the function hooked to save_post.
 	// save the entity in the triple store.
-	do_action( 'wl_legacy_linked_data__push', $post_id );
+	do_action('wl_legacy_linked_data__push', $post_id);
 
 	// finally return the entity post.
-	return get_post( $post_id );
+	return get_post($post_id);
 }
 
 /**
@@ -488,10 +488,10 @@ 
  * @since 3.0.0
  *
  */
-function wl_linked_data_content_get_embedded_entities( $content ) {
+function wl_linked_data_content_get_embedded_entities($content) {
 
 	// Remove quote escapes.
-	$content = str_replace( '\\"', '"', $content );
+	$content = str_replace('\\"', '"', $content);
 
 	// Match all itemid attributes.
 	$pattern = '/<\w+[^>]*\sitemid="([^"]+)"[^>]*>/im';
@@ -502,24 +502,24 @@ 
 	$matches = array();
 
 	// In case of errors, return an empty array.
-	if ( false === preg_match_all( $pattern, $content, $matches ) ) {
-		wl_write_log( "Found no entities embedded in content" );
+	if (false === preg_match_all($pattern, $content, $matches)) {
+		wl_write_log("Found no entities embedded in content");
 
 		return array();
 	}
 
 //    wl_write_log("wl_update_related_entities [ content :: $content ][ data :: " . var_export($data, true). " ][ matches :: " . var_export($matches, true) . " ]");
 
-	$uris  = $matches[1];
+	$uris = $matches[1];
 	// Collect the entities.
 	$entities = array();
-	foreach ( $uris as $uri ) {
-		$uri_d = html_entity_decode( $uri );
+	foreach ($uris as $uri) {
+		$uri_d = html_entity_decode($uri);
 
-		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $uri_d );
+		$entity = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri($uri_d);
 
-		if ( null !== $entity ) {
-			array_push( $entities, $entity->ID );
+		if (null !== $entity) {
+			array_push($entities, $entity->ID);
 		}
 	}
 

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

Indentation +45 added lines, -45 removed lines

@@ -13,62 +13,62 @@
  */
 class Wordlift_Debug_Service {
 
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.7.2
-	 * @access private
-	 * @var Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.7.2
+     * @access private
+     * @var Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
 
-	/**
-	 * A {@link Wordlift_Uri_Service} instance.
-	 *
-	 * @since  3.10.0
-	 * @access private
-	 * @var \Wordlift_Uri_Service $uri_service A {@link Wordlift_Uri_Service} instance.
-	 */
-	private $uri_service;
+    /**
+     * A {@link Wordlift_Uri_Service} instance.
+     *
+     * @since  3.10.0
+     * @access private
+     * @var \Wordlift_Uri_Service $uri_service A {@link Wordlift_Uri_Service} instance.
+     */
+    private $uri_service;
 
-	/**
-	 * Wordlift_Debug_Service constructor.
-	 *
-	 * @since 3.7.2
-	 *
-	 * @param Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 * @param \Wordlift_Uri_Service   $uri_service    A {@link Wordlift_Uri_Service} instance.
-	 */
-	public function __construct( $entity_service, $uri_service ) {
+    /**
+     * Wordlift_Debug_Service constructor.
+     *
+     * @since 3.7.2
+     *
+     * @param Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     * @param \Wordlift_Uri_Service   $uri_service    A {@link Wordlift_Uri_Service} instance.
+     */
+    public function __construct( $entity_service, $uri_service ) {
 
-		$this->entity_service = $entity_service;
-		$this->uri_service    = $uri_service;
+        $this->entity_service = $entity_service;
+        $this->uri_service    = $uri_service;
 
-		add_action( 'wp_ajax_wl_dump_uri', array( $this, 'dump_uri' ) );
+        add_action( 'wp_ajax_wl_dump_uri', array( $this, 'dump_uri' ) );
 
-	}
+    }
 
-	public function dump_uri() {
+    public function dump_uri() {
 
-		if ( ! isset( $_GET['id'] ) ) {
-			wp_send_json_error( 'id not set' );
-		}
+        if ( ! isset( $_GET['id'] ) ) {
+            wp_send_json_error( 'id not set' );
+        }
 
-		$post_id = (int) $_GET['id'];
+        $post_id = (int) $_GET['id'];
 
-		$post = get_post( $post_id );
+        $post = get_post( $post_id );
 
-		$uri       = $this->entity_service->get_uri( $post_id );
-		$build_uri = $this->uri_service->build_uri( $post->post_title, $post->post_type );
+        $uri       = $this->entity_service->get_uri( $post_id );
+        $build_uri = $this->uri_service->build_uri( $post->post_title, $post->post_type );
 
-		wp_send_json_success( array(
-			'uri'               => $uri,
-			'post_title'        => sprintf( '%s (%s)', $post->post_title, mb_detect_encoding( $post->post_title ) ),
-			'post_title_ascii'  => mb_convert_encoding( $post->post_title, 'ASCII' ),
-			'build_uri'         => $build_uri,
-			'build_uri_convert' => mb_convert_encoding( $build_uri, 'ASCII' ),
-		) );
+        wp_send_json_success( array(
+            'uri'               => $uri,
+            'post_title'        => sprintf( '%s (%s)', $post->post_title, mb_detect_encoding( $post->post_title ) ),
+            'post_title_ascii'  => mb_convert_encoding( $post->post_title, 'ASCII' ),
+            'build_uri'         => $build_uri,
+            'build_uri_convert' => mb_convert_encoding( $build_uri, 'ASCII' ),
+        ) );
 
-	}
+    }
 
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -39,35 +39,35 @@
 	 * @param Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 * @param \Wordlift_Uri_Service   $uri_service    A {@link Wordlift_Uri_Service} instance.
 	 */
-	public function __construct( $entity_service, $uri_service ) {
+	public function __construct($entity_service, $uri_service) {
 
 		$this->entity_service = $entity_service;
 		$this->uri_service    = $uri_service;
 
-		add_action( 'wp_ajax_wl_dump_uri', array( $this, 'dump_uri' ) );
+		add_action('wp_ajax_wl_dump_uri', array($this, 'dump_uri'));
 
 	}
 
 	public function dump_uri() {
 
-		if ( ! isset( $_GET['id'] ) ) {
-			wp_send_json_error( 'id not set' );
+		if ( ! isset($_GET['id'])) {
+			wp_send_json_error('id not set');
 		}
 
 		$post_id = (int) $_GET['id'];
 
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 
-		$uri       = $this->entity_service->get_uri( $post_id );
-		$build_uri = $this->uri_service->build_uri( $post->post_title, $post->post_type );
+		$uri       = $this->entity_service->get_uri($post_id);
+		$build_uri = $this->uri_service->build_uri($post->post_title, $post->post_type);
 
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'uri'               => $uri,
-			'post_title'        => sprintf( '%s (%s)', $post->post_title, mb_detect_encoding( $post->post_title ) ),
-			'post_title_ascii'  => mb_convert_encoding( $post->post_title, 'ASCII' ),
+			'post_title'        => sprintf('%s (%s)', $post->post_title, mb_detect_encoding($post->post_title)),
+			'post_title_ascii'  => mb_convert_encoding($post->post_title, 'ASCII'),
 			'build_uri'         => $build_uri,
-			'build_uri_convert' => mb_convert_encoding( $build_uri, 'ASCII' ),
-		) );
+			'build_uri_convert' => mb_convert_encoding($build_uri, 'ASCII'),
+		));
 
 	}
 

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

Indentation +362 added lines, -362 removed lines

@@ -16,367 +16,367 @@
  */
 class Wordlift_Timeline_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The number of words to use for the excerpt, set in the `to_json` function
-	 * and used by a filter.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var int $excerpt_length The number of words to use for the excerpt.
-	 */
-	private $excerpt_length;
-
-	/**
-	 * The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 */
-	private $entity_type_service;
-
-	/**
-	 * A singleton instance of the Timeline service (useful for unit tests).
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Timeline_Service instance.
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
-	 * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
-	 *
-	 * @since 3.1.0
-	 *
-	 */
-	public function __construct( $entity_service, $entity_type_service ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
-
-		$this->entity_service      = $entity_service;
-		$this->entity_type_service = $entity_type_service;
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Wordlift_Timeline_Service
-	 *
-	 * @return \Wordlift_Timeline_Service The singleton instance of the Wordlift_Timeline_Service.
-	 * @since 3.1.0
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Retrieve timeline events and output them in JSON.
-	 *
-	 * @since 3.1.0
-	 */
-	public function ajax_timeline() {
-
-		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
-
-		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
-
-	}
-
-	/**
-	 * Retrieve timeline events.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array of event posts.
-	 * @since 3.1.0
-	 *
-	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
-	 *
-	 */
-	public function get_events( $post_id = null ) {
-
-		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
-		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
-
-		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && $this->entity_service->is_entity( $post_id ) ) {
-			$ids[] = $post_id;
-		}
-
-		// If there's no entities, return an empty array right away.
-		if ( 0 === sizeof( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
-
-			return array();
-		}
-
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
-
-		$args = array(
-			'post__in'       => $ids,
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'meta_query'     => array(
-				'relation' => 'AND',
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_DATE_START,
-					'value'   => null,
-					'compare' => '!=',
-				),
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_DATE_END,
-					'value'   => null,
-					'compare' => '!=',
-				),
-			),
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => 'event',
-				),
-			),
-			'orderby'        => 'meta_value',
-			'order'          => 'DESC',
-			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
-		);
-
-		return get_posts( $args );
-	}
-
-	/**
-	 * Convert timeline events to JSON. This function sets the global post in order
-	 * to get an automatic excerpt. Since we're being called inside an AJAX request,
-	 * we're not taking care of restoring any previous post: there isn't any.
-	 *
-	 * @param array $posts An array of posts.
-	 *
-	 * @return array|string An array of timeline events or an empty string if no posts are provided.
-	 * @since 3.1.0
-	 *
-	 */
-	public function to_json( $posts ) {
-
-		// If there are no events, return empty JSON
-		if ( empty( $posts ) || is_null( $posts ) ) {
-			return '';
-		}
-
-		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
-
-		// The number of words for the excerpt (by default 55, as WordPress).
-		$this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
-
-		// Add a filter to remove the [...] after excerpts, since we're adding
-		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
-
-		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
-		$start_at_slide = 0;
-		$event_index    = - 1;
-		$now            = time();
-
-		// Prepare the timeline variable.
-		$timeline = array();
-
-		// Populate the arrays.
-		$timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
-
-			// Get the start and end dates.
-			$start_date = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) );
-			$end_date   = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) );
-
-			// Set the starting slide.
-			$event_index ++;
-			if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
-				$start_at_slide = $event_index;
-			}
-
-			// Load thumbnail
-			$thumbnail_id = get_post_thumbnail_id( $item->ID );
-			if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
-			     && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
-			) {
-
-				// Set the thumbnail URL.
-				if ( 'background' === $display_images_as ) {
-					$date['background'] = array( 'url' => $attachment[0] );
-					$date['media']      = array( 'thumbnail' => $attachment[0] );
-				} else {
-					$date['media'] = array(
-						'url'       => $attachment[0],
-						'thumbnail' => $attachment[0],
-					);
-				}
-			}
-
-			// Set the start/end dates by converting them to TimelineJS required format.
-			$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-			$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
-
-			setup_postdata( $GLOBALS['post'] = $item );
-
-			$more_link_text = sprintf(
-				'<span aria-label="%1$s">%2$s</span>',
-				sprintf(
-				/* translators: %s: Name of current post */
-					__( 'Continue reading %s' ),
-					the_title_attribute( array( 'echo' => false ) )
-				),
-				__( '(more&hellip;)' )
-			);
-
-			// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
-			$date['text'] = array(
-				'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
-			);
-
-			// If we have an excerpt, set it.
-			if ( 0 < $excerpt_length ) {
-				$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
-			}
-
-			return $date;
-
-		}, $posts );
-
-		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
-
-		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
-		return array(
-			'timeline'       => $timeline,
-			'start_at_slide' => $start_at_slide,
-		);
-	}
-
-	/**
-	 * This function filters {@link excerpt_more} by removing it, since we're
-	 * adding the 'read more' link. This filter is set by {@see to_json}.
-	 *
-	 * @param string $excerpt_more The excerpt more preset.
-	 *
-	 * @return string An empty string.
-	 * @since 3.7.0
-	 *
-	 */
-	public function excerpt_more( $excerpt_more ) {
-
-		return '';
-	}
-
-	/**
-	 * A filter for the excerpt length, set by the `to_json` function, to tailor
-	 * how many words to return according to the client setting.
-	 *
-	 * @param int $length The preset number of words.
-	 *
-	 * @return int The number of words for the preset.
-	 * @since 3.7.0
-	 *
-	 */
-	public function excerpt_length( $length ) {
-
-		return $this->excerpt_length;
-	}
-
-
-	/**
-	 * Convert the date to a date array.
-	 *
-	 * @param $value int A date value.
-	 *
-	 * @return array An array containing year, month and day values.
-	 * @since 3.7.0
-	 *
-	 */
-	public static function date( $value ) {
-
-		return array(
-			'year'  => (int) date( 'Y', $value ),
-			'month' => (int) date( 'm', $value ),
-			'day'   => (int) date( 'd', $value ),
-
-		);
-	}
-
-	/**
-	 * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
-	 * its specific function).
-	 *
-	 * @return array An array of post IDs.
-	 * @since 3.1.0
-	 *
-	 */
-	public function get_all_related_to_last_50_published_posts() {
-
-		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
-			'numberposts' => 50,
-			'fields'      => 'ids', //only get post IDs
-			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-			'tax_query'   => array(
-				'relation' => 'OR',
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'operator' => 'NOT EXISTS',
-				),
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => 'article',
-				),
-			),
-			'post_status' => 'publish',
-		) );
-
-		if ( empty( $latest_posts_ids ) ) {
-			// There are no posts.
-			return array();
-		}
-
-		// Collect entities related to latest posts
-		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
-				'status' => 'publish',
-			) ) );
-		}
-
-		return $entity_ids;
-	}
+    /**
+     * The Log service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The Entity service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The number of words to use for the excerpt, set in the `to_json` function
+     * and used by a filter.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var int $excerpt_length The number of words to use for the excerpt.
+     */
+    private $excerpt_length;
+
+    /**
+     * The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     */
+    private $entity_type_service;
+
+    /**
+     * A singleton instance of the Timeline service (useful for unit tests).
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Timeline_Service instance.
+     *
+     * @param \Wordlift_Entity_Service $entity_service The Entity service.
+     * @param \Wordlift_Entity_Type_Service $entity_type_service The {@link Wordlift_Entity_Type_Service} instance.
+     *
+     * @since 3.1.0
+     *
+     */
+    public function __construct( $entity_service, $entity_type_service ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+
+        $this->entity_service      = $entity_service;
+        $this->entity_type_service = $entity_type_service;
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Wordlift_Timeline_Service
+     *
+     * @return \Wordlift_Timeline_Service The singleton instance of the Wordlift_Timeline_Service.
+     * @since 3.1.0
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Retrieve timeline events and output them in JSON.
+     *
+     * @since 3.1.0
+     */
+    public function ajax_timeline() {
+
+        // Get the ID of the post who requested the timeline.
+        $post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+
+        // Get the events and transform them for the JSON response, then send them to the client.
+        wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+
+    }
+
+    /**
+     * Retrieve timeline events.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array of event posts.
+     * @since 3.1.0
+     *
+     * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
+     *
+     */
+    public function get_events( $post_id = null ) {
+
+        // Get the entity IDs either from the entities related to the specified post or from the last 50 published
+        // posts if no post has been specified.
+        $ids = ( is_numeric( $post_id )
+            ? wl_core_get_related_entity_ids( $post_id )
+            : $this->get_all_related_to_last_50_published_posts() );
+
+        // Add the post itself if it's an entity.
+        if ( is_numeric( $post_id ) && $this->entity_service->is_entity( $post_id ) ) {
+            $ids[] = $post_id;
+        }
+
+        // If there's no entities, return an empty array right away.
+        if ( 0 === sizeof( $ids ) ) {
+            $this->log->trace( "No events found [ post id :: $post_id ]" );
+
+            return array();
+        }
+
+        $this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+
+        $args = array(
+            'post__in'       => $ids,
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'meta_query'     => array(
+                'relation' => 'AND',
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_DATE_START,
+                    'value'   => null,
+                    'compare' => '!=',
+                ),
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_DATE_END,
+                    'value'   => null,
+                    'compare' => '!=',
+                ),
+            ),
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => 'event',
+                ),
+            ),
+            'orderby'        => 'meta_value',
+            'order'          => 'DESC',
+            'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
+        );
+
+        return get_posts( $args );
+    }
+
+    /**
+     * Convert timeline events to JSON. This function sets the global post in order
+     * to get an automatic excerpt. Since we're being called inside an AJAX request,
+     * we're not taking care of restoring any previous post: there isn't any.
+     *
+     * @param array $posts An array of posts.
+     *
+     * @return array|string An array of timeline events or an empty string if no posts are provided.
+     * @since 3.1.0
+     *
+     */
+    public function to_json( $posts ) {
+
+        // If there are no events, return empty JSON
+        if ( empty( $posts ) || is_null( $posts ) ) {
+            return '';
+        }
+
+        // {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
+        $display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
+
+        // The number of words for the excerpt (by default 55, as WordPress).
+        $this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
+        add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+
+        // Add a filter to remove the [...] after excerpts, since we're adding
+        // a link to the post itself.
+        add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
+
+        // Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
+        $start_at_slide = 0;
+        $event_index    = - 1;
+        $now            = time();
+
+        // Prepare the timeline variable.
+        $timeline = array();
+
+        // Populate the arrays.
+        $timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+
+            // Get the start and end dates.
+            $start_date = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) );
+            $end_date   = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) );
+
+            // Set the starting slide.
+            $event_index ++;
+            if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+                $start_at_slide = $event_index;
+            }
+
+            // Load thumbnail
+            $thumbnail_id = get_post_thumbnail_id( $item->ID );
+            if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
+                 && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+            ) {
+
+                // Set the thumbnail URL.
+                if ( 'background' === $display_images_as ) {
+                    $date['background'] = array( 'url' => $attachment[0] );
+                    $date['media']      = array( 'thumbnail' => $attachment[0] );
+                } else {
+                    $date['media'] = array(
+                        'url'       => $attachment[0],
+                        'thumbnail' => $attachment[0],
+                    );
+                }
+            }
+
+            // Set the start/end dates by converting them to TimelineJS required format.
+            $date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
+            $date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+
+            setup_postdata( $GLOBALS['post'] = $item );
+
+            $more_link_text = sprintf(
+                '<span aria-label="%1$s">%2$s</span>',
+                sprintf(
+                /* translators: %s: Name of current post */
+                    __( 'Continue reading %s' ),
+                    the_title_attribute( array( 'echo' => false ) )
+                ),
+                __( '(more&hellip;)' )
+            );
+
+            // Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
+            $date['text'] = array(
+                'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+            );
+
+            // If we have an excerpt, set it.
+            if ( 0 < $excerpt_length ) {
+                $date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+            }
+
+            return $date;
+
+        }, $posts );
+
+        // Finally remove the excerpt filter.
+        remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+
+        // The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
+        return array(
+            'timeline'       => $timeline,
+            'start_at_slide' => $start_at_slide,
+        );
+    }
+
+    /**
+     * This function filters {@link excerpt_more} by removing it, since we're
+     * adding the 'read more' link. This filter is set by {@see to_json}.
+     *
+     * @param string $excerpt_more The excerpt more preset.
+     *
+     * @return string An empty string.
+     * @since 3.7.0
+     *
+     */
+    public function excerpt_more( $excerpt_more ) {
+
+        return '';
+    }
+
+    /**
+     * A filter for the excerpt length, set by the `to_json` function, to tailor
+     * how many words to return according to the client setting.
+     *
+     * @param int $length The preset number of words.
+     *
+     * @return int The number of words for the preset.
+     * @since 3.7.0
+     *
+     */
+    public function excerpt_length( $length ) {
+
+        return $this->excerpt_length;
+    }
+
+
+    /**
+     * Convert the date to a date array.
+     *
+     * @param $value int A date value.
+     *
+     * @return array An array containing year, month and day values.
+     * @since 3.7.0
+     *
+     */
+    public static function date( $value ) {
+
+        return array(
+            'year'  => (int) date( 'Y', $value ),
+            'month' => (int) date( 'm', $value ),
+            'day'   => (int) date( 'd', $value ),
+
+        );
+    }
+
+    /**
+     * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
+     * its specific function).
+     *
+     * @return array An array of post IDs.
+     * @since 3.1.0
+     *
+     */
+    public function get_all_related_to_last_50_published_posts() {
+
+        // Global timeline. Get entities from the latest posts.
+        $latest_posts_ids = get_posts( array(
+            'numberposts' => 50,
+            'fields'      => 'ids', //only get post IDs
+            'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+            'tax_query'   => array(
+                'relation' => 'OR',
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'operator' => 'NOT EXISTS',
+                ),
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => 'article',
+                ),
+            ),
+            'post_status' => 'publish',
+        ) );
+
+        if ( empty( $latest_posts_ids ) ) {
+            // There are no posts.
+            return array();
+        }
+
+        // Collect entities related to latest posts
+        $entity_ids = array();
+        foreach ( $latest_posts_ids as $id ) {
+            $entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+                'status' => 'publish',
+            ) ) );
+        }
+
+        return $entity_ids;
+    }
 
 }

Spacing +54 added lines, -54 removed lines

@@ -71,9 +71,9 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function __construct( $entity_service, $entity_type_service ) {
+	public function __construct($entity_service, $entity_type_service) {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Service');
 
 		$this->entity_service      = $entity_service;
 		$this->entity_type_service = $entity_type_service;
@@ -102,10 +102,10 @@ 
 	public function ajax_timeline() {
 
 		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+		$post_id = (isset($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : null);
 
 		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+		wp_send_json($this->to_json($this->get_events($post_id)));
 
 	}
 
@@ -120,33 +120,33 @@ 
 	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
 	 *
 	 */
-	public function get_events( $post_id = null ) {
+	public function get_events($post_id = null) {
 
 		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
 		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
+		$ids = (is_numeric($post_id)
+			? wl_core_get_related_entity_ids($post_id)
+			: $this->get_all_related_to_last_50_published_posts());
 
 		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && $this->entity_service->is_entity( $post_id ) ) {
+		if (is_numeric($post_id) && $this->entity_service->is_entity($post_id)) {
 			$ids[] = $post_id;
 		}
 
 		// If there's no entities, return an empty array right away.
-		if ( 0 === sizeof( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
+		if (0 === sizeof($ids)) {
+			$this->log->trace("No events found [ post id :: $post_id ]");
 
 			return array();
 		}
 
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+		$this->log->trace('Getting events [ entity ids :: '.join(', ', $ids).' ]');
 
 		$args = array(
 			'post__in'       => $ids,
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'meta_query'     => array(
 				'relation' => 'AND',
 				array(
@@ -172,7 +172,7 @@ 
 			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
 		);
 
-		return get_posts( $args );
+		return get_posts($args);
 	}
 
 	/**
@@ -186,23 +186,23 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function to_json( $posts ) {
+	public function to_json($posts) {
 
 		// If there are no events, return empty JSON
-		if ( empty( $posts ) || is_null( $posts ) ) {
+		if (empty($posts) || is_null($posts)) {
 			return '';
 		}
 
 		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
+		$display_images_as = isset($_REQUEST['display_images_as']) ? (string) $_REQUEST['display_images_as'] : 'media';
 
 		// The number of words for the excerpt (by default 55, as WordPress).
-		$this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		$this->excerpt_length = $excerpt_length = isset($_REQUEST['excerpt_length']) && is_numeric($_REQUEST['excerpt_length']) ? $_REQUEST['excerpt_length'] : 55;
+		add_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// Add a filter to remove the [...] after excerpts, since we're adding
 		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
+		add_filter('excerpt_more', array($this, 'excerpt_more'));
 
 		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
 		$start_at_slide = 0;
@@ -213,28 +213,28 @@ 
 		$timeline = array();
 
 		// Populate the arrays.
-		$timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+		$timeline['events'] = array_map(function($item) use (&$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length) {
 
 			// Get the start and end dates.
-			$start_date = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) );
-			$end_date   = strtotime( get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) );
+			$start_date = strtotime(get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true));
+			$end_date   = strtotime(get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true));
 
 			// Set the starting slide.
-			$event_index ++;
-			if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+			$event_index++;
+			if (0 === $start_at_slide && $now >= $start_date && $now <= $end_date) {
 				$start_at_slide = $event_index;
 			}
 
 			// Load thumbnail
-			$thumbnail_id = get_post_thumbnail_id( $item->ID );
-			if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
-			     && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+			$thumbnail_id = get_post_thumbnail_id($item->ID);
+			if ('' !== $thumbnail_id && 0 !== $thumbnail_id
+			     && false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 			) {
 
 				// Set the thumbnail URL.
-				if ( 'background' === $display_images_as ) {
-					$date['background'] = array( 'url' => $attachment[0] );
-					$date['media']      = array( 'thumbnail' => $attachment[0] );
+				if ('background' === $display_images_as) {
+					$date['background'] = array('url' => $attachment[0]);
+					$date['media']      = array('thumbnail' => $attachment[0]);
 				} else {
 					$date['media'] = array(
 						'url'       => $attachment[0],
@@ -244,37 +244,37 @@ 
 			}
 
 			// Set the start/end dates by converting them to TimelineJS required format.
-			$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-			$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+			$date['start_date'] = Wordlift_Timeline_Service::date($start_date);
+			$date['end_date']   = Wordlift_Timeline_Service::date($end_date);
 
-			setup_postdata( $GLOBALS['post'] = $item );
+			setup_postdata($GLOBALS['post'] = $item);
 
 			$more_link_text = sprintf(
 				'<span aria-label="%1$s">%2$s</span>',
 				sprintf(
 				/* translators: %s: Name of current post */
-					__( 'Continue reading %s' ),
-					the_title_attribute( array( 'echo' => false ) )
+					__('Continue reading %s'),
+					the_title_attribute(array('echo' => false))
 				),
-				__( '(more&hellip;)' )
+				__('(more&hellip;)')
 			);
 
 			// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
 			$date['text'] = array(
-				'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+				'headline' => '<a href="'.get_permalink($item->ID).'">'.$item->post_title.'</a>',
 			);
 
 			// If we have an excerpt, set it.
-			if ( 0 < $excerpt_length ) {
-				$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+			if (0 < $excerpt_length) {
+				$date['text']['text'] = sprintf('%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text);
 			}
 
 			return $date;
 
-		}, $posts );
+		}, $posts);
 
 		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		remove_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
 		return array(
@@ -293,7 +293,7 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function excerpt_more( $excerpt_more ) {
+	public function excerpt_more($excerpt_more) {
 
 		return '';
 	}
@@ -308,7 +308,7 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function excerpt_length( $length ) {
+	public function excerpt_length($length) {
 
 		return $this->excerpt_length;
 	}
@@ -323,12 +323,12 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public static function date( $value ) {
+	public static function date($value) {
 
 		return array(
-			'year'  => (int) date( 'Y', $value ),
-			'month' => (int) date( 'm', $value ),
-			'day'   => (int) date( 'd', $value ),
+			'year'  => (int) date('Y', $value),
+			'month' => (int) date('m', $value),
+			'day'   => (int) date('d', $value),
 
 		);
 	}
@@ -344,7 +344,7 @@ 
 	public function get_all_related_to_last_50_published_posts() {
 
 		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
+		$latest_posts_ids = get_posts(array(
 			'numberposts' => 50,
 			'fields'      => 'ids', //only get post IDs
 			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
@@ -361,19 +361,19 @@ 
 				),
 			),
 			'post_status' => 'publish',
-		) );
+		));
 
-		if ( empty( $latest_posts_ids ) ) {
+		if (empty($latest_posts_ids)) {
 			// There are no posts.
 			return array();
 		}
 
 		// Collect entities related to latest posts
 		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+		foreach ($latest_posts_ids as $id) {
+			$entity_ids = array_merge($entity_ids, wl_core_get_related_entity_ids($id, array(
 				'status' => 'publish',
-			) ) );
+			)));
 		}
 
 		return $entity_ids;