insideout10 / wordlift-plugin

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +191 added lines, -191 removed lines

@@ -14,77 +14,77 @@ 
  */
 function wl_shortcode_faceted_search( $atts ) {
 
-	// Extract attributes and set default values.
-	$shortcode_atts = shortcode_atts( array(
-		'title'          => __( 'Related articles', 'wordlift' ),
-		'show_facets'    => true,
-		'with_carousel'  => true,
-		'squared_thumbs' => false,
-		'limit'          => 20,
-
-	), $atts );
-
-	foreach (
-		array(
-			'show_facets',
-			'with_carousel',
-			'squared_thumbs',
-		) as $att
-	) {
-
-		// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode.
-		$shortcode_atts[ $att ] = filter_var(
-			$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
-		);
-	}
-
-	// If the current post is not an entity and has no related entities
-	// than the shortcode cannot be rendered
-	// TODO Add an alert visibile only for connected admin users.
-	$current_post = get_post();
-
-	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	// Bail if there are no entity ids.
-	if ( 0 === count( $entity_ids ) ) {
-		return '';
-	}
-
-	$div_id = 'wordlift-faceted-entity-search-widget';
-
-	$deps = apply_filters( 'wl_include_font_awesome', true )
-		? array( 'wordlift-font-awesome' )
-		: array();
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version() );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
-
-	wp_localize_script(
-		'wordlift-faceted-search',
-		'wl_faceted_search_params', array(
-			'ajax_url'             => admin_url( 'admin-ajax.php' ),
-			'action'               => 'wl_faceted_search',
-			'post_id'              => $current_post->ID,
-			'entity_ids'           => $entity_ids,
-			'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
-			'div_id'               => $div_id,
-			'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
-			'attrs'                => $shortcode_atts,
-			'l10n'                 => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
-			),
-		)
-	);
-
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+    // Extract attributes and set default values.
+    $shortcode_atts = shortcode_atts( array(
+        'title'          => __( 'Related articles', 'wordlift' ),
+        'show_facets'    => true,
+        'with_carousel'  => true,
+        'squared_thumbs' => false,
+        'limit'          => 20,
+
+    ), $atts );
+
+    foreach (
+        array(
+            'show_facets',
+            'with_carousel',
+            'squared_thumbs',
+        ) as $att
+    ) {
+
+        // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode.
+        $shortcode_atts[ $att ] = filter_var(
+            $shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+        );
+    }
+
+    // If the current post is not an entity and has no related entities
+    // than the shortcode cannot be rendered
+    // TODO Add an alert visibile only for connected admin users.
+    $current_post = get_post();
+
+    $entity_service = Wordlift_Entity_Service::get_instance();
+    $entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
+        array( $current_post->ID ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    // Bail if there are no entity ids.
+    if ( 0 === count( $entity_ids ) ) {
+        return '';
+    }
+
+    $div_id = 'wordlift-faceted-entity-search-widget';
+
+    $deps = apply_filters( 'wl_include_font_awesome', true )
+        ? array( 'wordlift-font-awesome' )
+        : array();
+    wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version() );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+    wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+
+    wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+
+    wp_localize_script(
+        'wordlift-faceted-search',
+        'wl_faceted_search_params', array(
+            'ajax_url'             => admin_url( 'admin-ajax.php' ),
+            'action'               => 'wl_faceted_search',
+            'post_id'              => $current_post->ID,
+            'entity_ids'           => $entity_ids,
+            'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+            'div_id'               => $div_id,
+            'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
+            'attrs'                => $shortcode_atts,
+            'l10n'                 => array(
+                'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
+                'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
+                'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
+                'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+            ),
+        )
+    );
+
+    return '<div id="' . $div_id . '" style="width:100%"></div>';
 }
 
 add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
@@ -95,114 +95,114 @@ 
  */
 function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
 
-	// Post ID must be defined.
-	if ( ! isset( $_GET['post_id'] ) ) { // WPCS: input var ok; CSRF ok.
-		wp_die( 'No post_id given' );
-
-		return;
-	}
-
-	// 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 );
-
-	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
-
-	// 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 ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
-
-		return;
-	}
-
-	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
-
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
-
-	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
-		$entity_ids,
-		'*',
-		null,
-		'publish',
-		array( $current_post_id ),
-		$limit
-	);
-
-	$referencing_post_ids = array_map( function ( $p ) {
-		return $p->ID;
-	}, $referencing_posts );
-	$results              = array();
-
-	if ( 'posts' === $required_type ) {
-
-		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
-
-		$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_post_permalink( $post_obj->ID );
-
-				$results[] = $post_obj;
-			}
-		}
-	} else {
-
-		global $wpdb;
-
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
-
-		// 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;
+    }
+
+    // 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 );
+
+    $current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
+    $current_post    = get_post( $current_post_id );
+
+    // 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 ) :
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    // If there are no entities we cannot render the widget.
+    if ( 0 === count( $entity_ids ) ) {
+        wp_die( 'No entities available' );
+
+        return;
+    }
+
+    // Retrieve requested type
+    $required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+
+    $limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+
+    $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
+        $entity_ids,
+        '*',
+        null,
+        'publish',
+        array( $current_post_id ),
+        $limit
+    );
+
+    $referencing_post_ids = array_map( function ( $p ) {
+        return $p->ID;
+    }, $referencing_posts );
+    $results              = array();
+
+    if ( 'posts' === $required_type ) {
+
+        // Required filtered posts.
+        wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+
+        $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_post_permalink( $post_obj->ID );
+
+                $results[] = $post_obj;
+            }
+        }
+    } else {
+
+        global $wpdb;
+
+        wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+
+        // 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
@@ -214,30 +214,30 @@ 
 				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['counter']   = $obj->counter;
-					$serialized_entity['createdAt'] = $entity->post_date;
+                    $serialized_entity              = wl_serialize_entity( $entity );
+                    $serialized_entity['counter']   = $obj->counter;
+                    $serialized_entity['createdAt'] = $entity->post_date;
 
-					$results[] = $serialized_entity;
-				}
-			}
-		}
-	}
+                    $results[] = $serialized_entity;
+                }
+            }
+        }
+    }
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 

Spacing +63 added lines, -66 removed lines

@@ -12,17 +12,17 @@ 
  *
  * @param array $atts Shortcode attributes.
  */
