insideout10 / wordlift-plugin

src/admin/partials/wordlift-admin-settings-videoobject-settings-page.php

Spacing +29 added lines, -29 removed lines

@@ -4,8 +4,8 @@ 
 use Wordlift\Videoobject\Provider\Client\Youtube_Client;
 
 
-if ( isset( $_POST['wordlift_videoobject_youtube_api_key'] )
-     || isset( $_POST['wordlift_videoobject_vimeo_api_key'] ) ) {
+if (isset($_POST['wordlift_videoobject_youtube_api_key'])
+     || isset($_POST['wordlift_videoobject_vimeo_api_key'])) {
 
 	/**
 	 * @todo: does this fields need to be encrypted before saving ?
@@ -13,84 +13,84 @@ 
 	$youtube_api_key = (string) $_POST['wordlift_videoobject_youtube_api_key'];
 	$vimeo_api_key   = (string) $_POST['wordlift_videoobject_vimeo_api_key'];
 
-	if ( $youtube_api_key ) {
-		update_option( Youtube_Client::get_api_key_option_name(), $youtube_api_key );
+	if ($youtube_api_key) {
+		update_option(Youtube_Client::get_api_key_option_name(), $youtube_api_key);
 	}
 
-	if ( $vimeo_api_key ) {
-		update_option( Vimeo_Client::get_api_key_option_name(), $vimeo_api_key );
+	if ($vimeo_api_key) {
+		update_option(Vimeo_Client::get_api_key_option_name(), $vimeo_api_key);
 	}
 }
 
-if ( isset( $_POST['submit'] ) ) {
-	if ( isset( $_POST['wl_enable_video_sitemap'] ) ) {
-		update_option( "_wl_video_sitemap_generation", 1 );
+if (isset($_POST['submit'])) {
+	if (isset($_POST['wl_enable_video_sitemap'])) {
+		update_option("_wl_video_sitemap_generation", 1);
 		// flush the rewrite rules
 		flush_rewrite_rules();
 	} else {
-		update_option( "_wl_video_sitemap_generation", 0 );
+		update_option("_wl_video_sitemap_generation", 0);
 		// flush the rewrite rules
 		flush_rewrite_rules();
 	}
 }
 
 ?>
-<h1><?php _e( 'API Settings', 'wordlift' ); ?></h1>
-<p><?php _e( 'To let WordLift access metadata from YouTube or Vimeo you will need to add here your API Key.', 'wordlift' ); ?></p>
+<h1><?php _e('API Settings', 'wordlift'); ?></h1>
+<p><?php _e('To let WordLift access metadata from YouTube or Vimeo you will need to add here your API Key.', 'wordlift'); ?></p>
 <form method="post">
     <table>
         <tr>
             <td>
-				<?php _e( 'YouTube API Key', 'wordlift' ); ?>
+				<?php _e('YouTube API Key', 'wordlift'); ?>
             </td>
             <td>
 				<?php
 				$element = new Wordlift_Admin_Input_Element();
-				$element->render( array(
+				$element->render(array(
 					'id'    => 'wordlift_videoobject_youtube_api_key',
 					'name'  => 'wordlift_videoobject_youtube_api_key',
 					'value' => Youtube_Client::get_api_key()
-				) );
+				));
 				?>
             </td>
             <td>
-                <a href="https://developers.google.com/youtube/registering_an_application"><?php _e( 'Click here', 'wordlift' ); ?></a>
-				<?php _e( ' for instructions on getting your YouTube API Key', 'wordlift' ); ?>
+                <a href="https://developers.google.com/youtube/registering_an_application"><?php _e('Click here', 'wordlift'); ?></a>
+				<?php _e(' for instructions on getting your YouTube API Key', 'wordlift'); ?>
             </td>
         </tr>
 
         <tr>
             <td>
-				<?php _e( 'Vimeo API Key', 'wordlift' ); ?>
+				<?php _e('Vimeo API Key', 'wordlift'); ?>
             </td>
             <td>
 				<?php
 				$element = new Wordlift_Admin_Input_Element();
-				$element->render( array(
+				$element->render(array(
 					'id'    => 'wordlift_videoobject_vimeo_api_key',
 					'name'  => 'wordlift_videoobject_vimeo_api_key',
 					'value' => Vimeo_Client::get_api_key()
-				) );
+				));
 				?>
             </td>
             <td>
-                <a href="https://developer.vimeo.com/api/guides/start"><?php _e( 'Click here', 'wordlift' ); ?></a>
-				<?php _e( ' for instructions on getting your Vimeo API Key', 'wordlift' ); ?>
+                <a href="https://developer.vimeo.com/api/guides/start"><?php _e('Click here', 'wordlift'); ?></a>
+				<?php _e(' for instructions on getting your Vimeo API Key', 'wordlift'); ?>
             </td>
         </tr>
 
     </table>
-    <h1><?php _e( 'Video Sitemap', 'wordlift' ); ?></h1>
+    <h1><?php _e('Video Sitemap', 'wordlift'); ?></h1>
     <p>
-		<?php _e( 'The Video Sitemap works like any other XML Sitemap. Search engines will use it to display rich snippets in result pages.', 'wordlift'  ); ?>
+		<?php _e('The Video Sitemap works like any other XML Sitemap. Search engines will use it to display rich snippets in result pages.', 'wordlift'); ?>
     </p>
-	<?php $is_sitemap_enabled = get_option( '_wl_video_sitemap_generation', false ) ? 'checked' : '' ?>
-    <p> <?php _e( 'Enable Video Sitemap' ); ?>
+	<?php $is_sitemap_enabled = get_option('_wl_video_sitemap_generation', false) ? 'checked' : '' ?>
+    <p> <?php _e('Enable Video Sitemap'); ?>
         <input type="checkbox" name="wl_enable_video_sitemap" value="1" <?php echo $is_sitemap_enabled; ?> ></p>
     <p> <?php
-		if ( $is_sitemap_enabled ) {
-			$sitemap_link = get_home_url( null, 'wl-video-sitemap.xml' );
-			printf( __( 'Here is <a href="%s">link</a> to your Video Sitemap. Add it now, to Google Search Console.', 'wordlift' ), $sitemap_link );
+		if ($is_sitemap_enabled) {
+			$sitemap_link = get_home_url(null, 'wl-video-sitemap.xml');
+			printf(__('Here is <a href="%s">link</a> to your Video Sitemap. Add it now, to Google Search Console.', 'wordlift'), $sitemap_link);
 		}
 		?></p>
 

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/admin/class-wordlift-entity-type-settings.php

Indentation +202 added lines, -202 removed lines

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

Spacing +34 added lines, -34 removed lines

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

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/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +208 added lines, -208 removed lines

@@ -20,33 +20,33 @@ 
  */
 function wl_shortcode_faceted_search( $request ) {
 
-	// Create the cache key.
-	$cache_key = array(
-		'request_params' => $_GET,
-	);
+    // Create the cache key.
+    $cache_key = array(
+        'request_params' => $_GET,
+    );
 
-	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "faceted-search", 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( "faceted-search", 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' );
-		wl_core_send_json( $cache_results );
+    if ( isset( $cache_results ) ) {
+        header( 'X-WordLift-Cache: HIT' );
+        wl_core_send_json( $cache_results );
 
-		return;
-	}
+        return;
+    }
 
-	header( 'X-WordLift-Cache: MISS' );
+    header( 'X-WordLift-Cache: MISS' );
 
-	$results = wl_shortcode_faceted_search_origin( $request );
+    $results = wl_shortcode_faceted_search_origin( $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 );
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 
@@ -57,151 +57,151 @@ 
  * @since        3.26.0
  */
 function wl_shortcode_faceted_search_origin( $request ) {
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	$current_post_id = (int) $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
-	$faceted_id      = (string) $_GET['uniqid'];
-
-	$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 ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
-
-		return;
-	}
-
-	// If the current post is an entity,
-	// the current post is used as main entity.
-	// Otherwise, current post related entities are used.
-	$entity_service = Wordlift_Entity_Service::get_instance();
-
-	$entity_ids = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		$entity_service->get_related_entities( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		/**
-		 * If this function is not called from ajax
-		 * then this should not throw an error.
-		 * Note: Used in scripbox longtail project on json endpoint.
-		 */
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die( 'No entities available' );
-		}
-
-	}
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
-	$amp   = ( isset( $_GET['amp'] ) ) ? true : false;
-
-
-	/**
-	 * see https://github.com/insideout10/wordlift-plugin/issues/1181
-	 * The ordering should be descending by date on default.
-	 */
-	$order_by = 'DESC';
-	if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
-		$order_by = (string) $_GET['sort'];
-	}
-
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit,
-		null,
-		$order_by,
-		$post_types
-	);
-
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-
-	$post_results   = array();
-	$entity_results = array();
-
-	// Populate $post_results
-
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-			'*',
-			null,
-			null,
-			array(),
-			null,
-			$referencing_post_ids
-		);
-
-	if ( $filtered_posts ) {
-		foreach ( $filtered_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->permalink  = get_permalink( $post_obj->ID );
-			$post_obj->srcset     = Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
-			$post_obj->post_title = strip_tags( html_entity_decode( $post_obj->post_title, ENT_QUOTES, 'UTF-8' ) );
-			$result               = $post_obj;
-			$post_results[]       = $result;
-		}
-	}
-
-	// Add filler posts if needed
-
-	$filler_count = $limit - count( $post_results );
-	if ( 0 < apply_filters( 'wl_faceted_search__filler_count', $filler_count, $current_post_id, $referencing_post_ids ) ) {
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
-
-		$post_results = array_merge( $post_results, $filler_posts );
-	}
-	$referencing_post_ids = array_map( function ( $post ) {
-		return $post->ID;
-	}, $post_results );
-
-	// Populate $entity_results
-
-	global $wpdb;
-
-	// Retrieve Wordlift relation instances table name.
-	$table_name = wl_core_get_relation_instances_table_name();
-
-	/*
+    // Post ID must be defined.
+    if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
+        wp_die( 'No post_id given' );
+
+        return;
+    }
+
+    $current_post_id = (int) $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
+    $faceted_id      = (string) $_GET['uniqid'];
+
+    $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 ID has to match an existing item.
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
+
+        return;
+    }
+
+    // If the current post is an entity,
+    // the current post is used as main entity.
+    // Otherwise, current post related entities are used.
+    $entity_service = Wordlift_Entity_Service::get_instance();
+
+    $entity_ids = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        $entity_service->get_related_entities( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        /**
+         * If this function is not called from ajax
+         * then this should not throw an error.
+         * Note: Used in scripbox longtail project on json endpoint.
+         */
+        if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+            wp_die( 'No entities available' );
+        }
+
+    }
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
+    $amp   = ( isset( $_GET['amp'] ) ) ? true : false;
+
+
+    /**
+     * see https://github.com/insideout10/wordlift-plugin/issues/1181
+     * The ordering should be descending by date on default.
+     */
+    $order_by = 'DESC';
+    if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
+        $order_by = (string) $_GET['sort'];
+    }
+
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit,
+        null,
+        $order_by,
+        $post_types
+    );
+
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+
+    $post_results   = array();
+    $entity_results = array();
+
+    // Populate $post_results
+
+    $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+        $referencing_posts :
+        Wordlift_Relation_Service::get_instance()->get_article_subjects(
+            wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+            '*',
+            null,
+            null,
+            array(),
+            null,
+            $referencing_post_ids
+        );
+
+    if ( $filtered_posts ) {
+        foreach ( $filtered_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->permalink  = get_permalink( $post_obj->ID );
+            $post_obj->srcset     = Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+            $post_obj->post_title = strip_tags( html_entity_decode( $post_obj->post_title, ENT_QUOTES, 'UTF-8' ) );
+            $result               = $post_obj;
+            $post_results[]       = $result;
+        }
+    }
+
+    // Add filler posts if needed
+
+    $filler_count = $limit - count( $post_results );
+    if ( 0 < apply_filters( 'wl_faceted_search__filler_count', $filler_count, $current_post_id, $referencing_post_ids ) ) {
+        $filler_posts_util       = new Filler_Posts_Util( $current_post_id );
+        $post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
+        $filler_posts            = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+
+        $post_results = array_merge( $post_results, $filler_posts );
+    }
+    $referencing_post_ids = array_map( function ( $post ) {
+        return $post->ID;
+    }, $post_results );
+
+    // Populate $entity_results
+
+    global $wpdb;
+
+    // Retrieve Wordlift relation instances table name.
+    $table_name = wl_core_get_relation_instances_table_name();
+
+    /*
 	 * Make sure we have some referenced post, otherwise the IN parts of
 	 * the SQL will produce an SQL error.
 	 */
