insideout10 / wordlift-plugin

src/includes/linked-data/rendition/class-wordlift-sparql-tuple-rendition-factory.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
 		$this->entity_service = $entity_service;
 
@@ -54,9 +54,9 @@ 
 	 *
 	 * @return \Wordlift_Default_Sparql_Tuple_Rendition A {@link Wordlift_Default_Sparql_Tuple_Rendition} instance.
 	 */
-	public function create( $storage, $predicate, $data_type = null, $language = null, $uri_suffix = null ) {
+	public function create($storage, $predicate, $data_type = null, $language = null, $uri_suffix = null) {
 
-		return new Wordlift_Default_Sparql_Tuple_Rendition( $this->entity_service, $storage, $predicate, $data_type, $language, $uri_suffix );
+		return new Wordlift_Default_Sparql_Tuple_Rendition($this->entity_service, $storage, $predicate, $data_type, $language, $uri_suffix);
 	}
 
 	/**
@@ -69,8 +69,8 @@ 
 	 *
 	 * @return \Wordlift_Address_Sparql_Tuple_Rendition A {@link Wordlift_Address_Sparql_Tuple_Rendition} instance.
 	 */
-	public function create_address( $storage, $language = null ) {
+	public function create_address($storage, $language = null) {
 
-		return new Wordlift_Address_Sparql_Tuple_Rendition( $this->entity_service, $this, $storage, $language );
+		return new Wordlift_Address_Sparql_Tuple_Rendition($this->entity_service, $this, $storage, $language);
 	}
 }

Indentation +66 added lines, -66 removed lines

@@ -19,81 +19,81 @@
  */
 class Wordlift_Sparql_Tuple_Rendition_Factory {
 
-	/**
-	 * The {@link Wordlift_Entity_Service} instance.
-	 *
-	 * @since  3.15.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	private $entity_service;
+    /**
+     * The {@link Wordlift_Entity_Service} instance.
+     *
+     * @since  3.15.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    private $entity_service;
 
-	/**
-	 * The {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
-	 *
-	 * @since 3.19.1
-	 * @access private
-	 * @var \Wordlift_Sparql_Tuple_Rendition_Factory $instance The {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
-	 */
-	private static $instance;
+    /**
+     * The {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
+     *
+     * @since 3.19.1
+     * @access private
+     * @var \Wordlift_Sparql_Tuple_Rendition_Factory $instance The {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
+     */
+    private static $instance;
 
-	/**
-	 * Create a a {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
-	 */
-	public function __construct( $entity_service ) {
+    /**
+     * Create a a {@link Wordlift_Sparql_Tuple_Rendition_Factory} instance.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Entity_Service $entity_service The {@link Wordlift_Entity_Service} instance.
+     */
+    public function __construct( $entity_service ) {
 
-		$this->entity_service = $entity_service;
+        $this->entity_service = $entity_service;
 
-		self::$instance = $this;
+        self::$instance = $this;
 
-	}
+    }
 
-	/**
-	 * Get the {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
-	 *
-	 * @since 3.19.1
-	 *
-	 * @return \Wordlift_Sparql_Tuple_Rendition_Factory The {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
-	 */
-	public static function get_instance() {
+    /**
+     * Get the {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
+     *
+     * @since 3.19.1
+     *
+     * @return \Wordlift_Sparql_Tuple_Rendition_Factory The {@link Wordlift_Sparql_Tuple_Rendition_Factory} singleton instance.
+     */
+    public static function get_instance() {
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	/**
-	 * Create a rendition.
-	 *
-	 * @since 3.15.0
-	 *
-	 * @param \Wordlift_Storage $storage A {@link Wordlift_Storage} instance.
-	 * @param string $predicate A predicate (e.g. `http://schema.org/name`).
-	 * @param string|null $data_type A data-type.
-	 * @param string|null $language A language code (e.g. `en`).
-	 * @param string|null $uri_suffix The URI suffix.
-	 *
-	 * @return \Wordlift_Default_Sparql_Tuple_Rendition A {@link Wordlift_Default_Sparql_Tuple_Rendition} instance.
-	 */
-	public function create( $storage, $predicate, $data_type = null, $language = null, $uri_suffix = null ) {
+    /**
+     * Create a rendition.
+     *
+     * @since 3.15.0
+     *
+     * @param \Wordlift_Storage $storage A {@link Wordlift_Storage} instance.
+     * @param string $predicate A predicate (e.g. `http://schema.org/name`).
+     * @param string|null $data_type A data-type.
+     * @param string|null $language A language code (e.g. `en`).
+     * @param string|null $uri_suffix The URI suffix.
+     *
+     * @return \Wordlift_Default_Sparql_Tuple_Rendition A {@link Wordlift_Default_Sparql_Tuple_Rendition} instance.
+     */
+    public function create( $storage, $predicate, $data_type = null, $language = null, $uri_suffix = null ) {
 
-		return new Wordlift_Default_Sparql_Tuple_Rendition( $this->entity_service, $storage, $predicate, $data_type, $language, $uri_suffix );
-	}
+        return new Wordlift_Default_Sparql_Tuple_Rendition( $this->entity_service, $storage, $predicate, $data_type, $language, $uri_suffix );
+    }
 
-	/**
-	 * Create an address rendition.
-	 *
-	 * @since 3.18.0
-	 *
-	 * @param \Wordlift_Storage $storage A {@link Wordlift_Storage} instance.
-	 * @param string|null $language A language code (e.g. `en`).
-	 *
-	 * @return \Wordlift_Address_Sparql_Tuple_Rendition A {@link Wordlift_Address_Sparql_Tuple_Rendition} instance.
-	 */
-	public function create_address( $storage, $language = null ) {
+    /**
+     * Create an address rendition.
+     *
+     * @since 3.18.0
+     *
+     * @param \Wordlift_Storage $storage A {@link Wordlift_Storage} instance.
+     * @param string|null $language A language code (e.g. `en`).
+     *
+     * @return \Wordlift_Address_Sparql_Tuple_Rendition A {@link Wordlift_Address_Sparql_Tuple_Rendition} instance.
+     */
+    public function create_address( $storage, $language = null ) {
 
-		return new Wordlift_Address_Sparql_Tuple_Rendition( $this->entity_service, $this, $storage, $language );
-	}
+        return new Wordlift_Address_Sparql_Tuple_Rendition( $this->entity_service, $this, $storage, $language );
+    }
 }

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

Indentation +214 added lines, -214 removed lines

@@ -18,222 +18,222 @@
  */
 class Wordlift_Publisher_Service {
 
-	/**
-	 * The {@link Wordlift_Configuration_Service} instance.
-	 *
-	 * @since  3.19.0
-	 * @access private
-	 * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	private $configuration_service;
-
-	/**
-	 * The {@link Wordlift_Publisher_Service} instance.
-	 *
-	 * @since 3.19.0
-	 *
-	 * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
-	 */
-	public function __construct( $configuration_service ) {
-		$this->configuration_service = $configuration_service;
-	}
-
-	/**
-	 * Counts the number of potential publishers.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @return int The number of potential publishers.
-	 */
-	public function count() {
-
-		// Search for entities which are either a Person
-		// or Organization.
-
-		// Get only the ids as all we need is the count.
-		$entities = get_posts( array(
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
-				),
-			),
-			'fields'         => 'ids',
-		) );
-
-		// Finally return the count.
-		return count( $entities );
-	}
-
-	/**
-	 * Search SQL filter for matching against post title only.
-	 *
-	 * @link    http://wordpress.stackexchange.com/a/11826/1685
-	 *
-	 * @since   3.15.0
-	 *
-	 * @param   string   $search   The search string.
-	 * @param   WP_Query $wp_query The {@link WP_Query} instance.
-	 *
-	 * @return array|string An array of results.
-	 */
-	public function limit_search_to_title( $search, $wp_query ) {
-
-		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
-			return $search;
-		}
-
-		global $wpdb;
-
-		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
-		$search     = array();
-
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
-		}
-
-		if ( ! is_user_logged_in() ) {
-			$search[] = "$wpdb->posts.post_password = ''";
-		}
-
-		$search = ' AND ' . implode( ' AND ', $search );
-
-		return $search;
-	}
-
-	/**
-	 * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
-	 * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param string $filter The title filter.
-	 *
-	 * @return array An array of results in a select2 friendly format.
-	 */
-	public function query( $filter = '' ) {
-
-		// Search for the filter in the titles only.
-		add_filter( 'posts_search', array(
-			$this,
-			'limit_search_to_title',
-		), 10, 2 );
-
-		/*
+    /**
+     * The {@link Wordlift_Configuration_Service} instance.
+     *
+     * @since  3.19.0
+     * @access private
+     * @var \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    private $configuration_service;
+
+    /**
+     * The {@link Wordlift_Publisher_Service} instance.
+     *
+     * @since 3.19.0
+     *
+     * @param \Wordlift_Configuration_Service $configuration_service The {@link Wordlift_Configuration_Service} instance.
+     */
+    public function __construct( $configuration_service ) {
+        $this->configuration_service = $configuration_service;
+    }
+
+    /**
+     * Counts the number of potential publishers.
+     *
+     * @since 3.11.0
+     *
+     * @return int The number of potential publishers.
+     */
+    public function count() {
+
+        // Search for entities which are either a Person
+        // or Organization.
+
+        // Get only the ids as all we need is the count.
+        $entities = get_posts( array(
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => array( 'organization', 'person' ),
+                ),
+            ),
+            'fields'         => 'ids',
+        ) );
+
+        // Finally return the count.
+        return count( $entities );
+    }
+
+    /**
+     * Search SQL filter for matching against post title only.
+     *
+     * @link    http://wordpress.stackexchange.com/a/11826/1685
+     *
+     * @since   3.15.0
+     *
+     * @param   string   $search   The search string.
+     * @param   WP_Query $wp_query The {@link WP_Query} instance.
+     *
+     * @return array|string An array of results.
+     */
+    public function limit_search_to_title( $search, $wp_query ) {
+
+        // Bail out if the search or the `search_terms` haven't been set.
+        if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+            return $search;
+        }
+
+        global $wpdb;
+
+        $query_vars = $wp_query->query_vars;
+        $percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+        $search     = array();
+
+        foreach ( (array) $query_vars['search_terms'] as $term ) {
+            $search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+        }
+
+        if ( ! is_user_logged_in() ) {
+            $search[] = "$wpdb->posts.post_password = ''";
+        }
+
+        $search = ' AND ' . implode( ' AND ', $search );
+
+        return $search;
+    }
+
+    /**
+     * Query WP for potential publishers, i.e. {@link WP_Post}s which are associated`
+     * with `wl_entity_type` (taxonomy) terms of `Organization` or `Person`.
+     *
+     * @since 3.11.0
+     *
+     * @param string $filter The title filter.
+     *
+     * @return array An array of results in a select2 friendly format.
+     */
+    public function query( $filter = '' ) {
+
+        // Search for the filter in the titles only.
+        add_filter( 'posts_search', array(
+            $this,
+            'limit_search_to_title',
+        ), 10, 2 );
+
+        /*
 		 * Search for entities which are either a Person
 		 * or Organization. Sort the results by title in ascending order.
 		 */
-		$entities = get_posts( array(
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
-				),
-			),
-			's'              => $filter,
-			'orderby'        => 'title',
-			'order'          => 'ASC',
-		) );
-
-		// Remove the search filter added before the query.
-		remove_filter( 'posts_search', array(
-			$this,
-			'limit_search_to_title',
-		), 10, 2 );
-
-		// Set a reference to ourselves to pass to the closure.
-		$publisher_service = $this;
-
-		// Map the results in a `Select2` compatible array.
-		return array_map( function ( $entity ) use ( $publisher_service ) {
-			$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			$thumb_id = get_post_thumbnail_id( $entity->ID );
-
-			return array(
-				'id'            => $entity->ID,
-				'text'          => $entity->post_title,
-				'type'          => $type[0]->name,
-				'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
-			);
-		}, $entities );
-	}
-
-	/**
-	 * Get the thumbnail's URL.
-	 *
-	 * @since 3.11.0
-	 *
-	 * @param int    $attachment_id The attachment id.
-	 * @param string $size          The attachment size (default = 'thumbnail').
-	 *
-	 * @return string|bool The image URL or false if not found.
-	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
-
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
-
-		return isset( $image['0'] ) ? $image['0'] : false;
-	}
-
-	/**
-	 * Add additional instructions to featured image metabox
-	 * when the entity type is the publisher.
-	 *
-	 * @since  3.19.0
-	 *
-	 * @param  string $content Current metabox content.
-	 *
-	 * @return string $content metabox content with additional instructions.
-	 */
-	public function add_featured_image_instruction( $content ) {
-		// Get the current post ID.
-		$post_id = get_the_ID();
-
-		// Get the publisher id.
-		$publisher_id = $this->configuration_service->get_publisher_id();
-
-
-		// Bail if for some reason the post id is not set.
-		if (
-			empty( $post_id ) ||
-			$post_id !== (int) $publisher_id
-		) {
-			return $content;
-		}
-
-		$terms = wp_get_post_terms(
-			$post_id, // The post id.
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // The taxonomy slug.
-			array(
-				'fields' => 'slugs',
-				// We don't need all fields, but only slugs.
-			)
-		);
-
-		// Check that the entity type is "Organization".
-		if ( in_array( 'organization', $terms, true ) ) {
-			// Add the featured image description when the type is "Organization".
-
-			$link = sprintf( '<a target="_blank" href="%s">%s</a>',
-				esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
-				esc_html__( 'AMP logo guidelines', 'wordlift' ) );
-			$content .= sprintf( '<p>'
-								 . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
-								 . '</p>', $link );
-		}
-
-		// Finally return the content.
-		return $content;
-	}
+        $entities = get_posts( array(
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => array( 'organization', 'person' ),
+                ),
+            ),
+            's'              => $filter,
+            'orderby'        => 'title',
+            'order'          => 'ASC',
+        ) );
+
+        // Remove the search filter added before the query.
+        remove_filter( 'posts_search', array(
+            $this,
+            'limit_search_to_title',
+        ), 10, 2 );
+
+        // Set a reference to ourselves to pass to the closure.
+        $publisher_service = $this;
+
+        // Map the results in a `Select2` compatible array.
+        return array_map( function ( $entity ) use ( $publisher_service ) {
+            $type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            $thumb_id = get_post_thumbnail_id( $entity->ID );
+
+            return array(
+                'id'            => $entity->ID,
+                'text'          => $entity->post_title,
+                'type'          => $type[0]->name,
+                'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+            );
+        }, $entities );
+    }
+
+    /**
+     * Get the thumbnail's URL.
+     *
+     * @since 3.11.0
+     *
+     * @param int    $attachment_id The attachment id.
+     * @param string $size          The attachment size (default = 'thumbnail').
+     *
+     * @return string|bool The image URL or false if not found.
+     */
+    public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+
+        $image = wp_get_attachment_image_src( $attachment_id, $size );
+
+        return isset( $image['0'] ) ? $image['0'] : false;
+    }
+
+    /**
+     * Add additional instructions to featured image metabox
+     * when the entity type is the publisher.
+     *
+     * @since  3.19.0
+     *
+     * @param  string $content Current metabox content.
+     *
+     * @return string $content metabox content with additional instructions.
+     */
+    public function add_featured_image_instruction( $content ) {
+        // Get the current post ID.
+        $post_id = get_the_ID();
+
+        // Get the publisher id.
+        $publisher_id = $this->configuration_service->get_publisher_id();
+
+
+        // Bail if for some reason the post id is not set.
+        if (
+            empty( $post_id ) ||
+            $post_id !== (int) $publisher_id
+        ) {
+            return $content;
+        }
+
+        $terms = wp_get_post_terms(
+            $post_id, // The post id.
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME, // The taxonomy slug.
+            array(
+                'fields' => 'slugs',
+                // We don't need all fields, but only slugs.
+            )
+        );
+
+        // Check that the entity type is "Organization".
+        if ( in_array( 'organization', $terms, true ) ) {
+            // Add the featured image description when the type is "Organization".
+
+            $link = sprintf( '<a target="_blank" href="%s">%s</a>',
+                esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
+                esc_html__( 'AMP logo guidelines', 'wordlift' ) );
+            $content .= sprintf( '<p>'
+                                    . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
+                                    . '</p>', $link );
+        }
+
+        // Finally return the content.
+        return $content;
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -34,7 +34,7 @@ 
 	 *
 	 * @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;
 	}
 