-function wl_shortcode_faceted_search( $atts ) {
+function wl_shortcode_faceted_search($atts) {
 
 	// Extract attributes and set default values.
-	$shortcode_atts = shortcode_atts( array(
-		'title'          => __( 'Related articles', 'wordlift' ),
+	$shortcode_atts = shortcode_atts(array(
+		'title'          => __('Related articles', 'wordlift'),
 		'show_facets'    => true,
 		'with_carousel'  => true,
 		'squared_thumbs' => false,
 		'limit'          => 20,
 
-	), $atts );
+	), $atts);
 
 	foreach (
 		array(
@@ -33,8 +33,8 @@ 
 	) {
 
 		// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode.
-		$shortcode_atts[ $att ] = filter_var(
-			$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+		$shortcode_atts[$att] = filter_var(
+			$shortcode_atts[$att], FILTER_VALIDATE_BOOLEAN
 		);
 	}
 
@@ -44,74 +44,73 @@ 
 	$current_post = get_post();
 
 	$entity_service = Wordlift_Entity_Service::get_instance();
-	$entity_ids     = $entity_service->is_entity( $current_post->ID ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// Bail if there are no entity ids.
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		return '';
 	}
 
 	$div_id = 'wordlift-faceted-entity-search-widget';
 
-	$deps = apply_filters( 'wl_include_font_awesome', true )
-		? array( 'wordlift-font-awesome' )
+	$deps = apply_filters('wl_include_font_awesome', true)
+		? array('wordlift-font-awesome')
 		: array();
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version() );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+	wp_enqueue_style('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-faceted-entity-search-widget.min.css', $deps, Wordlift::get_instance()->get_version());
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+	wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js');
 
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+	wp_enqueue_script('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-faceted-entity-search-widget.min.js');
 
 	wp_localize_script(
 		'wordlift-faceted-search',
 		'wl_faceted_search_params', array(
-			'ajax_url'             => admin_url( 'admin-ajax.php' ),
+			'ajax_url'             => admin_url('admin-ajax.php'),
 			'action'               => 'wl_faceted_search',
 			'post_id'              => $current_post->ID,
 			'entity_ids'           => $entity_ids,
-			'limit'                => apply_filters( 'wl_faceted_search_limit', $shortcode_atts['limit'] ),
+			'limit'                => apply_filters('wl_faceted_search_limit', $shortcode_atts['limit']),
 			'div_id'               => $div_id,
 			'defaultThumbnailPath' => WL_DEFAULT_THUMBNAIL_PATH,
 			'attrs'                => $shortcode_atts,
 			'l10n'                 => array(
-				'what'  => _x( 'What', 'Faceted Search Widget', 'wordlift' ),
-				'who'   => _x( 'Who', 'Faceted Search Widget', 'wordlift' ),
-				'where' => _x( 'Where', 'Faceted Search Widget', 'wordlift' ),
-				'when'  => _x( 'When', 'Faceted Search Widget', 'wordlift' ),
+				'what'  => _x('What', 'Faceted Search Widget', 'wordlift'),
+				'who'   => _x('Who', 'Faceted Search Widget', 'wordlift'),
+				'where' => _x('Where', 'Faceted Search Widget', 'wordlift'),
+				'when'  => _x('When', 'Faceted Search Widget', 'wordlift'),
 			),
 		)
 	);
 
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+	return '<div id="'.$div_id.'" style="width:100%"></div>';
 }
 
-add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
+add_shortcode('wl_faceted_search', 'wl_shortcode_faceted_search');
 
 
 /**
  * Ajax call for the faceted search widget
  */
-function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
+function wl_shortcode_faceted_search_ajax($http_raw_data = null) {
 
 	// 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;
 	}
 
 	// 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);
 
 	$current_post_id = $_GET['post_id']; // WPCS: input var ok; CSRF ok.
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// 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;
 	}
@@ -120,45 +119,43 @@ 
 	// 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 ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids     = $entity_service->is_entity($current_post->ID) ?
+		array($current_post->ID) : wl_core_get_related_entity_ids($current_post->ID);
 
 	// If there are no entities we cannot render the widget.
-	if ( 0 === count( $entity_ids ) ) {
-		wp_die( 'No entities available' );
+	if (0 === count($entity_ids)) {
+		wp_die('No entities available');
 
 		return;
 	}
 
 	// Retrieve requested type
-	$required_type = ( isset( $_GET['type'] ) ) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null; // WPCS: input var ok; CSRF ok.
 
-	$limit = ( isset( $_GET['limit'] ) ) ? (int) $_GET['limit'] : 20;  // WPCS: input var ok; CSRF ok.
+	$limit = (isset($_GET['limit'])) ? (int) $_GET['limit'] : 20; // WPCS: input var ok; CSRF ok.
 
 	$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects(
 		$entity_ids,
 		'*',
 		null,
 		'publish',
-		array( $current_post_id ),
+		array($current_post_id),
 		$limit
 	);
 
-	$referencing_post_ids = array_map( function ( $p ) {
+	$referencing_post_ids = array_map(function($p) {
 		return $p->ID;
-	}, $referencing_posts );
+	}, $referencing_posts);
 	$results              = array();
 
-	if ( 'posts' === $required_type ) {
+	if ('posts' === $required_type) {
 
 		// Required filtered posts.
-		wl_write_log( "Going to find related posts for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related posts for the current post [ post ID :: $current_post_id ]");
 
-		$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,
@@ -167,8 +164,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.
@@ -178,10 +175,10 @@ 
 				 *
 				 * @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_post_permalink( $post_obj->ID );
+				$post_obj->permalink = get_post_permalink($post_obj->ID);
 
 				$results[] = $post_obj;
 			}
@@ -190,7 +187,7 @@ 
 
 		global $wpdb;
 
-		wl_write_log( "Going to find related entities for the current post [ post ID :: $current_post_id ]" );
+		wl_write_log("Going to find related entities for the current post [ post ID :: $current_post_id ]");
 
 		// Retrieve Wordlift relation instances table name.
 		$table_name = wl_core_get_relation_instances_table_name();
@@ -199,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
@@ -214,20 +211,20 @@ 
 				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              = wl_serialize_entity($entity);
 					$serialized_entity['counter']   = $obj->counter;
 					$serialized_entity['createdAt'] = $entity->post_date;
 
@@ -237,9 +234,9 @@ 
 		}
 	}
 
-	wl_core_send_json( $results );
+	wl_core_send_json($results);
 
 }
 