-	if ( ! empty( $referencing_post_ids ) ) {
-		$subject_ids = implode( ',', $referencing_post_ids );
+    if ( ! empty( $referencing_post_ids ) ) {
+        $subject_ids = implode( ',', $referencing_post_ids );
 
-		$query = "
+        $query = "
 				SELECT
 					object_id AS ID,
 					count( object_id ) AS counter
@@ -213,68 +213,68 @@ 
 				LIMIT $limit;
 			";
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
 
-		$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+        $entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
 
-		wl_write_log( 'Entities found ' . count( $entities ) );
+        wl_write_log( 'Entities found ' . count( $entities ) );
 
-		foreach ( $entities as $obj ) {
+        foreach ( $entities as $obj ) {
 
-			$entity = get_post( $obj->ID );
+            $entity = get_post( $obj->ID );
 
-			// Ensure only valid and published entities are returned.
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+            // Ensure only valid and published entities are returned.
+            if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
 
-				$serialized_entity                    = wl_serialize_entity( $entity );
-				$serialized_entity['label']           = html_entity_decode( wl_shortcode_faceted_search_get_the_title( $obj->ID ), ENT_QUOTES, 'UTF-8' );
-				$serialized_entity['counter']         = $obj->counter;
-				$serialized_entity['createdAt']       = $entity->post_date;
-				$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-					$obj->ID,
-					'ids',
-					null,
-					null,
-					array(),
-					null,
-					$referencing_post_ids
-				);
-				$entity_results[]                     = $serialized_entity;
-			}
-		}
-	}
+                $serialized_entity                    = wl_serialize_entity( $entity );
+                $serialized_entity['label']           = html_entity_decode( wl_shortcode_faceted_search_get_the_title( $obj->ID ), ENT_QUOTES, 'UTF-8' );
+                $serialized_entity['counter']         = $obj->counter;
+                $serialized_entity['createdAt']       = $entity->post_date;
+                $serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+                    $obj->ID,
+                    'ids',
+                    null,
+                    null,
+                    array(),
+                    null,
+                    $referencing_post_ids
+                );
+                $entity_results[]                     = $serialized_entity;
+            }
+        }
+    }
 