@@ -51,22 +51,22 @@ 
 		// or Organization.
 
 		// Get only the ids as all we need is the count.
-		$entities = get_posts( array(
+		$entities = get_posts(array(
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'tax_query'      => array(
 				array(
 					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
+					'terms'    => array('organization', 'person'),
 				),
 			),
 			'fields'         => 'ids',
-		) );
+		));
 
 		// Finally return the count.
-		return count( $entities );
+		return count($entities);
 	}
 
 	/**
@@ -81,28 +81,28 @@ 
 	 *
 	 * @return array|string An array of results.
 	 */
-	public function limit_search_to_title( $search, $wp_query ) {
+	public function limit_search_to_title($search, $wp_query) {
 
 		// Bail out if the search or the `search_terms` haven't been set.
-		if ( empty( $search ) || empty( $wp_query->query_vars['search_terms'] ) ) {
+		if (empty($search) || empty($wp_query->query_vars['search_terms'])) {
 			return $search;
 		}
 
 		global $wpdb;
 
 		$query_vars = $wp_query->query_vars;
-		$percent    = ! empty( $query_vars['exact'] ) ? '' : '%';
+		$percent    = ! empty($query_vars['exact']) ? '' : '%';
 		$search     = array();
 
-		foreach ( (array) $query_vars['search_terms'] as $term ) {
-			$search[] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $percent . $wpdb->esc_like( $term ) . $percent );
+		foreach ((array) $query_vars['search_terms'] as $term) {
+			$search[] = $wpdb->prepare("$wpdb->posts.post_title LIKE %s", $percent.$wpdb->esc_like($term).$percent);
 		}
 
-		if ( ! is_user_logged_in() ) {
+		if ( ! is_user_logged_in()) {
 			$search[] = "$wpdb->posts.post_password = ''";
 		}
 
-		$search = ' AND ' . implode( ' AND ', $search );
+		$search = ' AND '.implode(' AND ', $search);
 
 		return $search;
 	}
@@ -117,55 +117,55 @@ 
 	 *
 	 * @return array An array of results in a select2 friendly format.
 	 */
-	public function query( $filter = '' ) {
+	public function query($filter = '') {
 
 		// Search for the filter in the titles only.
-		add_filter( 'posts_search', array(
+		add_filter('posts_search', array(
 			$this,
 			'limit_search_to_title',
-		), 10, 2 );
+		), 10, 2);
 
 		/*
 		 * Search for entities which are either a Person
 		 * or Organization. Sort the results by title in ascending order.
 		 */
-		$entities = get_posts( array(
+		$entities = get_posts(array(
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'tax_query'      => array(
 				array(
 					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
 					'field'    => 'slug',
-					'terms'    => array( 'organization', 'person' ),
+					'terms'    => array('organization', 'person'),
 				),
 			),
 			's'              => $filter,
 			'orderby'        => 'title',
 			'order'          => 'ASC',
-		) );
+		));
 
 		// Remove the search filter added before the query.
-		remove_filter( 'posts_search', array(
+		remove_filter('posts_search', array(
 			$this,
 			'limit_search_to_title',
-		), 10, 2 );
+		), 10, 2);
 
 		// Set a reference to ourselves to pass to the closure.
 		$publisher_service = $this;
 
 		// Map the results in a `Select2` compatible array.
-		return array_map( function ( $entity ) use ( $publisher_service ) {
-			$type     = wp_get_post_terms( $entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			$thumb_id = get_post_thumbnail_id( $entity->ID );
+		return array_map(function($entity) use ($publisher_service) {
+			$type     = wp_get_post_terms($entity->ID, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+			$thumb_id = get_post_thumbnail_id($entity->ID);
 
 			return array(
 				'id'            => $entity->ID,
 				'text'          => $entity->post_title,
 				'type'          => $type[0]->name,
-				'thumbnail_url' => $publisher_service->get_attachment_image_url( $thumb_id ),
+				'thumbnail_url' => $publisher_service->get_attachment_image_url($thumb_id),
 			);
-		}, $entities );
+		}, $entities);
 	}
 
 	/**
@@ -178,11 +178,11 @@ 
 	 *
 	 * @return string|bool The image URL or false if not found.
 	 */
-	public function get_attachment_image_url( $attachment_id, $size = 'thumbnail' ) {
+	public function get_attachment_image_url($attachment_id, $size = 'thumbnail') {
 
-		$image = wp_get_attachment_image_src( $attachment_id, $size );
+		$image = wp_get_attachment_image_src($attachment_id, $size);
 
-		return isset( $image['0'] ) ? $image['0'] : false;
+		return isset($image['0']) ? $image['0'] : false;
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 *
 	 * @return string $content metabox content with additional instructions.
 	 */
-	public function add_featured_image_instruction( $content ) {
+	public function add_featured_image_instruction($content) {
 		// Get the current post ID.
 		$post_id = get_the_ID();
 
@@ -205,7 +205,7 @@ 
 
 		// Bail if for some reason the post id is not set.
 		if (
-			empty( $post_id ) ||
+			empty($post_id) ||
 			$post_id !== (int) $publisher_id
 		) {
 			return $content;
@@ -221,15 +221,15 @@ 
 		);
 
 		// Check that the entity type is "Organization".
-		if ( in_array( 'organization', $terms, true ) ) {
+		if (in_array('organization', $terms, true)) {
 			// Add the featured image description when the type is "Organization".
 
-			$link = sprintf( '<a target="_blank" href="%s">%s</a>',
-				esc_attr__( 'https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift' ),
-				esc_html__( 'AMP logo guidelines', 'wordlift' ) );
-			$content .= sprintf( '<p>'
-								 . esc_html_x( 'According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift' )
-								 . '</p>', $link );
+			$link = sprintf('<a target="_blank" href="%s">%s</a>',
+				esc_attr__('https://developers.google.com/search/docs/data-types/article#logo-guidelines', 'wordlift'),
+				esc_html__('AMP logo guidelines', 'wordlift'));
+			$content .= sprintf('<p>'
+								 . esc_html_x('According to the %s, the logo should fit in a 60x600px rectangle, and either be exactly 60px high (preferred), or exactly 600px wide. For example, 450x45px would not be acceptable, even though it fits in the 600x60px rectangle. To comply with the guidelines, WordLift will automatically resize the Featured Image for structured data formats.', 'After "According to the" goes the link to the "AMP logo guidelines".', 'wordlift')
+								 . '</p>', $link);
 		}
 
 		// Finally return the content.

src/admin/wordlift_admin_shortcodes.php

Indentation +7 added lines, -7 removed lines

@@ -9,11 +9,11 @@ 
  * Loads the buttons in TinyMCE.
  */
 function wl_admin_shortcode_buttons() {
-	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		// add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
-		add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
-	}
+    // Only add hooks when the current user has permissions AND is in Rich Text editor mode
+    if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+        // add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
+        add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
+    }
 }
 
 /**
@@ -24,9 +24,9 @@ 
  * @return array The buttons array including the *wl_shortcodes_menu*.
  */
 function wl_admin_shortcode_register_buttons( $buttons ) {
-	array_push( $buttons, 'wl_shortcodes_menu' );
+    array_push( $buttons, 'wl_shortcodes_menu' );
 
-	return $buttons;
+    return $buttons;
 }
 
 // init process for button control

Spacing +5 added lines, -5 removed lines

@@ -10,9 +10,9 @@ 
  */
 function wl_admin_shortcode_buttons() {
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
 		// add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
-		add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
+		add_filter('mce_buttons', 'wl_admin_shortcode_register_buttons');
 	}
 }
 
@@ -23,11 +23,11 @@ 
  *
  * @return array The buttons array including the *wl_shortcodes_menu*.
  */
-function wl_admin_shortcode_register_buttons( $buttons ) {
-	array_push( $buttons, 'wl_shortcodes_menu' );
+function wl_admin_shortcode_register_buttons($buttons) {
+	array_push($buttons, 'wl_shortcodes_menu');
 
 	return $buttons;
 }
 
 // init process for button control
-add_action( 'admin_init', 'wl_admin_shortcode_buttons' );
+add_action('admin_init', 'wl_admin_shortcode_buttons');

src/install/class-wordlift-install-3-18-3.php

Indentation +49 added lines, -49 removed lines

@@ -15,47 +15,47 @@ 
  * @subpackage Wordlift/install
  */
 class Wordlift_Install_3_18_3 extends Wordlift_Install {
-	/**
-	 * @inheritdoc
-	 */
-	protected static $version = '3.18.3';
+    /**
+     * @inheritdoc
+     */
+    protected static $version = '3.18.3';
 
-	/**
-	 * @inheritdoc
-	 */
-	public function install() {
-		$this->set_article_term_to_posts();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function install() {
+        $this->set_article_term_to_posts();
+    }
 
-	/**
-	 * Set default article term to posts
-	 * that exists in `wl_relation_instances` table.
-	 *
-	 * @since 3.18.3
-	 *
-	 * @return mixed False if the `article` doesn't exists.
-	 */
-	public function set_article_term_to_posts() {
-		// Load the global $wpdb;
-		global $wpdb;
+    /**
+     * Set default article term to posts
+     * that exists in `wl_relation_instances` table.
+     *
+     * @since 3.18.3
+     *
+     * @return mixed False if the `article` doesn't exists.
+     */
+    public function set_article_term_to_posts() {
+        // Load the global $wpdb;
+        global $wpdb;
 
-		// Get the article term.
-		$term = get_term_by(
-			'slug',
-			'article',
-			Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
-		);
+        // Get the article term.
+        $term = get_term_by(
+            'slug',
+            'article',
+            Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
+        );
 
-		// Bail if term doesn't exist.
-		if ( empty( $term ) ) {
-			return false;
-		}
+        // Bail if term doesn't exist.
+        if ( empty( $term ) ) {
+            return false;
+        }
 
-		// Set `article` term to all posts that exists in
-		// `wl_relation_instances` table and don't have `article` term set.
-		$post_ids = $wpdb->get_results(
-			$wpdb->prepare(
-				"
+        // Set `article` term to all posts that exists in
+        // `wl_relation_instances` table and don't have `article` term set.
+        $post_ids = $wpdb->get_results(
+            $wpdb->prepare(
+                "
 				SELECT DISTINCT p.ID
 				FROM $wpdb->posts AS p
 				INNER JOIN {$wpdb->prefix}wl_relation_instances AS ri
@@ -70,19 +70,19 @@ 
 					)
 				)
 				",
-				'post',
-				$term->term_id
-			)
-		);
+                'post',
+                $term->term_id
+            )
+        );
 
-		// Loop through all posts and set `article` term for each one.
-		foreach ($post_ids as $p) {
-			wp_set_object_terms(
-				(int) $p->ID,
-				$term->term_id,
-				Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
-			);
-		}
-	}
+        // Loop through all posts and set `article` term for each one.
+        foreach ($post_ids as $p) {
+            wp_set_object_terms(
+                (int) $p->ID,
+                $term->term_id,
+                Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
+            );
+        }
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		);
 
 		// Bail if term doesn't exist.
-		if ( empty( $term ) ) {
+		if (empty($term)) {
 			return false;
 		}
 

src/includes/class-wordlift-jsonld-website-converter.php

Indentation +55 added lines, -55 removed lines

@@ -15,68 +15,68 @@
  */
 class Wordlift_Website_Jsonld_Converter extends Wordlift_Post_To_Jsonld_Converter {
 
-	/**
-	 * Convert the home/blog page to a JSON-LD array.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @return array A JSON-LD array.
-	 */
-	public function create_schema() {
+    /**
+     * Convert the home/blog page to a JSON-LD array.
+     *
+     * @since 3.14.0
+     *
+     * @return array A JSON-LD array.
+     */
+    public function create_schema() {
 
-		// Create new jsonld.
-		$home_url = home_url( '/' );
+        // Create new jsonld.
+        $home_url = home_url( '/' );
 
-		$jsonld = array(
-			'@context'      => 'http://schema.org',
-			'@type'         => 'WebSite',
-			'@id'           => "$home_url#website",
-			'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
-			'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
-			'url'           => $home_url,
-		);
+        $jsonld = array(
+            '@context'      => 'http://schema.org',
+            '@type'         => 'WebSite',
+            '@id'           => "$home_url#website",
+            'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+            'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
+            'url'           => $home_url,
+        );
 
-		// Add publisher information.
-		$this->set_publisher( $jsonld );
+        // Add publisher information.
+        $this->set_publisher( $jsonld );
 
-		// Add search action.
-		$this->set_search_action( $jsonld );
+        // Add search action.
+        $this->set_search_action( $jsonld );
 
-		/**
-		 * Call the `wl_website_jsonld` filter.
-		 *
-		 * @api
-		 *
-		 * @since 3.14.0
-		 *
-		 * @param array $jsonld The JSON-LD structure.
-		 */
-		return apply_filters( 'wl_website_jsonld', $jsonld );
-	}
+        /**
+         * Call the `wl_website_jsonld` filter.
+         *
+         * @api
+         *
+         * @since 3.14.0
+         *
+         * @param array $jsonld The JSON-LD structure.
+         */
+        return apply_filters( 'wl_website_jsonld', $jsonld );
+    }
 
-	/**
-	 * Add SearchAction part to the schema
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param array $params The parameters array.
-	 */
-	private function set_search_action( &$params ) {
-		/**
-		 * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
-		 *
-		 * @since  3.14.0
-		 * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
-		 */
-		$search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
+    /**
+     * Add SearchAction part to the schema
+     *
+     * @since 3.14.0
+     *
+     * @param array $params The parameters array.
+     */
+    private function set_search_action( &$params ) {
+        /**
+         * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
+         *
+         * @since  3.14.0
+         * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
+         */
+        $search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
 
-		// Add search action
-		$params['potentialAction'] = array(
-			'@type'       => 'SearchAction',
-			'target'      => $search_url,
-			'query-input' => 'required name=search_term_string',
-		);
+        // Add search action
+        $params['potentialAction'] = array(
+            '@type'       => 'SearchAction',
+            'target'      => $search_url,
+            'query-input' => 'required name=search_term_string',
+        );
 
-	}
+    }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -25,22 +25,22 @@ 
 	public function create_schema() {
 
 		// Create new jsonld.
-		$home_url = home_url( '/' );
+		$home_url = home_url('/');
 
 		$jsonld = array(
 			'@context'      => 'http://schema.org',
 			'@type'         => 'WebSite',
 			'@id'           => "$home_url#website",
-			'name'          => html_entity_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
-			'alternateName' => html_entity_decode( get_bloginfo( 'description' ), ENT_QUOTES ),
+			'name'          => html_entity_decode(get_bloginfo('name'), ENT_QUOTES),
+			'alternateName' => html_entity_decode(get_bloginfo('description'), ENT_QUOTES),
 			'url'           => $home_url,
 		);
 
 		// Add publisher information.
-		$this->set_publisher( $jsonld );
+		$this->set_publisher($jsonld);
 
 		// Add search action.
-		$this->set_search_action( $jsonld );
+		$this->set_search_action($jsonld);
 
 		/**
 		 * Call the `wl_website_jsonld` filter.
@@ -51,7 +51,7 @@ 
 		 *
 		 * @param array $jsonld The JSON-LD structure.
 		 */
-		return apply_filters( 'wl_website_jsonld', $jsonld );
+		return apply_filters('wl_website_jsonld', $jsonld);
 	}
 
 	/**
@@ -61,14 +61,14 @@ 
 	 *
 	 * @param array $params The parameters array.
 	 */
-	private function set_search_action( &$params ) {
+	private function set_search_action(&$params) {
 		/**
 		 * Filter: 'wl_jsonld_search_url' - Allows filtering of the search URL.
 		 *
 		 * @since  3.14.0
 		 * @api    string $search_url The search URL for this site with a `{search_term_string}` variable.
 		 */
-		$search_url = apply_filters( 'wl_jsonld_search_url', home_url( '/' ) . '?s={search_term_string}' );
+		$search_url = apply_filters('wl_jsonld_search_url', home_url('/').'?s={search_term_string}');
 
 		// Add search action
 		$params['potentialAction'] = array(

src/admin/partials/wordlift-admin-news-widget.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <?php $articles = $this->get_last_wordlift_articles(); ?>
 <div id='news_container'>
-	<?php if ( ! empty( $articles['posts_data'] ) ) { ?>
-		<?php foreach ( $articles['posts_data'] as $key => $item ) { ?>
+	<?php if ( ! empty($articles['posts_data'])) { ?>
+		<?php foreach ($articles['posts_data'] as $key => $item) { ?>
             <div>
                 <a target="_blank"
-                   href="<?php echo esc_url( $item['post_url'] ); ?>"><?php echo esc_html( $item['post_title'] ); ?></a>
+                   href="<?php echo esc_url($item['post_url']); ?>"><?php echo esc_html($item['post_title']); ?></a>
                 <p><?php echo $item['post_description']; ?></p>
             </div>
 		<?php } ?>
 	<?php } ?>
     <div>
         <a href="#" id="max_posts_count_3"
-           class="wl_more_posts"><?php echo esc_html__( 'More posts', 'wordlift' ); ?></a>
+           class="wl_more_posts"><?php echo esc_html__('More posts', 'wordlift'); ?></a>
     </div>
 </div>

src/admin/partials/admin-setup/step-1.php

Spacing +10 added lines, -10 removed lines

@@ -1,42 +1,42 @@ 
 <!-- Pane 1 content -->
 <script type="text/html" id="page-0">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Welcome', 'wordlift' ); ?>
+		<?php esc_html_e('Welcome', 'wordlift'); ?>
 	</h2>
 
 	<p class="page-txt">
-		   <?php esc_html_e( 'Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift' ); ?>
+		   <?php esc_html_e('Thank you for downloading WordLift. Now you can boost your website with a double-digit growth. WordLift helps you with:', 'wordlift'); ?>
 	</p>
 
 	<ul class="page-list">
 		<li>
 			<span class="fa fa-university"></span>
-			<?php esc_html_e( 'Trustworthiness', 'wordlift' ); ?>
+			<?php esc_html_e('Trustworthiness', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-map-marker"></span>
-			<?php esc_html_e( 'Enrichment', 'wordlift' ); ?>
+			<?php esc_html_e('Enrichment', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-heart"></span>
-			<?php esc_html_e( 'Engagement', 'wordlift' ); ?>
+			<?php esc_html_e('Engagement', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-hand-o-right"></span>
-			<?php esc_html_e( 'Smart Navigation', 'wordlift' ); ?>
+			<?php esc_html_e('Smart Navigation', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-google"></span>
-			<?php esc_html_e( 'SEO Optimization', 'wordlift' ); ?>
+			<?php esc_html_e('SEO Optimization', 'wordlift'); ?>
 		</li>
 
 		<li>
 			<span class="fa fa-group"></span>
-			<?php esc_html_e( 'Content Marketing', 'wordlift' ); ?>
+			<?php esc_html_e('Content Marketing', 'wordlift'); ?>
 		</li>
 	</ul>
 
@@ -46,13 +46,13 @@ 
 				target="_tab"
 				class="button"
 			>
-				<?php esc_html_e( 'Learn More', 'wordlift' ); ?>
+				<?php esc_html_e('Learn More', 'wordlift'); ?>
 			</a>
 			<input
 				type="button"
 				data-wl-next="wl-next"
 				class="wl-default-action"
-				value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+				value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 			>
 	</div>
 </script>
\ No newline at end of file

src/admin/partials/admin-setup/step-4.php

Spacing +4 added lines, -4 removed lines

@@ -1,11 +1,11 @@ 
 <!-- Pane 4 content -->
 <script type="text/html" id="page-3">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Vocabulary', 'wordlift' ); ?>	
+		<?php esc_html_e('Vocabulary', 'wordlift'); ?>	
 	</h2>
 
 	<p class="page-txt">
-		<?php esc_html_e( 'All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift' ); ?>
+		<?php esc_html_e('All new pages created with WordLift, will be stored inside your internal vocabulary. You can customize the url pattern of these pages in the field below. Check our FAQs if you need more info.', 'wordlift'); ?>
 	</p>
 
 	<input
@@ -19,7 +19,7 @@ 
 	>
 	
 	<p class="page-det">
-		<?php esc_html_e( 'Leave it empty to place your entities in the root folder of your website', 'wordlift' ); ?>
+		<?php esc_html_e('Leave it empty to place your entities in the root folder of your website', 'wordlift'); ?>
 	</p>
 	
 	<div class="btn-wrapper">
@@ -27,7 +27,7 @@ 
 			type="button"
 			data-wl-next="wl-next"
 			class="wl-default-action"
-			value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>

src/admin/partials/admin-setup/step-2.php

Indentation +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	<br>
 	<p class="page-txt">
 		<?php
-			esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' ); 
-		?>
+            esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' ); 
+        ?>
 	</p>
 	<input
 		type="checkbox"

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@ 
 <!-- Pane 2 content -->
 <script type="text/html" id="page-1">
 	<h2 class="page-title">
-		<?php esc_html_e( 'Diagnostic', 'wordlift' ); ?>
+		<?php esc_html_e('Diagnostic', 'wordlift'); ?>
 	</h2>
 	<br>
 	<p class="page-txt">
 		<?php
-			esc_html_e( 'Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift' ); 
+			esc_html_e('Help us improve our product by automatically sending diagnostic and usage data.', 'wordlift'); 
 		?>
 	</p>
 	<input
@@ -17,12 +17,12 @@ 
 		checked
 	>
 	<label for="share-diagnostic">
-		<?php esc_html_e( 'Share diagnostic data', 'wordlift' ); ?>
+		<?php esc_html_e('Share diagnostic data', 'wordlift'); ?>
 	</label>
 	
 	<p class="privacy-policy-details">
 		<a href="https://wordlift.io/privacy-policy/" target="_blank">
-			<?php esc_html_e( 'About our privacy policy...', 'wordlift' ); ?>	
+			<?php esc_html_e('About our privacy policy...', 'wordlift'); ?>	
 		</a>
 	</p>
 
@@ -31,7 +31,7 @@ 
 			type="button"
 			data-wl-next="wl-next"
 			class="wl-default-action"
-			value="<?php esc_attr_e( 'Next', 'wordlift' ); ?>"
+			value="<?php esc_attr_e('Next', 'wordlift'); ?>"
 		>
 	</div>
 </script>