-add_action( 'wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
-add_action( 'wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax' );
+add_action('wp_ajax_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');
+add_action('wp_ajax_nopriv_wl_faceted_search', 'wl_shortcode_faceted_search_ajax');

src/shortcodes/wordlift_shortcode_navigator.php

Indentation +83 added lines, -83 removed lines

@@ -14,102 +14,102 @@
  */
 function wl_shortcode_navigator_ajax() {
 
-	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+    // Post ID must be defined
+    if ( ! isset( $_GET['post_id'] ) ) {
+        wp_die( 'No post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+    $current_post_id = $_GET['post_id'];
+    $current_post    = get_post( $current_post_id );
 
-	// Post ID has to match an existing item
-	if ( null === $current_post ) {
-		wp_die( 'No valid post_id given' );
+    // Post ID has to match an existing item
+    if ( null === $current_post ) {
+        wp_die( 'No valid post_id given' );
 
-		return;
-	}
+        return;
+    }
 
-	// prepare structures to memorize other related posts
-	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
-	$related_entities = array();
+    // prepare structures to memorize other related posts
+    $results          = array();
+    $blacklist_ids    = array( $current_post_id );
+    $related_entities = array();
 
 
-	$relation_service = Wordlift_Relation_Service::get_instance();
+    $relation_service = Wordlift_Relation_Service::get_instance();
 
-	// Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN 
-	// TODO Replace with a single query if it is possible
-	// We select in inverse order to give priority to less used entities 
-	foreach (
-		array(
-			WL_WHEN_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-		) as $predicate
-	) {
+    // Get the related entities, ordering them by WHO, WHAT, WHERE, WHEN 
+    // TODO Replace with a single query if it is possible
+    // We select in inverse order to give priority to less used entities 
+    foreach (
+        array(
+            WL_WHEN_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+        ) as $predicate
+    ) {
 
-		$related_entities = array_merge( $related_entities,
-			$relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
+        $related_entities = array_merge( $related_entities,
+            $relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
 //			wl_core_get_related_entities( $current_post_id, array(
 //					'predicate' => $predicate,
 //					'status'    => 'publish',
 //				)
-		);
-
-	}
-
-	foreach ( $related_entities as $related_entity ) {
-
-		// take the id of posts referencing the entity
-		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
-
-		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
-
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
-
-				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
-
-				/**
-				 * 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' );
-
-				if ( $thumbnail ) {
-
-					$results[] = array(
-						'post'   => array(
-							'permalink' => get_post_permalink( $referencing_post->ID ),
-							'title'     => $referencing_post->post_title,
-							'thumbnail' => $thumbnail,
-						),
-						'entity' => array(
-							'label'     => $serialized_entity['label'],
-							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_post_permalink( $related_entity->ID ),
-						),
-					);
-
-					// Be sure no more than 1 post for entity is returned
-					break;
-				}
-			}
-		}
-	}
-
-	// Return first 4 results in json accordingly to 4 columns layout
-	wl_core_send_json(
-		array_slice( array_reverse( $results ), 0, 4 )
-	);
+        );
+
+    }
+
+    foreach ( $related_entities as $related_entity ) {
+
+        // take the id of posts referencing the entity
+        $referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
+
+        // loop over them and take the first one which is not already in the $related_posts
+        foreach ( $referencing_posts as $referencing_post ) {
+
+            if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+
+                $blacklist_ids[]   = $referencing_post->ID;
+                $serialized_entity = wl_serialize_entity( $related_entity );
+
+                /**
+                 * 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' );
+
+                if ( $thumbnail ) {
+
+                    $results[] = array(
+                        'post'   => array(
+                            'permalink' => get_post_permalink( $referencing_post->ID ),
+                            'title'     => $referencing_post->post_title,
+                            'thumbnail' => $thumbnail,
+                        ),
+                        'entity' => array(
+                            'label'     => $serialized_entity['label'],
+                            'mainType'  => $serialized_entity['mainType'],
+                            'permalink' => get_post_permalink( $related_entity->ID ),
+                        ),
+                    );
+
+                    // Be sure no more than 1 post for entity is returned
+                    break;
+                }
+            }
+        }
+    }
+
+    // Return first 4 results in json accordingly to 4 columns layout
+    wl_core_send_json(
+        array_slice( array_reverse( $results ), 0, 4 )
+    );
 }
 
 ///**

Spacing +20 added lines, -20 removed lines

@@ -15,25 +15,25 @@ 
 function wl_shortcode_navigator_ajax() {
 
 	// Post ID must be defined
-	if ( ! isset( $_GET['post_id'] ) ) {
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		wp_die('No post_id given');
 
 		return;
 	}
 
 	$current_post_id = $_GET['post_id'];
-	$current_post    = get_post( $current_post_id );
+	$current_post    = get_post($current_post_id);
 
 	// 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;
 	}
 
 	// prepare structures to memorize other related posts
 	$results          = array();
-	$blacklist_ids    = array( $current_post_id );
+	$blacklist_ids    = array($current_post_id);
 	$related_entities = array();
 
 
@@ -51,8 +51,8 @@ 
 		) as $predicate
 	) {
 
-		$related_entities = array_merge( $related_entities,
-			$relation_service->get_objects( $current_post_id, '*', $predicate, 'publish' )
+		$related_entities = array_merge($related_entities,
+			$relation_service->get_objects($current_post_id, '*', $predicate, 'publish')
 //			wl_core_get_related_entities( $current_post_id, array(
 //					'predicate' => $predicate,
 //					'status'    => 'publish',
@@ -61,18 +61,18 @@ 
 
 	}
 
-	foreach ( $related_entities as $related_entity ) {
+	foreach ($related_entities as $related_entity) {
 
 		// take the id of posts referencing the entity
-		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects( $related_entity->ID, '*', null, 'publish' );
+		$referencing_posts = Wordlift_Relation_Service::get_instance()->get_article_subjects($related_entity->ID, '*', null, 'publish');
 
 		// loop over them and take the first one which is not already in the $related_posts
-		foreach ( $referencing_posts as $referencing_post ) {
+		foreach ($referencing_posts as $referencing_post) {
 
-			if ( ! in_array( $referencing_post->ID, $blacklist_ids ) ) {
+			if ( ! in_array($referencing_post->ID, $blacklist_ids)) {
 
 				$blacklist_ids[]   = $referencing_post->ID;
-				$serialized_entity = wl_serialize_entity( $related_entity );
+				$serialized_entity = wl_serialize_entity($related_entity);
 
 				/**
 				 * Use the thumbnail.
@@ -82,20 +82,20 @@ 
 				 *
 				 * @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');
 
-				if ( $thumbnail ) {
+				if ($thumbnail) {
 
 					$results[] = array(
 						'post'   => array(
-							'permalink' => get_post_permalink( $referencing_post->ID ),
+							'permalink' => get_post_permalink($referencing_post->ID),
 							'title'     => $referencing_post->post_title,
 							'thumbnail' => $thumbnail,
 						),
 						'entity' => array(
 							'label'     => $serialized_entity['label'],
 							'mainType'  => $serialized_entity['mainType'],
-							'permalink' => get_post_permalink( $related_entity->ID ),
+							'permalink' => get_post_permalink($related_entity->ID),
 						),
 					);
 
@@ -108,7 +108,7 @@ 
 
 	// Return first 4 results in json accordingly to 4 columns layout
 	wl_core_send_json(
-		array_slice( array_reverse( $results ), 0, 4 )
+		array_slice(array_reverse($results), 0, 4)
 	);
 }
 
@@ -164,6 +164,6 @@ 
 //}
 
 //add_action( 'init', 'wordlift_register_shortcode_navigator' );
-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');
 

src/wordlift_constants.php

Spacing +24 added lines, -24 removed lines

@@ -6,61 +6,61 @@ 
  */
 
 // Define the basic options for HTTP calls to REDLINK.
-define( 'WL_REDLINK_API_HTTP_OPTIONS', serialize( array(
+define('WL_REDLINK_API_HTTP_OPTIONS', serialize(array(
 	'timeout'         => 300,
 	'redirection'     => 5,
 	'httpversion'     => '1.1',
 	'blocking'        => true,
 	'cookies'         => array(),
-	'sslverify'       => ( 'false' === getenv( 'WL_SSL_VERIFY_ENABLED' ) ) ? false : true,
-	'sslcertificates' => dirname( __FILE__ ) . '/ssl/ca-bundle.crt',
+	'sslverify'       => ('false' === getenv('WL_SSL_VERIFY_ENABLED')) ? false : true,
+	'sslcertificates' => dirname(__FILE__).'/ssl/ca-bundle.crt',
 	'decompress'      => false,
-) ) );
+)));
 
 // Create a unique ID for this request, useful to hook async HTTP requests.
-define( 'WL_REQUEST_ID', uniqid( true ) );
+define('WL_REQUEST_ID', uniqid(true));
 
 // Set the temporary files folder.
-defined( 'WL_TEMP_DIR' ) || define( 'WL_TEMP_DIR', wl_temp_dir() );
+defined('WL_TEMP_DIR') || define('WL_TEMP_DIR', wl_temp_dir());
 
-define( 'WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', wl_is_sparql_update_queries_buffering_enabled() );
+define('WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING', wl_is_sparql_update_queries_buffering_enabled());
 
 function wl_is_sparql_update_queries_buffering_enabled() {
 
-	if ( isset( $_REQUEST['wl-async'] ) && 'false' === $_REQUEST['wl-async'] ) {
+	if (isset($_REQUEST['wl-async']) && 'false' === $_REQUEST['wl-async']) {
 		return false;
 	}
 
-	return 'true' !== getenv( 'WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING' );
+	return 'true' !== getenv('WL_DISABLE_SPARQL_UPDATE_QUERIES_BUFFERING');
 }
 
 // Define the meta name used to store the entity URL.
-define( 'WL_ENTITY_URL_META_NAME', 'entity_url' );
+define('WL_ENTITY_URL_META_NAME', 'entity_url');
 
 // Max number of recursions when printing microdata.
-define( 'WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3 );
+define('WL_RECURSION_DEPTH_ON_ENTITY_METADATA_PRINTING', 3);
 
 // Use the WordLift API URL set on the command line.
-if ( ! defined( 'WORDLIFT_API_URL' ) && false !== getenv( 'WORDLIFT_API_URL' ) ) {
-	define( 'WORDLIFT_API_URL', getenv( 'WORDLIFT_API_URL' ) );
+if ( ! defined('WORDLIFT_API_URL') && false !== getenv('WORDLIFT_API_URL')) {
+	define('WORDLIFT_API_URL', getenv('WORDLIFT_API_URL'));
 }
 
 // 3.13.0, we use by default WLS 1.11 which provides us with the new, faster
 // chunked analysis.
-define( 'WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined( 'WORDLIFT_API_URL' ) ? WORDLIFT_API_URL . '/' : 'https://api.wordlift.it/' );
+define('WL_CONFIG_WORDLIFT_API_URL_DEFAULT_VALUE', defined('WORDLIFT_API_URL') ? WORDLIFT_API_URL . '/' : 'https://api.wordlift.it/');
 
-define( 'WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=' );
+define('WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL', 'https://developers.google.com/structured-data/testing-tool/?url=');
 
 // If is set to true, there will be additional button in 'Download Your Data' page
 // that will allow users to download their data in JSON-LD format.
-defined( 'WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA' ) || define( 'WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA', false );
+defined('WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA') || define('WL_CONFIG_DOWNLOAD_GA_CONTENT_DATA', false);
 
 /*
  * Define the default scope for autocomplete requests.
  *
  * @see https://github.com/insideout10/wordlift-plugin/issues/839
  */
-defined( 'WL_AUTOCOMPLETE_SCOPE' ) || define( 'WL_AUTOCOMPLETE_SCOPE', 'cloud' );
+defined('WL_AUTOCOMPLETE_SCOPE') || define('WL_AUTOCOMPLETE_SCOPE', 'cloud');
 
 /**
  * Get an array with commonly supported prefixes.
@@ -72,8 +72,8 @@ 
 	$items    = wl_prefixes_list();
 	$prefixes = array();
 
-	foreach ( $items as $item ) {
-		$prefixes[ $item['prefix'] ] = $item['namespace'];
+	foreach ($items as $item) {
+		$prefixes[$item['prefix']] = $item['namespace'];
 	}
 
 	return $prefixes;
@@ -93,13 +93,13 @@ 
  */
 function wl_temp_dir() {
 	$tempdir         = get_temp_dir();
-	$unique          = md5( site_url() . get_current_blog_id() );
-	$unique_temp_dir = $tempdir . 'wl_' . $unique; // $tempdir should have a trailing slash.
+	$unique          = md5(site_url().get_current_blog_id());
+	$unique_temp_dir = $tempdir.'wl_'.$unique; // $tempdir should have a trailing slash.
 
 	// If directory do not exist, create it.
-	if ( ! file_exists( $unique_temp_dir ) ) {
-		mkdir( $unique_temp_dir );
+	if ( ! file_exists($unique_temp_dir)) {
+		mkdir($unique_temp_dir);
 	}
 
-	return $unique_temp_dir . '/';
+	return $unique_temp_dir.'/';
 }

src/admin/class-wordlift-admin-post-edit-page.php

Indentation +95 added lines, -95 removed lines

@@ -18,100 +18,100 @@
  */
 class Wordlift_Admin_Post_Edit_Page {
 
-	/**
-	 * The {@link Wordlift} plugin instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	private $plugin;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
-	 */
-	function __construct( $plugin ) {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-
-		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
-
-			return;
-		}
-
-		// Define the callback.
-		$callback = array( $this, 'enqueue_scripts', );
-
-		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
-
-		$this->plugin = $plugin;
-	}
-
-	/**
-	 * Check if we're in UX builder.
-	 *
-	 * @see   https://github.com/insideout10/wordlift-plugin/issues/691
-	 *
-	 * @since 3.15.4
-	 *
-	 * @return bool True if we're in UX builder, otherwise false.
-	 */
-	private function is_ux_builder_editor() {
-
-		return function_exists( 'ux_builder_is_editor' )
-		       && ux_builder_is_editor();
-	}
-
-	/**
-	 * Enqueue scripts and styles for the edit page.
-	 *
-	 * @since 3.11.0
-	 */
-	public function enqueue_scripts() {
-
-		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
-
-		// Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
-		// is scheduled to replace the older `wordlift-admin.min.js` once client-side
-		// code is properly refactored.
-		wp_enqueue_script(
-			'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.js',
-			array(
-				$this->plugin->get_plugin_name(),
-				'jquery',
-				// Require Angular.
-				'wl-angular',
-				'wl-angular-geolocation',
-				'wl-angular-touch',
-				'wl-angular-animate',
-			),
-			$this->plugin->get_version(),
-			false
-		);
-		wp_enqueue_style( 'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.css', array(), $this->plugin->get_version() );
-
-	}
+    /**
+     * The {@link Wordlift} plugin instance.
+     *
+     * @since 3.11.0
+     *
+     * @var \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    private $plugin;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * Create the {@link Wordlift_Admin_Post_Edit_Page} instance.
+     *
+     * @since 3.11.0
+     *
+     * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
+     */
+    function __construct( $plugin ) {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+
+        // Bail out if we're in the UX Builder editor.
+        if ( $this->is_ux_builder_editor() ) {
+            $this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+
+            return;
+        }
+
+        // Define the callback.
+        $callback = array( $this, 'enqueue_scripts', );
+
+        // Set a hook to enqueue scripts only when the edit page is displayed.
+        add_action( 'admin_print_scripts-post.php', $callback );
+        add_action( 'admin_print_scripts-post-new.php', $callback );
+
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Check if we're in UX builder.
+     *
+     * @see   https://github.com/insideout10/wordlift-plugin/issues/691
+     *
+     * @since 3.15.4
+     *
+     * @return bool True if we're in UX builder, otherwise false.
+     */
+    private function is_ux_builder_editor() {
+
+        return function_exists( 'ux_builder_is_editor' )
+               && ux_builder_is_editor();
+    }
+
+    /**
+     * Enqueue scripts and styles for the edit page.
+     *
+     * @since 3.11.0
+     */
+    public function enqueue_scripts() {
+
+        // Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/832
+        wp_dequeue_script( 'ontrapagesAngular' );
+        wp_dequeue_script( 'ontrapagesApp' );
+        wp_dequeue_script( 'ontrapagesController' );
+
+        // Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
+        // is scheduled to replace the older `wordlift-admin.min.js` once client-side
+        // code is properly refactored.
+        wp_enqueue_script(
+            'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.js',
+            array(
+                $this->plugin->get_plugin_name(),
+                'jquery',
+                // Require Angular.
+                'wl-angular',
+                'wl-angular-geolocation',
+                'wl-angular-touch',
+                'wl-angular-animate',
+            ),
+            $this->plugin->get_version(),
+            false
+        );
+        wp_enqueue_style( 'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.css', array(), $this->plugin->get_version() );
+
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -43,23 +43,23 @@ 
 	 *
 	 * @param \Wordlift $plugin The {@link Wordlift} plugin instance.
 	 */
-	function __construct( $plugin ) {
+	function __construct($plugin) {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 
 		// Bail out if we're in the UX Builder editor.
-		if ( $this->is_ux_builder_editor() ) {
-			$this->log->info( 'WordLift will not show, since we are in UX Builder editor.' );
+		if ($this->is_ux_builder_editor()) {
+			$this->log->info('WordLift will not show, since we are in UX Builder editor.');
 
 			return;
 		}
 
 		// Define the callback.
-		$callback = array( $this, 'enqueue_scripts', );
+		$callback = array($this, 'enqueue_scripts',);
 
 		// Set a hook to enqueue scripts only when the edit page is displayed.
-		add_action( 'admin_print_scripts-post.php', $callback );
-		add_action( 'admin_print_scripts-post-new.php', $callback );
+		add_action('admin_print_scripts-post.php', $callback);
+		add_action('admin_print_scripts-post-new.php', $callback);
 
 		$this->plugin = $plugin;
 	}
@@ -75,7 +75,7 @@ 
 	 */
 	private function is_ux_builder_editor() {
 
-		return function_exists( 'ux_builder_is_editor' )
+		return function_exists('ux_builder_is_editor')
 		       && ux_builder_is_editor();
 	}
 
@@ -89,15 +89,15 @@ 
 		// Dequeue potentially conflicting ontrapages angular scripts which any *are not* used on the edit screen.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/832
-		wp_dequeue_script( 'ontrapagesAngular' );
-		wp_dequeue_script( 'ontrapagesApp' );
-		wp_dequeue_script( 'ontrapagesController' );
+		wp_dequeue_script('ontrapagesAngular');
+		wp_dequeue_script('ontrapagesApp');
+		wp_dequeue_script('ontrapagesController');
 
 		// Enqueue the edit screen JavaScript. The `wordlift-admin.bundle.js` file
 		// is scheduled to replace the older `wordlift-admin.min.js` once client-side
 		// code is properly refactored.
 		wp_enqueue_script(
-			'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.js',
+			'wordlift-admin-edit-page', plugin_dir_url(__FILE__).'js/1/edit.js',
 			array(
 				$this->plugin->get_plugin_name(),
 				'jquery',
@@ -110,7 +110,7 @@ 
 			$this->plugin->get_version(),
 			false
 		);
-		wp_enqueue_style( 'wordlift-admin-edit-page', plugin_dir_url( __FILE__ ) . 'js/1/edit.css', array(), $this->plugin->get_version() );
+		wp_enqueue_style('wordlift-admin-edit-page', plugin_dir_url(__FILE__).'js/1/edit.css', array(), $this->plugin->get_version());
 
 	}
 

src/admin/class-wordlift-admin.php

Indentation +175 added lines, -175 removed lines

@@ -22,185 +22,185 @@
  */
 class Wordlift_Admin {
 
-	/**
-	 * The ID of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $plugin_name The ID of this plugin.
-	 */
-	private $plugin_name;
-
-	/**
-	 * The version of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 * @var      string $version The current version of this plugin.
-	 */
-	private $version;
-
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_User_Service} instance.
-	 *
-	 * @since  3.14.0
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	private $user_service;
-
-	/**
-	 * Initialize the class and set its properties.
-	 *
-	 * @since  1.0.0
-	 *
-	 * @param string                          $plugin_name The name of this plugin.
-	 * @param string                          $version The version of this plugin.
-	 * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
-	 * @param \Wordlift_Notice_Service        $notice_service The notice service.
-	 * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
-	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
-
-		$this->plugin_name = $plugin_name;
-		$this->version     = $version;
-
-		$this->configuration_service = $configuration_service;
-		$this->user_service          = $user_service;
-
-		$dataset_uri = $configuration_service->get_dataset_uri();
-		$key         = $configuration_service->get_key();
-
-		if ( empty( $dataset_uri ) ) {
-			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
-			}
-			$notice_service->add_error( $error );
-		}
-
-		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
-
-			new Wordlift_Dashboard_Latest_News();
-		}
-
-	}
-
-	/**
-	 * Register the stylesheets for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_styles() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
-
-	}
-
-	/**
-	 * Register the JavaScript for the admin area.
-	 *
-	 * @since    1.0.0
-	 */
-	public function enqueue_scripts() {
-
-		/**
-		 * This function is provided for demonstration purposes only.
-		 *
-		 * An instance of this class should be passed to the run() function
-		 * defined in Wordlift_Loader as all of the hooks are defined
-		 * in that particular class.
-		 *
-		 * The Wordlift_Loader will then create the relationship
-		 * between the defined hooks and the functions defined in this
-		 * class.
-		 */
-
-		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
-			'jquery',
-			'underscore',
-			'backbone',
-		), $this->version, false );
-
-
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
-
-		/*
+    /**
+     * The ID of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $plugin_name The ID of this plugin.
+     */
+    private $plugin_name;
+
+    /**
+     * The version of this plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     * @var      string $version The current version of this plugin.
+     */
+    private $version;
+
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_User_Service} instance.
+     *
+     * @since  3.14.0
+     * @access private
+     * @var \Wordlift_User_Service $user_service The {@link Wordlift_User_Service} instance.
+     */
+    private $user_service;
+
+    /**
+     * Initialize the class and set its properties.
+     *
+     * @since  1.0.0
+     *
+     * @param string                          $plugin_name The name of this plugin.
+     * @param string                          $version The version of this plugin.
+     * @param \Wordlift_Configuration_Service $configuration_service The configuration service.
+     * @param \Wordlift_Notice_Service        $notice_service The notice service.
+     * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
+     */
+    public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+
+        $this->plugin_name = $plugin_name;
+        $this->version     = $version;
+
+        $this->configuration_service = $configuration_service;
+        $this->user_service          = $user_service;
+
+        $dataset_uri = $configuration_service->get_dataset_uri();
+        $key         = $configuration_service->get_key();
+
+        if ( empty( $dataset_uri ) ) {
+            $settings_page = Wordlift_Admin_Settings_Page::get_instance();
+            if ( empty( $key ) ) {
+                $error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            } else {
+                $error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+            }
+            $notice_service->add_error( $error );
+        }
+
+        // Load additional code if we're in the admin UI.
+        if ( is_admin() ) {
+            require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+
+            new Wordlift_Dashboard_Latest_News();
+        }
+
+    }
+
+    /**
+     * Register the stylesheets for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_styles() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+
+    }
+
+    /**
+     * Register the JavaScript for the admin area.
+     *
+     * @since    1.0.0
+     */
+    public function enqueue_scripts() {
+
+        /**
+         * This function is provided for demonstration purposes only.
+         *
+         * An instance of this class should be passed to the run() function
+         * defined in Wordlift_Loader as all of the hooks are defined
+         * in that particular class.
+         *
+         * The Wordlift_Loader will then create the relationship
+         * between the defined hooks and the functions defined in this
+         * class.
+         */
+
+        // Enqueue the admin scripts.
+        wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+            'jquery',
+            'underscore',
+            'backbone',
+        ), $this->version, false );
+
+
+        $can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+
+        /*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
 		 * that cannot edit create entities will always see the local entities.
 		 *
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/839
 		 */
-		$autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
-
-		// Set the basic params.
-		$params = array(
-			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
-			// @todo remove specific actions from settings.
-			'action'                => 'entity_by_title',
-			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
-			'language'              => $this->configuration_service->get_language_code(),
-			'link_by_default'       => $this->configuration_service->is_link_by_default(),
-			// Whether the current user is allowed to create new entities.
-			//
-			// @see https://github.com/insideout10/wordlift-plugin/issues/561
-			'can_create_entities'   => $can_edit_wordlift_entities ? 'yes' : 'no',
-			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
-			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
-			'autocomplete_scope'    => $autocomplete_scope,
-		);
-
-		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
-
-			$params['post_id']           = $entity_being_edited->ID;
-			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
-			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
-			// from the results, since we don't want the current entity to be discovered by the analysis.
-			//
-			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
-
-		}
-
-		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
-
-	}
+        $autocomplete_scope = $can_edit_wordlift_entities ? WL_AUTOCOMPLETE_SCOPE : "local";
+
+        // Set the basic params.
+        $params = array(
+            // @todo scripts in admin should use wp.post.
+            'ajax_url'              => admin_url( 'admin-ajax.php' ),
+            // @todo remove specific actions from settings.
+            'action'                => 'entity_by_title',
+            'datasetUri'            => $this->configuration_service->get_dataset_uri(),
+            'language'              => $this->configuration_service->get_language_code(),
+            'link_by_default'       => $this->configuration_service->is_link_by_default(),
+            // Whether the current user is allowed to create new entities.
+            //
+            // @see https://github.com/insideout10/wordlift-plugin/issues/561
+            'can_create_entities'   => $can_edit_wordlift_entities ? 'yes' : 'no',
+            'l10n'                  => array(
+                'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
+                'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
+                'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
+                'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
+                'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
+                'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+            ),
+            'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+            'autocomplete_scope'    => $autocomplete_scope,
+        );
+
+        // Set post-related values if there's a current post.
+        if ( null !== $post = $entity_being_edited = get_post() ) {
+
+            $params['post_id']           = $entity_being_edited->ID;
+            $entity_service              = Wordlift_Entity_Service::get_instance();
+            $params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+            // We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
+            // from the results, since we don't want the current entity to be discovered by the analysis.
+            //
+            // See https://github.com/insideout10/wordlift-plugin/issues/345
+            $params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+
+        }
+
+        // Finally output the params as `wlSettings` for JavaScript code.
+        wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+
+    }
 
 }

Spacing +24 added lines, -24 removed lines

@@ -69,7 +69,7 @@ 
 	 * @param \Wordlift_Notice_Service        $notice_service The notice service.
 	 * @param \Wordlift_User_Service          $user_service The {@link Wordlift_User_Service} instance.
 	 */
-	public function __construct( $plugin_name, $version, $configuration_service, $notice_service, $user_service ) {
+	public function __construct($plugin_name, $version, $configuration_service, $notice_service, $user_service) {
 
 		$this->plugin_name = $plugin_name;
 		$this->version     = $version;
@@ -80,19 +80,19 @@ 
 		$dataset_uri = $configuration_service->get_dataset_uri();
 		$key         = $configuration_service->get_key();
 
-		if ( empty( $dataset_uri ) ) {
+		if (empty($dataset_uri)) {
 			$settings_page = Wordlift_Admin_Settings_Page::get_instance();
-			if ( empty( $key ) ) {
-				$error = sprintf( esc_html__( "WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+			if (empty($key)) {
+				$error = sprintf(esc_html__("WordLift's key isn't set, please open the %s to set WordLift's key.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			} else {
-				$error = sprintf( esc_html__( "WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift' ), '<a href="' . $settings_page->get_url() . '">' . esc_html__( 'settings page', 'wordlift' ) . '</a>' );
+				$error = sprintf(esc_html__("WordLift's dataset URI is not configured: please open the %s to set WordLift's key again.", 'wordlift'), '<a href="'.$settings_page->get_url().'">'.esc_html__('settings page', 'wordlift').'</a>');
 			}
-			$notice_service->add_error( $error );
+			$notice_service->add_error($error);
 		}
 
 		// Load additional code if we're in the admin UI.
-		if ( is_admin() ) {
-			require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin-dashboard-latest-news.php';
+		if (is_admin()) {
+			require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin-dashboard-latest-news.php';
 
 			new Wordlift_Dashboard_Latest_News();
 		}
@@ -118,7 +118,7 @@ 
 		 * class.
 		 */
 
-		wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wordlift-admin.css', array(), $this->version, 'all' );
+		wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__).'css/wordlift-admin.css', array(), $this->version, 'all');
 
 	}
 
@@ -142,14 +142,14 @@ 
 		 */
 
 		// Enqueue the admin scripts.
-		wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/1/admin.js', array(
+		wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__).'js/1/admin.js', array(
 			'jquery',
 			'underscore',
 			'backbone',
-		), $this->version, false );
+		), $this->version, false);
 
 
-		$can_edit_wordlift_entities = current_user_can( 'edit_wordlift_entities' );
+		$can_edit_wordlift_entities = current_user_can('edit_wordlift_entities');
 
 		/*
 		 * People that can create entities will see the scope set in the wp-config.php file (by default `cloud`). People
@@ -162,7 +162,7 @@ 
 		// Set the basic params.
 		$params = array(
 			// @todo scripts in admin should use wp.post.
-			'ajax_url'              => admin_url( 'admin-ajax.php' ),
+			'ajax_url'              => admin_url('admin-ajax.php'),
 			// @todo remove specific actions from settings.
 			'action'                => 'entity_by_title',
 			'datasetUri'            => $this->configuration_service->get_dataset_uri(),
@@ -173,33 +173,33 @@ 
 			// @see https://github.com/insideout10/wordlift-plugin/issues/561
 			'can_create_entities'   => $can_edit_wordlift_entities ? 'yes' : 'no',
 			'l10n'                  => array(
-				'You already published an entity with the same name'                 => __( 'You already published an entity with the same name: ', 'wordlift' ),
-				'logo_selection_title'                                               => __( 'WordLift Choose Logo', 'wordlift' ),
-				'logo_selection_button'                                              => array( 'text' => __( 'Choose Logo', 'wordlift' ) ),
-				'Type at least 3 characters to search...'                            => _x( 'Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift' ),
-				'No results found for your search.'                                  => _x( 'No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift' ),
-				'Please wait while we look for entities in the linked data cloud...' => _x( 'Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift' ),
+				'You already published an entity with the same name'                 => __('You already published an entity with the same name: ', 'wordlift'),
+				'logo_selection_title'                                               => __('WordLift Choose Logo', 'wordlift'),
+				'logo_selection_button'                                              => array('text' => __('Choose Logo', 'wordlift')),
+				'Type at least 3 characters to search...'                            => _x('Type at least 3 characters to search...', 'Autocomplete Select', 'wordlift'),
+				'No results found for your search.'                                  => _x('No results found: try changing or removing some words.', 'Autocomplete Select', 'wordlift'),
+				'Please wait while we look for entities in the linked data cloud...' => _x('Please wait while we look for entities in the linked data cloud...', 'Autocomplete Select', 'wordlift'),
 			),
-			'wl_autocomplete_nonce' => wp_create_nonce( 'wordlift_autocomplete' ),
+			'wl_autocomplete_nonce' => wp_create_nonce('wordlift_autocomplete'),
 			'autocomplete_scope'    => $autocomplete_scope,
 		);
 
 		// Set post-related values if there's a current post.
-		if ( null !== $post = $entity_being_edited = get_post() ) {
+		if (null !== $post = $entity_being_edited = get_post()) {
 
 			$params['post_id']           = $entity_being_edited->ID;
 			$entity_service              = Wordlift_Entity_Service::get_instance();
-			$params['entityBeingEdited'] = isset( $entity_being_edited->post_type ) && $entity_service->is_entity( $post->ID ) && is_numeric( get_the_ID() );
+			$params['entityBeingEdited'] = isset($entity_being_edited->post_type) && $entity_service->is_entity($post->ID) && is_numeric(get_the_ID());
 			// We add the `itemId` here to give a chance to the analysis to use it in order to tell WLS to exclude it
 			// from the results, since we don't want the current entity to be discovered by the analysis.
 			//
 			// See https://github.com/insideout10/wordlift-plugin/issues/345
-			$params['itemId'] = $entity_service->get_uri( $entity_being_edited->ID );
+			$params['itemId'] = $entity_service->get_uri($entity_being_edited->ID);
 
 		}
 
 		// Finally output the params as `wlSettings` for JavaScript code.
-		wp_localize_script( $this->plugin_name, 'wlSettings', $params );
+		wp_localize_script($this->plugin_name, 'wlSettings', $params);
 
 	}
 

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 = $_GET["post_id"];
-	$post    = get_post( $post_id );
+    // Get the current post
+    $post_id = $_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 = $_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/wordlift.php

Indentation +139 added lines, -139 removed lines

@@ -26,7 +26,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 // Include WordLift constants.
@@ -48,7 +48,7 @@ 
  */
 function wl_write_log( $log ) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+    Wordlift_Log_Service::get_instance()->debug( $log );
 
 }
 
@@ -64,20 +64,20 @@ 
  */
 function wl_write_log_handler( $log, $caller = null ) {
 
-	global $wl_logger;
+    global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+    if ( true === WP_DEBUG ) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+        $message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
+                    ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
-		} else {
-			error_log( $message );
-		}
+        if ( isset( $wl_logger ) ) {
+            $wl_logger->info( $message );
+        } else {
+            error_log( $message );
+        }
 
-	}
+    }
 
 }
 
@@ -94,7 +94,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -102,21 +102,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array(),
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array(),
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // add allowed post tags.
@@ -127,32 +127,32 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
 
-	$log = Wordlift_Log_Service::get_logger( 'wordlift_admin_enqueue_scripts' );
-	$log->trace( 'Registering admin scripts...' );
+    $log = Wordlift_Log_Service::get_logger( 'wordlift_admin_enqueue_scripts' );
+    $log->trace( 'Registering admin scripts...' );
 
-	// We now register angular scripts and have dependent scripts (currently
-	// only the edit post page) depend on them, to avoid potential conflicts.
-	//
-	// See https://github.com/insideout10/wordlift-plugin/issues/691.
-	$result = wp_register_script( 'wl-angular', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' )
-	          && wp_register_script( 'wl-angular-geolocation', plugin_dir_url( __FILE__ ) . 'bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' )
-	          && wp_register_script( 'wl-angular-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' )
-	          && wp_register_script( 'wl-angular-animate', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-animate.min.js' );
+    // We now register angular scripts and have dependent scripts (currently
+    // only the edit post page) depend on them, to avoid potential conflicts.
+    //
+    // See https://github.com/insideout10/wordlift-plugin/issues/691.
+    $result = wp_register_script( 'wl-angular', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' )
+              && wp_register_script( 'wl-angular-geolocation', plugin_dir_url( __FILE__ ) . 'bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' )
+              && wp_register_script( 'wl-angular-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' )
+              && wp_register_script( 'wl-angular-animate', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-animate.min.js' );
 
-	$log->debug( 'Registering angular scripts was ' . ( $result ? 'successful.' : 'unsuccessful.' ) );
+    $log->debug( 'Registering angular scripts was ' . ( $result ? 'successful.' : 'unsuccessful.' ) );
 
-	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
-	}
+    // Disable auto-save for custom entity posts only
+    if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
+        wp_dequeue_script( 'autosave' );
+    }
 
 }
 
@@ -177,18 +177,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => true,
-			'itemtype'  => true,
-			'itemid'    => true,
-			'itemprop'  => true,
-		),
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => true,
+            'itemtype'  => true,
+            'itemid'    => true,
+            'itemprop'  => true,
+        ),
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -202,16 +202,16 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
-	// place on the globe:"The zero/zero point of this system is located in the
-	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific
+    // place on the globe:"The zero/zero point of this system is located in the
+    // Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+    );
 }
 
 /**
@@ -225,9 +225,9 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	return Wordlift_Storage_Factory::get_instance()
-	                               ->post_images()
-	                               ->get( $post_id );
+    return Wordlift_Storage_Factory::get_instance()
+                                    ->post_images()
+                                    ->get( $post_id );
 
 //	// If there is a featured image it has the priority.
 //	$featured_image_id = get_post_thumbnail_id( $post_id );
@@ -275,24 +275,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url,
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url,
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return null;
+    // Return null.
+    return null;
 }
 
 /**
@@ -303,8 +303,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 /**
@@ -320,7 +320,7 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+    return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
 }
 
 ///**
@@ -361,47 +361,47 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+    $log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
+    $log->trace( 'Replacing item IDs with URIs...' );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()
+                                            ->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( null === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -462,24 +462,24 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+    $log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
 
-	$log->info( 'Activating WordLift...' );
+    $log->info( 'Activating WordLift...' );
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
 
-	/**
-	 * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
-	 *
-	 * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
-	 * @since 3.19.2
-	 */
-	Wordlift_Http_Api::activate();
+    /**
+     * Tell the {@link Wordlift_Http_Api} class that we're activating, to let it run activation tasks.
+     *
+     * @see https://github.com/insideout10/wordlift-plugin/issues/820 related issue.
+     * @since 3.19.2
+     */
+    Wordlift_Http_Api::activate();
 
-	// Ensure the post type is registered before flushing the rewrite rules.
-	Wordlift_Entity_Post_Type_Service::get_instance()->register();
-	flush_rewrite_rules();
+    // Ensure the post type is registered before flushing the rewrite rules.
+    Wordlift_Entity_Post_Type_Service::get_instance()->register();
+    flush_rewrite_rules();
 
 }
 
@@ -489,9 +489,9 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
-	flush_rewrite_rules();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
+    flush_rewrite_rules();
 
 }
 
@@ -515,8 +515,8 @@ 
  */
 function run_wordlift() {
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
 }
 

Spacing +99 added lines, -99 removed lines

@@ -25,15 +25,15 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules.
-require_once( 'modules/core/wordlift_core.php' );
+require_once('modules/core/wordlift_core.php');
 
 /**
  * Log to the debug.log file.
@@ -46,9 +46,9 @@ 
  *
  * @param string|mixed $log The log data.
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+	Wordlift_Log_Service::get_instance()->debug($log);
 
 }
 
@@ -62,19 +62,19 @@ 
  * @param string|array $log The log data.
  * @param string       $caller The calling function.
  */
-function wl_write_log_handler( $log, $caller = null ) {
+function wl_write_log_handler($log, $caller = null) {
 
 	global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+	if (true === WP_DEBUG) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+		$message = (isset($caller) ? sprintf('[%-40.40s] ', $caller) : '').
+		           (is_array($log) || is_object($log) ? print_r($log, true) : wl_write_log_hide_key($log));
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
+		if (isset($wl_logger)) {
+			$wl_logger->info($message);
 		} else {
-			error_log( $message );
+			error_log($message);
 		}
 
 	}
@@ -92,9 +92,9 @@ 
  *
  * @return string A text with the key hidden.
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -104,7 +104,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -112,15 +112,15 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 /**
  * Register additional scripts for the admin UI.
@@ -128,35 +128,35 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+	wp_enqueue_script('jquery-ui-autocomplete');
 
-	$log = Wordlift_Log_Service::get_logger( 'wordlift_admin_enqueue_scripts' );
-	$log->trace( 'Registering admin scripts...' );
+	$log = Wordlift_Log_Service::get_logger('wordlift_admin_enqueue_scripts');
+	$log->trace('Registering admin scripts...');
 
 	// We now register angular scripts and have dependent scripts (currently
 	// only the edit post page) depend on them, to avoid potential conflicts.
 	//
 	// See https://github.com/insideout10/wordlift-plugin/issues/691.
-	$result = wp_register_script( 'wl-angular', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' )
-	          && wp_register_script( 'wl-angular-geolocation', plugin_dir_url( __FILE__ ) . 'bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' )
-	          && wp_register_script( 'wl-angular-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' )
-	          && wp_register_script( 'wl-angular-animate', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-animate.min.js' );
+	$result = wp_register_script('wl-angular', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js')
+	          && wp_register_script('wl-angular-geolocation', plugin_dir_url(__FILE__).'bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js')
+	          && wp_register_script('wl-angular-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js')
+	          && wp_register_script('wl-angular-animate', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-animate.min.js');
 
-	$log->debug( 'Registering angular scripts was ' . ( $result ? 'successful.' : 'unsuccessful.' ) );
+	$log->debug('Registering angular scripts was '.($result ? 'successful.' : 'unsuccessful.'));
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 // We shouldn't load the wordlift-ui.min.css stylesheet when not needed.
 //
@@ -175,23 +175,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -200,17 +200,17 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific
 	// place on the globe:"The zero/zero point of this system is located in the
 	// Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : '',
 	);
 }
 
@@ -223,11 +223,11 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	return Wordlift_Storage_Factory::get_instance()
 	                               ->post_images()
-	                               ->get( $post_id );
+	                               ->get($post_id);
 
 //	// If there is a featured image it has the priority.
 //	$featured_image_id = get_post_thumbnail_id( $post_id );
@@ -273,21 +273,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -301,10 +301,10 @@ 
  * @param int    $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 /**
@@ -318,9 +318,9 @@ 
  *
  * @return string The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 ///**
@@ -359,102 +359,102 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+	$log = Wordlift_Log_Service::get_logger('wl_replace_item_id_with_uri');
+	$log->trace('Replacing item IDs with URIs...');
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
+require_once('wordlift_entity_type.php');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/class-wordlift-chord-widget.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/class-wordlift-chord-widget.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 /**
  * The code that runs during plugin activation.
@@ -462,11 +462,11 @@ 
  */
 function activate_wordlift() {
 
-	$log = Wordlift_Log_Service::get_logger( 'activate_wordlift' );
+	$log = Wordlift_Log_Service::get_logger('activate_wordlift');
 
-	$log->info( 'Activating WordLift...' );
+	$log->info('Activating WordLift...');
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 
 	/**
@@ -489,20 +489,20 @@ 
  */
 function deactivate_wordlift() {
 
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 	flush_rewrite_rules();
 
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.

src/includes/class-wordlift-autocomplete-adapter.php

Indentation +68 added lines, -68 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,82 +21,82 @@ 
  */
 class Wordlift_Autocomplete_Adapter {
 
-	/**
-	 * The {@link Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Autocomplete_Service $configuration_service The {@link Wordlift_Autocomplete_Service} instance.
-	 */
-	private $autocomplete_service;
+    /**
+     * The {@link Wordlift_Autocomplete_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Autocomplete_Service $configuration_service The {@link Wordlift_Autocomplete_Service} instance.
+     */
+    private $autocomplete_service;
 
 
-	/**
-	 * Wordlift_Autocomplete_Adapter constructor.
-	 *
-	 * @since 3.14.2
-	 *
-	 * @param \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
-	 */
-	public function __construct( $autocomplete_service ) {
-		$this->autocomplete_service = $autocomplete_service;
-	}
+    /**
+     * Wordlift_Autocomplete_Adapter constructor.
+     *
+     * @since 3.14.2
+     *
+     * @param \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
+     */
+    public function __construct( $autocomplete_service ) {
+        $this->autocomplete_service = $autocomplete_service;
+    }
 
-	/**
-	 * Handle the autocomplete ajax request.
-	 *
-	 * @since 3.15.0
-	 */
-	public function wl_autocomplete() {
-		if (
-			! isset( $_REQUEST['_wpnonce'] ) || // Input var okay.
-			! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'wordlift_autocomplete' ) // Input var okay.
-		) {
-			wp_send_json_error( array(
-				'message' => __( 'Nonce field doesn\'t match.', 'wordlift' ),
-			) );
-		}
+    /**
+     * Handle the autocomplete ajax request.
+     *
+     * @since 3.15.0
+     */
+    public function wl_autocomplete() {
+        if (
+            ! isset( $_REQUEST['_wpnonce'] ) || // Input var okay.
+            ! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'wordlift_autocomplete' ) // Input var okay.
+        ) {
+            wp_send_json_error( array(
+                'message' => __( 'Nonce field doesn\'t match.', 'wordlift' ),
+            ) );
+        }
 
-		// Return error if the query param is empty.
-		if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
-			$query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
-		} else {
-			wp_send_json_error( array(
-				'message' => __( 'The query param is empty.', 'wordlift' ),
-			) );
-		}
+        // Return error if the query param is empty.
+        if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
+            $query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
+        } else {
+            wp_send_json_error( array(
+                'message' => __( 'The query param is empty.', 'wordlift' ),
+            ) );
+        }
 
-		// Get the exclude parameter.
-		$exclude = ! empty( $_REQUEST['exclude'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
+        // Get the exclude parameter.
+        $exclude = ! empty( $_REQUEST['exclude'] )
+            ? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
 
-		$scope = ! empty( $_REQUEST['scope'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
+        $scope = ! empty( $_REQUEST['scope'] )
+            ? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
 
-		// Make request.
-		$response = $this->autocomplete_service->make_request( $query, $exclude, $scope );
+        // Make request.
+        $response = $this->autocomplete_service->make_request( $query, $exclude, $scope );
 
-		// Clear any buffer.
-		ob_clean();
+        // Clear any buffer.
+        ob_clean();
 
-		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
-			// Echo the response.
-			wp_send_json_success( json_decode( wp_remote_retrieve_body( $response ), true ) );
-		} else {
-			// Default error message.
-			$error_message = 'Something went wrong.';
+        // If the response is valid, then send the suggestions.
+        if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+            // Echo the response.
+            wp_send_json_success( json_decode( wp_remote_retrieve_body( $response ), true ) );
+        } else {
+            // Default error message.
+            $error_message = 'Something went wrong.';
 
-			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
-				$error_message = $response->get_error_message();
-			}
+            // Get the real error message if there is WP_Error.
+            if ( is_wp_error( $response ) ) {
+                $error_message = $response->get_error_message();
+            }
 
-			// There is an error, so send error message.
-			wp_send_json_error( array(
-				/* translators: Placeholders: %s - the error message that will be returned. */
-				'message' => sprintf( esc_html__( 'Error: %s', 'wordlift' ), $error_message ),
-			) );
-		}
-	}
+            // There is an error, so send error message.
+            wp_send_json_error( array(
+                /* translators: Placeholders: %s - the error message that will be returned. */
+                'message' => sprintf( esc_html__( 'Error: %s', 'wordlift' ), $error_message ),
+            ) );
+        }
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.15.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,7 +38,7 @@ 
 	 *
 	 * @param \Wordlift_Autocomplete_Service $autocomplete_service The {@link Wordlift_Autocomplete_Service} instance.
 	 */
-	public function __construct( $autocomplete_service ) {
+	public function __construct($autocomplete_service) {
 		$this->autocomplete_service = $autocomplete_service;
 	}
 
@@ -49,54 +49,54 @@ 
 	 */
 	public function wl_autocomplete() {
 		if (
-			! isset( $_REQUEST['_wpnonce'] ) || // Input var okay.
-			! wp_verify_nonce( sanitize_key( $_REQUEST['_wpnonce'] ), 'wordlift_autocomplete' ) // Input var okay.
+			! isset($_REQUEST['_wpnonce']) || // Input var okay.
+			! wp_verify_nonce(sanitize_key($_REQUEST['_wpnonce']), 'wordlift_autocomplete') // Input var okay.
 		) {
-			wp_send_json_error( array(
-				'message' => __( 'Nonce field doesn\'t match.', 'wordlift' ),
-			) );
+			wp_send_json_error(array(
+				'message' => __('Nonce field doesn\'t match.', 'wordlift'),
+			));
 		}
 
 		// Return error if the query param is empty.
-		if ( ! empty( $_REQUEST['query'] ) ) { // Input var okay.
-			$query = sanitize_text_field( wp_unslash( $_REQUEST['query'] ) ); // Input var okay.
+		if ( ! empty($_REQUEST['query'])) { // Input var okay.
+			$query = sanitize_text_field(wp_unslash($_REQUEST['query'])); // Input var okay.
 		} else {
-			wp_send_json_error( array(
-				'message' => __( 'The query param is empty.', 'wordlift' ),
-			) );
+			wp_send_json_error(array(
+				'message' => __('The query param is empty.', 'wordlift'),
+			));
 		}
 
 		// Get the exclude parameter.
-		$exclude = ! empty( $_REQUEST['exclude'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['exclude'] ) ) : '';
+		$exclude = ! empty($_REQUEST['exclude'])
+			? sanitize_text_field(wp_unslash($_REQUEST['exclude'])) : '';
 
-		$scope = ! empty( $_REQUEST['scope'] )
-			? sanitize_text_field( wp_unslash( $_REQUEST['scope'] ) ) : WL_AUTOCOMPLETE_SCOPE;
+		$scope = ! empty($_REQUEST['scope'])
+			? sanitize_text_field(wp_unslash($_REQUEST['scope'])) : WL_AUTOCOMPLETE_SCOPE;
 
 		// Make request.
-		$response = $this->autocomplete_service->make_request( $query, $exclude, $scope );
+		$response = $this->autocomplete_service->make_request($query, $exclude, $scope);
 
 		// Clear any buffer.
 		ob_clean();
 
 		// If the response is valid, then send the suggestions.
-		if ( ! is_wp_error( $response ) && 200 === (int) $response['response']['code'] ) {
+		if ( ! is_wp_error($response) && 200 === (int) $response['response']['code']) {
 			// Echo the response.
-			wp_send_json_success( json_decode( wp_remote_retrieve_body( $response ), true ) );
+			wp_send_json_success(json_decode(wp_remote_retrieve_body($response), true));
 		} else {
 			// Default error message.
 			$error_message = 'Something went wrong.';
 
 			// Get the real error message if there is WP_Error.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				$error_message = $response->get_error_message();
 			}
 
 			// There is an error, so send error message.
-			wp_send_json_error( array(
+			wp_send_json_error(array(
 				/* translators: Placeholders: %s - the error message that will be returned. */
-				'message' => sprintf( esc_html__( 'Error: %s', 'wordlift' ), $error_message ),
-			) );
+				'message' => sprintf(esc_html__('Error: %s', 'wordlift'), $error_message),
+			));
 		}
 	}
 }

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

Indentation +81 added lines, -81 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -20,93 +20,93 @@ 
  * @since 3.15.0
  */
 class Wordlift_Autocomplete_Service {
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
 
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
 
-	/**
-	 * The {@link Class_Wordlift_Autocomplete_Service} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $configuration_service ) {
-		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
-	}
+    /**
+     * The {@link Class_Wordlift_Autocomplete_Service} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $configuration_service ) {
+        $this->configuration_service = $configuration_service;
+        $this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+    }
 
-	/**
-	 * Make request to external API and return the response.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string       $query The search string.
-	 * @param array|string $exclude The exclude parameter string.
-	 * @param string       $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
-	 *                      in Wikipedia. By default is "cloud".
-	 *
-	 * @return array $response The API response.
-	 */
-	public function make_request( $query, $exclude = '', $scope = 'cloud' ) {
-		$url = $this->build_request_url( $query, $exclude, $scope );
+    /**
+     * Make request to external API and return the response.
+     *
+     * @since 3.15.0
+     *
+     * @param string       $query The search string.
+     * @param array|string $exclude The exclude parameter string.
+     * @param string       $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
+     *                      in Wikipedia. By default is "cloud".
+     *
+     * @return array $response The API response.
+     */
+    public function make_request( $query, $exclude = '', $scope = 'cloud' ) {
+        $url = $this->build_request_url( $query, $exclude, $scope );
 
-		// Make request.
-		$response = wp_remote_get( $url );
+        // Make request.
+        $response = wp_remote_get( $url );
 
-		// Return the response.
-		return $response;
-	}
+        // Return the response.
+        return $response;
+    }
 
-	/**
-	 * Build the autocomplete url.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param string       $query The search string.
-	 * @param array|string $exclude The exclude parameter.
-	 * @param string       $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
-	 *                      in Wikipedia. By default is "cloud".
-	 *
-	 * @return string Built url.
-	 */
-	private function build_request_url( $query, $exclude, $scope ) {
-		$args = array(
-			'key'      => $this->configuration_service->get_key(),
-			'language' => $this->configuration_service->get_language_code(),
-			'query'    => $query,
-			'scope'    => $scope,
-			'limit'    => 100,
-		);
+    /**
+     * Build the autocomplete url.
+     *
+     * @since 3.15.0
+     *
+     * @param string       $query The search string.
+     * @param array|string $exclude The exclude parameter.
+     * @param string       $scope The search scope: "local" will search only in the local dataset; "cloud" will search also
+     *                      in Wikipedia. By default is "cloud".
+     *
+     * @return string Built url.
+     */
+    private function build_request_url( $query, $exclude, $scope ) {
+        $args = array(
+            'key'      => $this->configuration_service->get_key(),
+            'language' => $this->configuration_service->get_language_code(),
+            'query'    => $query,
+            'scope'    => $scope,
+            'limit'    => 100,
+        );
 
-		// Add args to URL.
-		$request_url = add_query_arg(
-			urlencode_deep( $args ),
-			$this->configuration_service->get_autocomplete_url()
-		);
+        // Add args to URL.
+        $request_url = add_query_arg(
+            urlencode_deep( $args ),
+            $this->configuration_service->get_autocomplete_url()
+        );
 
-		// Add the exclude parameter.
-		if ( ! empty( $exclude ) ) {
-			foreach ( (array) $exclude as $item ) {
-				$request_url .= "&exclude=" . urlencode( $item );
-			}
-		}
+        // Add the exclude parameter.
+        if ( ! empty( $exclude ) ) {
+            foreach ( (array) $exclude as $item ) {
+                $request_url .= "&exclude=" . urlencode( $item );
+            }
+        }
 
-		// return the built url.
-		return $request_url;
-	}
+        // return the built url.
+        return $request_url;
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
  * @since      3.15.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -45,9 +45,9 @@ 
 	 *
 	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
 	 */
-	public function __construct( $configuration_service ) {
+	public function __construct($configuration_service) {
 		$this->configuration_service = $configuration_service;
-		$this->log                   = Wordlift_Log_Service::get_logger( 'Wordlift_Autocomplete_Service' );
+		$this->log                   = Wordlift_Log_Service::get_logger('Wordlift_Autocomplete_Service');
 	}
 
 	/**
@@ -62,11 +62,11 @@ 
 	 *
 	 * @return array $response The API response.
 	 */
-	public function make_request( $query, $exclude = '', $scope = 'cloud' ) {
-		$url = $this->build_request_url( $query, $exclude, $scope );
+	public function make_request($query, $exclude = '', $scope = 'cloud') {
+		$url = $this->build_request_url($query, $exclude, $scope);
 
 		// Make request.
-		$response = wp_remote_get( $url );
+		$response = wp_remote_get($url);
 
 		// Return the response.
 		return $response;
@@ -84,7 +84,7 @@ 
 	 *
 	 * @return string Built url.
 	 */
-	private function build_request_url( $query, $exclude, $scope ) {
+	private function build_request_url($query, $exclude, $scope) {
 		$args = array(
 			'key'      => $this->configuration_service->get_key(),
 			'language' => $this->configuration_service->get_language_code(),
@@ -95,14 +95,14 @@ 
 
 		// Add args to URL.
 		$request_url = add_query_arg(
-			urlencode_deep( $args ),
+			urlencode_deep($args),
 			$this->configuration_service->get_autocomplete_url()
 		);
 
 		// Add the exclude parameter.
-		if ( ! empty( $exclude ) ) {
-			foreach ( (array) $exclude as $item ) {
-				$request_url .= "&exclude=" . urlencode( $item );
+		if ( ! empty($exclude)) {
+			foreach ((array) $exclude as $item) {
+				$request_url .= "&exclude=".urlencode($item);
 			}
 		}