-	$post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
+    $post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
 
-	// Add srcset attribute.
-	$post_results = array_map( function ( $post ) {
-		$post->srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+    // Add srcset attribute.
+    $post_results = array_map( function ( $post ) {
+        $post->srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
 
-		return $post;
-	}, $post_results );
+        return $post;
+    }, $post_results );
 
-	$entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
+    $entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
 
-	return array(
-		'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
-		'entities' => $entity_results
-	);
+    return array(
+        'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
+        'entities' => $entity_results
+    );
 
 }
 
 function wl_shortcode_faceted_search_get_the_title( $post_id ) {
 
-	$title = strip_tags( get_the_title( $post_id ) );
+    $title = strip_tags( get_the_title( $post_id ) );
 
-	if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+    if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
+        $alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
 
-		if ( count( $alternative_labels ) > 0 ) {
-			$title = $alternative_labels[0];
-		}
-	}
+        if ( count( $alternative_labels ) > 0 ) {
+            $title = $alternative_labels[0];
+        }
+    }
 
-	return remove_accents( $title );
+    return remove_accents( $title );
 
 }
 
@@ -282,9 +282,9 @@ 
  * Adding `rest_api_init` action for network faceted-search
  */
 add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
-		'methods'             => 'GET',
-		'callback'            => 'wl_shortcode_faceted_search',
-		'permission_callback' => '__return_true',
-	) );
+    register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+        'methods'             => 'GET',
+        'callback'            => 'wl_shortcode_faceted_search',
+        'permission_callback' => '__return_true',
+    ) );
 } );

Spacing +75 added lines, -77 removed lines

@@ -18,7 +18,7 @@ 
  * @since 3.21.4 fix the cache key by also using the request body.
  * @since 3.21.2 add a caching layer.
  */
-function wl_shortcode_faceted_search( $request ) {
+function wl_shortcode_faceted_search($request) {
 
 	// Create the cache key.
 	$cache_key = array(
@@ -26,27 +26,27 @@ 
 	);
 
 	// Create the TTL cache and try to get the results.
-	$cache         = new Ttl_Cache( "faceted-search", 8 * 60 * 60 ); // 8 hours.
-	$cache_results = $cache->get( $cache_key );
+	$cache         = new Ttl_Cache("faceted-search", 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' );
-		wl_core_send_json( $cache_results );
+	if (isset($cache_results)) {
+		header('X-WordLift-Cache: HIT');
+		wl_core_send_json($cache_results);
 
 		return;
 	}
 
-	header( 'X-WordLift-Cache: MISS' );
+	header('X-WordLift-Cache: MISS');
 
-	$results = wl_shortcode_faceted_search_origin( $request );
+	$results = wl_shortcode_faceted_search_origin($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);
 
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
@@ -56,27 +56,27 @@ 
  * @return array $results
  * @since        3.26.0
  */
-function wl_shortcode_faceted_search_origin( $request ) {
+function wl_shortcode_faceted_search_origin($request) {
 	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) { // WPCS: input var ok; CSRF ok.
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	$current_post_id = (int) $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 	$faceted_id      = (string) $_GET['uniqid'];
 
-	$post_types          = isset( $_GET['post_types'] ) ? (string) $_GET['post_types'] : '';
-	$post_types          = explode( ',', $post_types );
+	$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));
 
 
 	// Post ID has to match an existing item.
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+	if (null === $current_post) {
+		wp_die('No valid post_id given');
 
 		return;
 	}
@@ -86,25 +86,24 @@ 
 	// Otherwise, current post related entities are used.
 	$entity_service = Wordlift_Entity_Service::get_instance();
 
-	$entity_ids = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		$entity_service->get_related_entities( $current_post->ID );
+	$entity_ids = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : $entity_service->get_related_entities($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		/**
 		 * If this function is not called from ajax
 		 * then this should not throw an error.
 		 * Note: Used in scripbox longtail project on json endpoint.
 		 */
-		if ( apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-			wp_die( 'No entities available' );
+		if (apply_filters('wp_doing_ajax', defined('DOING_AJAX') && DOING_AJAX)) {
+			wp_die('No entities available');
 		}
 
 	}
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 4;  // WPCS: input var ok; CSRF ok.
-	$amp   = ( isset( $_GET['amp'] ) ) ? true : false;
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 4; // WPCS: input var ok; CSRF ok.
+	$amp   = (isset($_GET['amp'])) ? true : false;
 
 
 	/**
@@ -112,7 +111,7 @@ 
 	 * The ordering should be descending by date on default.
 	 */
 	$order_by = 'DESC';
-	if ( isset( $_GET['sort'] ) && is_string( $_GET['sort'] ) ) {
+	if (isset($_GET['sort']) && is_string($_GET['sort'])) {
 		$order_by = (string) $_GET['sort'];
 	}
 
@@ -122,7 +121,7 @@ 
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit,
 		null,
 		$order_by,
@@ -130,19 +129,18 @@ 
 	);
 
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 
 	$post_results   = array();
 	$entity_results = array();
 
 	// Populate $post_results
 
-	$filtered_posts = ( empty( $filtering_entity_uris ) ) ?
-		$referencing_posts :
-		Wordlift_Relation_Service::get_instance()->get_article_subjects(
-			wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+	$filtered_posts = (empty($filtering_entity_uris)) ?
+		$referencing_posts : Wordlift_Relation_Service::get_instance()->get_article_subjects(
+			wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 			'*',
 			null,
 			null,
@@ -151,8 +149,8 @@ 
 			$referencing_post_ids
 		);
 
-	if ( $filtered_posts ) {
-		foreach ( $filtered_posts as $post_obj ) {
+	if ($filtered_posts) {
+		foreach ($filtered_posts as $post_obj) {
 
 			/**
 			 * Use the thumbnail.
@@ -162,12 +160,12 @@ 
 			 *
 			 * @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            = get_the_post_thumbnail_url($post_obj, 'medium');
+			$post_obj->thumbnail  = ($thumbnail) ?
 				$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink  = get_permalink( $post_obj->ID );
-			$post_obj->srcset     = Srcset_Util::get_srcset( $post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
-			$post_obj->post_title = strip_tags( html_entity_decode( $post_obj->post_title, ENT_QUOTES, 'UTF-8' ) );
+			$post_obj->permalink  = get_permalink($post_obj->ID);
+			$post_obj->srcset     = Srcset_Util::get_srcset($post_obj->ID, Srcset_Util::FACETED_SEARCH_WIDGET);
+			$post_obj->post_title = strip_tags(html_entity_decode($post_obj->post_title, ENT_QUOTES, 'UTF-8'));
 			$result               = $post_obj;
 			$post_results[]       = $result;
 		}
@@ -175,17 +173,17 @@ 
 
 	// Add filler posts if needed
 
-	$filler_count = $limit - count( $post_results );
-	if ( 0 < apply_filters( 'wl_faceted_search__filler_count', $filler_count, $current_post_id, $referencing_post_ids ) ) {
-		$filler_posts_util       = new Filler_Posts_Util( $current_post_id );
-		$post_ids_to_be_excluded = array_merge( array( $current_post_id ), $referencing_post_ids );
-		$filler_posts            = $filler_posts_util->get_filler_posts( $filler_count, $post_ids_to_be_excluded );
+	$filler_count = $limit - count($post_results);
+	if (0 < apply_filters('wl_faceted_search__filler_count', $filler_count, $current_post_id, $referencing_post_ids)) {
+		$filler_posts_util       = new Filler_Posts_Util($current_post_id);
+		$post_ids_to_be_excluded = array_merge(array($current_post_id), $referencing_post_ids);
+		$filler_posts            = $filler_posts_util->get_filler_posts($filler_count, $post_ids_to_be_excluded);
 
-		$post_results = array_merge( $post_results, $filler_posts );
+		$post_results = array_merge($post_results, $filler_posts);
 	}
-	$referencing_post_ids = array_map( function ( $post ) {
+	$referencing_post_ids = array_map(function($post) {
 		return $post->ID;
-	}, $post_results );
+	}, $post_results);
 
 	// Populate $entity_results
 
@@ -198,8 +196,8 @@ 
 	 * Make sure we have some referenced post, otherwise the IN parts of
 	 * the SQL will produce an SQL error.
 	 */
-	if ( ! empty( $referencing_post_ids ) ) {
-		$subject_ids = implode( ',', $referencing_post_ids );
+	if ( ! empty($referencing_post_ids)) {
+		$subject_ids = implode(',', $referencing_post_ids);
 
 		$query = "
 				SELECT
@@ -213,21 +211,21 @@ 
 				LIMIT $limit;
 			";
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ] [ query :: $query ]");
 
-		$entities = $wpdb->get_results( $query, OBJECT ); // No cache ok.
+		$entities = $wpdb->get_results($query, OBJECT); // No cache ok.
 
-		wl_write_log( 'Entities found ' . count( $entities ) );
+		wl_write_log('Entities found '.count($entities));
 
-		foreach ( $entities as $obj ) {
+		foreach ($entities as $obj) {
 
-			$entity = get_post( $obj->ID );
+			$entity = get_post($obj->ID);
 
 			// Ensure only valid and published entities are returned.
-			if ( ( null !== $entity ) && ( 'publish' === $entity->post_status ) ) {
+			if ((null !== $entity) && ('publish' === $entity->post_status)) {
 
-				$serialized_entity                    = wl_serialize_entity( $entity );
-				$serialized_entity['label']           = html_entity_decode( wl_shortcode_faceted_search_get_the_title( $obj->ID ), ENT_QUOTES, 'UTF-8' );
+				$serialized_entity                    = wl_serialize_entity($entity);
+				$serialized_entity['label']           = html_entity_decode(wl_shortcode_faceted_search_get_the_title($obj->ID), ENT_QUOTES, 'UTF-8');
 				$serialized_entity['counter']         = $obj->counter;
 				$serialized_entity['createdAt']       = $entity->post_date;
 				$serialized_entity['referencedPosts'] = Wordlift_Relation_Service::get_instance()->get_article_subjects(
@@ -239,52 +237,52 @@ 
 					null,
 					$referencing_post_ids
 				);
-				$entity_results[]                     = $serialized_entity;
+				$entity_results[] = $serialized_entity;
 			}
 		}
 	}
 
-	$post_results = apply_filters( 'wl_faceted_data_posts', $post_results, $faceted_id );
+	$post_results = apply_filters('wl_faceted_data_posts', $post_results, $faceted_id);
 
 	// Add srcset attribute.
-	$post_results = array_map( function ( $post ) {
-		$post->srcset = Srcset_Util::get_srcset( $post->ID, Srcset_Util::FACETED_SEARCH_WIDGET );
+	$post_results = array_map(function($post) {
+		$post->srcset = Srcset_Util::get_srcset($post->ID, Srcset_Util::FACETED_SEARCH_WIDGET);
 
 		return $post;
-	}, $post_results );
+	}, $post_results);
 
-	$entity_results = apply_filters( 'wl_faceted_data_entities', $entity_results, $faceted_id );
+	$entity_results = apply_filters('wl_faceted_data_entities', $entity_results, $faceted_id);
 
 	return array(
-		'posts'    => $amp ? array( array( 'values' => $post_results ) ) : $post_results,
+		'posts'    => $amp ? array(array('values' => $post_results)) : $post_results,
 		'entities' => $entity_results
 	);
 
 }
 
-function wl_shortcode_faceted_search_get_the_title( $post_id ) {
+function wl_shortcode_faceted_search_get_the_title($post_id) {
 
-	$title = strip_tags( get_the_title( $post_id ) );
+	$title = strip_tags(get_the_title($post_id));
 
-	if ( get_post_type( $post_id ) !== Wordlift_Entity_Service::TYPE_NAME ) {
-		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels( $post_id );
+	if (get_post_type($post_id) !== Wordlift_Entity_Service::TYPE_NAME) {
+		$alternative_labels = Wordlift_Entity_Service::get_instance()->get_alternative_labels($post_id);
 
-		if ( count( $alternative_labels ) > 0 ) {
+		if (count($alternative_labels) > 0) {
 			$title = $alternative_labels[0];
 		}
 	}
 
-	return remove_accents( $title );
+	return remove_accents($title);
 
 }
 
 /**
  * Adding `rest_api_init` action for network faceted-search
  */
-add_action( 'rest_api_init', function () {
-	register_rest_route( WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
+add_action('rest_api_init', function() {
+	register_rest_route(WL_REST_ROUTE_DEFAULT_NAMESPACE, '/faceted-search', array(
 		'methods'             => 'GET',
 		'callback'            => 'wl_shortcode_faceted_search',
 		'permission_callback' => '__return_true',
-	) );
+	));
 } );

src/shortcodes/wordlift_shortcode_chord.php

Indentation +137 added lines, -137 removed lines

@@ -15,45 +15,45 @@ 
  * @return mixed
  */
 function wl_shortcode_chord_most_referenced_entity_id() {
-	// Get the last 20 articles by post date.
-	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
-		'numberposts' => 20,
-		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-		'fields'      => 'ids', // Only get post IDs.
-		'post_status' => 'publish',
-		'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',
-			),
-		),
-		'orderby'     => 'post_date',
-		'order'       => 'DESC',
-	) );
-
-	if ( empty( $post_ids ) ) {
-		return null;
-	}
-
-	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
-	}
-
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
-	} else {
-		return $post_ids[0];
-	}
+    // Get the last 20 articles by post date.
+    // For each article get the entities they reference.
+    $post_ids = get_posts( array(
+        'numberposts' => 20,
+        'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+        'fields'      => 'ids', // Only get post IDs.
+        'post_status' => 'publish',
+        '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',
+            ),
+        ),
+        'orderby'     => 'post_date',
+        'order'       => 'DESC',
+    ) );
+
+    if ( empty( $post_ids ) ) {
+        return null;
+    }
+
+    $entities = array();
+    foreach ( $post_ids as $id ) {
+        $entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+    }
+
+    $famous_entities = array_count_values( $entities );
+    arsort( $famous_entities );
+    if ( sizeof( $famous_entities ) >= 1 ) {
+        return key( $famous_entities );
+    } else {
+        return $post_ids[0];
+    }
 
 }
 
@@ -71,60 +71,60 @@ 
  */
 function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
-			return $related;
-		}
-	}
+    if ( ! is_null( $related ) ) {
+        if ( 0 === $depth ) {
+            return $related;
+        }
+    }
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+    wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
 
-	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
-		$related = array(
-			'entities'  => array( $entity_id ),
-			'relations' => array(),
-		);
-	}
+    // Create a related array which will hold entities and relations.
+    if ( is_null( $related ) ) {
+        $related = array(
+            'entities'  => array( $entity_id ),
+            'relations' => array(),
+        );
+    }
 
-	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
-		'status' => 'publish',
-	) );
+    // Get related entities
+    $related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+        'status' => 'publish',
+    ) );
 
-	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
-			'status' => 'publish',
-		) ) :
-		array();
+    // If the current node is an entity, add related posts too
+    $related_post_ids = ( Wordlift_Entity_Service::get_instance()
+                                                    ->is_entity( $entity_id ) ) ?
+        wl_core_get_related_post_ids( $entity_id, array(
+            'status' => 'publish',
+        ) ) :
+        array();
 
-	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+    // Merge results and remove duplicated entries
+    $related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
 
-	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+    // TODO: List of entities ($rel) should be ordered by interest factors.
+    shuffle( $related_ids );
 
-	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+    // Now we have all the related IDs.
+    foreach ( $related_ids as $related_id ) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
-			return $related;
-		}
+        if ( count( $related['entities'] ) >= $max_size ) {
+            return $related;
+        }
 
-		$related['relations'][] = array( $entity_id, $related_id );
+        $related['relations'][] = array( $entity_id, $related_id );
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
-			// Found new related entity!
-			$related['entities'][] = $related_id;
+        if ( ! in_array( $related_id, $related['entities'] ) ) {
+            // Found new related entity!
+            $related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
-		}
-	}
+            $related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+        }
+    }
 
-	// End condition 2: no more entities to search for.
-	return $related;
+    // End condition 2: no more entities to search for.
+    return $related;
 }
 
 /**
@@ -138,57 +138,57 @@ 
  */
 function wl_shortcode_chord_get_graph( $data ) {
 
-	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
-
-		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
-
-			return $item;
-		}
-
-		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
-
-		// The following log may create a circular loop.
-		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
-
-		// TODO: get all images
-		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
-			}
-		}
-
-		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
-			'label'      => $post->post_title,
-			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
-		);
-
-		$item = $entity;
-	} );
-
-	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
-		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
-		);
-
-		$item = $relation;
-	} );
-
-	// Return the JSON representation.
-	return $data;
+    // Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
+    array_walk( $data['entities'], function ( &$item ) {
+        $post = get_post( $item );
+
+        // Skip non-existing posts.
+        if ( is_null( $post ) ) {
+            wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+
+            return $item;
+        }
+
+        // Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
+        $term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+
+        // The following log may create a circular loop.
+        // wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
+
+        // TODO: get all images
+        $thumbnail    = null;
+        $thumbnail_id = get_post_thumbnail_id( $post->ID );
+        if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
+            $attachment = wp_get_attachment_image_src( $thumbnail_id );
+            if ( false !== $attachment ) {
+                $thumbnail = esc_attr( $attachment[0] );
+            }
+        }
+
+        $entity = array(
+            'uri'        => wl_get_entity_uri( $item ),
+            'url'        => get_permalink( $item ),
+            'label'      => $post->post_title,
+            'type'       => $post->post_type,
+            'thumbnails' => array( $thumbnail ),
+            'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+        );
+
+        $item = $entity;
+    } );
+
+    // Refactor the relations.
+    array_walk( $data['relations'], function ( &$item ) {
+        $relation = array(
+            's' => wl_get_entity_uri( $item[0] ),
+            'o' => wl_get_entity_uri( $item[1] ),
+        );
+
+        $item = $relation;
+    } );
+
+    // Return the JSON representation.
+    return $data;
 }
 
 /**
@@ -199,13 +199,13 @@ 
  */
 function wl_shortcode_chord_ajax() {
 
-	$post_id = (int) $_REQUEST['post_id'];
-	$depth   = (int) $_REQUEST['depth'];
+    $post_id = (int) $_REQUEST['post_id'];
+    $depth   = (int) $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+    $relations = wl_shortcode_chord_get_relations( $post_id, $depth );
+    $graph     = wl_shortcode_chord_get_graph( $relations );
 
-	wl_core_send_json( $graph );
+    wl_core_send_json( $graph );
 }
 
 add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );

Spacing +51 added lines, -52 removed lines

@@ -17,7 +17,7 @@ 
 function wl_shortcode_chord_most_referenced_entity_id() {
 	// Get the last 20 articles by post date.
 	// For each article get the entities they reference.
-	$post_ids = get_posts( array(
+	$post_ids = get_posts(array(
 		'numberposts' => 20,
 		'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
 		'fields'      => 'ids', // Only get post IDs.
@@ -36,21 +36,21 @@ 
 		),
 		'orderby'     => 'post_date',
 		'order'       => 'DESC',
-	) );
+	));
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		return null;
 	}
 
 	$entities = array();
-	foreach ( $post_ids as $id ) {
-		$entities = array_merge( $entities, wl_core_get_related_entity_ids( $id ) );
+	foreach ($post_ids as $id) {
+		$entities = array_merge($entities, wl_core_get_related_entity_ids($id));
 	}
 
-	$famous_entities = array_count_values( $entities );
-	arsort( $famous_entities );
-	if ( sizeof( $famous_entities ) >= 1 ) {
-		return key( $famous_entities );
+	$famous_entities = array_count_values($entities);
+	arsort($famous_entities);
+	if (sizeof($famous_entities) >= 1) {
+		return key($famous_entities);
 	} else {
 		return $post_ids[0];
 	}
@@ -69,57 +69,56 @@ 
  * @uses wl_core_get_related_post_ids() to get the list of post ids that reference an entity.
  *
  */
-function wl_shortcode_chord_get_relations( $entity_id, $depth = 2, $related = null, $max_size = 9 ) {
+function wl_shortcode_chord_get_relations($entity_id, $depth = 2, $related = null, $max_size = 9) {
 
-	if ( ! is_null( $related ) ) {
-		if ( 0 === $depth ) {
+	if ( ! is_null($related)) {
+		if (0 === $depth) {
 			return $related;
 		}
 	}
 
-	wl_write_log( "wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: " . ( is_null( $related ) ? 'yes' : 'no' ) . " ]" );
+	wl_write_log("wl_shortcode_chord_get_relations [ post id :: $entity_id ][ depth :: $depth ][ related? :: ".(is_null($related) ? 'yes' : 'no')." ]");
 
 	// Create a related array which will hold entities and relations.
-	if ( is_null( $related ) ) {
+	if (is_null($related)) {
 		$related = array(
-			'entities'  => array( $entity_id ),
+			'entities'  => array($entity_id),
 			'relations' => array(),
 		);
 	}
 
 	// Get related entities
-	$related_entity_ids = wl_core_get_related_entity_ids( $entity_id, array(
+	$related_entity_ids = wl_core_get_related_entity_ids($entity_id, array(
 		'status' => 'publish',
-	) );
+	));
 
 	// If the current node is an entity, add related posts too
-	$related_post_ids = ( Wordlift_Entity_Service::get_instance()
-	                                             ->is_entity( $entity_id ) ) ?
-		wl_core_get_related_post_ids( $entity_id, array(
+	$related_post_ids = (Wordlift_Entity_Service::get_instance()
+	                                             ->is_entity($entity_id)) ?
+		wl_core_get_related_post_ids($entity_id, array(
 			'status' => 'publish',
-		) ) :
-		array();
+		)) : array();
 
 	// Merge results and remove duplicated entries
-	$related_ids = array_unique( array_merge( $related_post_ids, $related_entity_ids ) );
+	$related_ids = array_unique(array_merge($related_post_ids, $related_entity_ids));
 
 	// TODO: List of entities ($rel) should be ordered by interest factors.
-	shuffle( $related_ids );
+	shuffle($related_ids);
 
 	// Now we have all the related IDs.
-	foreach ( $related_ids as $related_id ) {
+	foreach ($related_ids as $related_id) {
 
-		if ( count( $related['entities'] ) >= $max_size ) {
+		if (count($related['entities']) >= $max_size) {
 			return $related;
 		}
 
-		$related['relations'][] = array( $entity_id, $related_id );
+		$related['relations'][] = array($entity_id, $related_id);
 
-		if ( ! in_array( $related_id, $related['entities'] ) ) {
+		if ( ! in_array($related_id, $related['entities'])) {
 			// Found new related entity!
 			$related['entities'][] = $related_id;
 
-			$related = wl_shortcode_chord_get_relations( $related_id, ( $depth - 1 ), $related, $max_size );
+			$related = wl_shortcode_chord_get_relations($related_id, ($depth - 1), $related, $max_size);
 		}
 	}
 
@@ -136,52 +135,52 @@ 
  *
  * @return mixed|string
  */
-function wl_shortcode_chord_get_graph( $data ) {
+function wl_shortcode_chord_get_graph($data) {
 
 	// Refactor the entities array in order to provide entities relevant data (uri, url, label, type, css_class).
-	array_walk( $data['entities'], function ( &$item ) {
-		$post = get_post( $item );
+	array_walk($data['entities'], function(&$item) {
+		$post = get_post($item);
 
 		// Skip non-existing posts.
-		if ( is_null( $post ) ) {
-			wl_write_log( "wl_shortcode_chord_get_graph : post not found [ post id :: $item ]" );
+		if (is_null($post)) {
+			wl_write_log("wl_shortcode_chord_get_graph : post not found [ post id :: $item ]");
 
 			return $item;
 		}
 
 		// Get the entity taxonomy bound to this post (if there's no taxonomy, no stylesheet will be set).
-		$term = Wordlift_Entity_Type_Service::get_instance()->get( $item );
+		$term = Wordlift_Entity_Type_Service::get_instance()->get($item);
 
 		// The following log may create a circular loop.
 		// wl_write_log( "wl_shortcode_chord_get_graph [ post id :: $post->ID ][ term :: " . var_export( $term, true ) . " ]" );
 
 		// TODO: get all images
 		$thumbnail    = null;
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
-		if ( '' !== $thumbnail_id && 0 !== $thumbnail_id ) {
-			$attachment = wp_get_attachment_image_src( $thumbnail_id );
-			if ( false !== $attachment ) {
-				$thumbnail = esc_attr( $attachment[0] );
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
+		if ('' !== $thumbnail_id && 0 !== $thumbnail_id) {
+			$attachment = wp_get_attachment_image_src($thumbnail_id);
+			if (false !== $attachment) {
+				$thumbnail = esc_attr($attachment[0]);
 			}
 		}
 
 		$entity = array(
-			'uri'        => wl_get_entity_uri( $item ),
-			'url'        => get_permalink( $item ),
+			'uri'        => wl_get_entity_uri($item),
+			'url'        => get_permalink($item),
 			'label'      => $post->post_title,
 			'type'       => $post->post_type,
-			'thumbnails' => array( $thumbnail ),
-			'css_class'  => ( isset( $term['css_class'] ) ? $term['css_class'] : '' ),
+			'thumbnails' => array($thumbnail),
+			'css_class'  => (isset($term['css_class']) ? $term['css_class'] : ''),
 		);
 
 		$item = $entity;
 	} );
 
 	// Refactor the relations.
-	array_walk( $data['relations'], function ( &$item ) {
+	array_walk($data['relations'], function(&$item) {
 		$relation = array(
-			's' => wl_get_entity_uri( $item[0] ),
-			'o' => wl_get_entity_uri( $item[1] ),
+			's' => wl_get_entity_uri($item[0]),
+			'o' => wl_get_entity_uri($item[1]),
 		);
 
 		$item = $relation;
@@ -202,11 +201,11 @@ 
 	$post_id = (int) $_REQUEST['post_id'];
 	$depth   = (int) $_REQUEST['depth'];
 
-	$relations = wl_shortcode_chord_get_relations( $post_id, $depth );
-	$graph     = wl_shortcode_chord_get_graph( $relations );
+	$relations = wl_shortcode_chord_get_relations($post_id, $depth);
+	$graph     = wl_shortcode_chord_get_graph($relations);
 
-	wl_core_send_json( $graph );
+	wl_core_send_json($graph);
 }
 
-add_action( 'wp_ajax_wl_chord', 'wl_shortcode_chord_ajax' );
-add_action( 'wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax' );
+add_action('wp_ajax_wl_chord', 'wl_shortcode_chord_ajax');
+add_action('wp_ajax_nopriv_wl_chord', 'wl_shortcode_chord_ajax');