insideout10 / wordlift-plugin

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

Indentation +715 added lines, -715 removed lines

@@ -7,730 +7,730 @@ 
  */
 class Wordlift_Schema_Service {
 
-	/**
-	 * The 'author' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_AUTHOR = 'wl_author';
-
-	/**
-	 * The 'same as' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_SAME_AS = 'entity_same_as';
-
-	/**
-	 * The 'date start' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_DATE_START = 'wl_cal_date_start';
-
-	/**
-	 * The 'date end' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_DATE_END = 'wl_cal_date_end';
-
-	/**
-	 * The 'location' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_LOCATION = 'wl_location';
-
-	/**
-	 * The 'founder' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_FOUNDER = 'wl_founder';
-
-	/**
-	 * The 'knows' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_KNOWS = 'wl_knows';
-
-	/**
-	 * The 'birth date' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_BIRTH_DATE = 'wl_birth_date';
-
-	/**
-	 * The 'birth place' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_BIRTH_PLACE = 'wl_birth_place';
-
-	/**
-	 * The 'latitude' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_GEO_LATITUDE = 'wl_geo_latitude';
-
-	/**
-	 * The 'longitude' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_GEO_LONGITUDE = 'wl_geo_longitude';
-
-	/**
-	 * The 'streetAddress' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_ADDRESS = 'wl_address';
+    /**
+     * The 'author' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_AUTHOR = 'wl_author';
+
+    /**
+     * The 'same as' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_SAME_AS = 'entity_same_as';
+
+    /**
+     * The 'date start' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_DATE_START = 'wl_cal_date_start';
+
+    /**
+     * The 'date end' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_DATE_END = 'wl_cal_date_end';
+
+    /**
+     * The 'location' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_LOCATION = 'wl_location';
+
+    /**
+     * The 'founder' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_FOUNDER = 'wl_founder';
+
+    /**
+     * The 'knows' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_KNOWS = 'wl_knows';
+
+    /**
+     * The 'birth date' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_BIRTH_DATE = 'wl_birth_date';
+
+    /**
+     * The 'birth place' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_BIRTH_PLACE = 'wl_birth_place';
+
+    /**
+     * The 'latitude' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_GEO_LATITUDE = 'wl_geo_latitude';
+
+    /**
+     * The 'longitude' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_GEO_LONGITUDE = 'wl_geo_longitude';
+
+    /**
+     * The 'streetAddress' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_ADDRESS = 'wl_address';
 	
-	/**
-	 * The 'postOfficeBoxNumber' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_PO_BOX = 'wl_address_post_office_box';
+    /**
+     * The 'postOfficeBoxNumber' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_PO_BOX = 'wl_address_post_office_box';
 	
-		/**
-	 * The 'postalCode' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_POSTAL_CODE = 'wl_address_postal_code';
+        /**
+         * The 'postalCode' field name.
+         *
+         * @since 3.3.0
+         */
+    const FIELD_ADDRESS_POSTAL_CODE = 'wl_address_postal_code';
 	
-		/**
-	 * The 'addressLocality' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_LOCALITY = 'wl_address_locality';
-	/**
-	 * The 'addressRegion' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_REGION = 'wl_address_region';
+        /**
+         * The 'addressLocality' field name.
+         *
+         * @since 3.3.0
+         */
+    const FIELD_ADDRESS_LOCALITY = 'wl_address_locality';
+    /**
+     * The 'addressRegion' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_REGION = 'wl_address_region';
 	
-	/**
-	 * The 'addressCountry' field name.
-	 *
-	 * @since 3.3.0
-	 */
-	const FIELD_ADDRESS_COUNTRY = 'wl_address_country';
-
-	/**
-	 * The 'entity type' field name.
-	 *
-	 * @since 3.1.0
-	 */
-	const FIELD_ENTITY_TYPE = 'wl_entity_type_uri';
+    /**
+     * The 'addressCountry' field name.
+     *
+     * @since 3.3.0
+     */
+    const FIELD_ADDRESS_COUNTRY = 'wl_address_country';
+
+    /**
+     * The 'entity type' field name.
+     *
+     * @since 3.1.0
+     */
+    const FIELD_ENTITY_TYPE = 'wl_entity_type_uri';
 	
-	/**
-	 * The 'email' field name.
-	 *
-	 * @since 3.2.0
-	 */
-	const FIELD_EMAIL = 'wl_email';
+    /**
+     * The 'email' field name.
+     *
+     * @since 3.2.0
+     */
+    const FIELD_EMAIL = 'wl_email';
 	
-	/**
-	 * The 'affiliation' field name.
-	 *
-	 * @since 3.2.0
-	 */
-	const FIELD_AFFILIATION = 'wl_affiliation';
-
-	/**
-	 * The 'URI' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_URI = 'uri';
-
-	/**
-	 * The 'date' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_DATE = 'date';
-
-	/**
-	 * The 'double' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_DOUBLE = 'double';
-
-	/**
-	 * The 'string' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_STRING = 'string';
-
-	/**
-	 * The 'integer' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_INTEGER = 'int';
-
-	/**
-	 * The 'boolean' data type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const DATA_TYPE_BOOLEAN = 'bool';
-
-	/**
-	 * The schema.org Event type URI.
-	 *
-	 * @since 3.1.0
-	 */
-	const SCHEMA_EVENT_TYPE = 'http://schema.org/Event';
-
-	/**
-	 * The Schema service singleton instance.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $instance The Schema service singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * WordLift's schema.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var array $schema WordLift's schema.
-	 */
-	private $schema;
-
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Wordlift_Schema_Service constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
-
-		// Create a singleton instance of the Schema service, useful to provide static functions to global functions.
-		self::$instance = $this;
-
-		// Set the taxonomy data.
-		// Note: parent types must be defined before child types.
-		$this->schema = array(
-			'thing'         => $this->get_thing_schema(),
-			'creative-work' => $this->get_creative_work_schema(),
-			'event'         => $this->get_event_schema(),
-			'organization'  => $this->get_organization_schema(),
-			'person'        => $this->get_person_schema(),
-			'place'         => $this->get_place_schema(),
-			'localbusiness' => $this->get_local_business_schema()
-		);
-
-	}
-
-	/**
-	 * Get a reference to the Schema service.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return Wordlift_Schema_Service A reference to the Schema service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the WordLift's schema.
-	 *
-	 * @param string $name The schema name.
-	 *
-	 * @return array|null An array with the schema configuration or NULL if the schema is not found.
-	 *
-	 * @since 3.1.0
-	 */
-	public function get_schema( $name ) {
-
-		// $this->log_service->trace( "Get schema [ name :: $name ]" );
-
-		// Check if the schema exists and, if not, return NULL.
-		if ( ! isset( $this->schema[ $name ] ) ) {
-			return null;
-		}
-
-		// Return the requested schema.
-		return $this->schema[ $name ];
-	}
-
-	/**
-	 * Get the WordLift's schema trough schema type uri.
-	 *
-	 * @param string $uri The schema uri.
-	 *
-	 * @return array|null An array with the schema configuration or NULL if the schema is not found.
-	 *
-	 * @since 3.3.0
-	 */
-	public function get_schema_by_uri( $uri ) {
-
-		foreach ( $this->schema as $name => $schema ) {
-			if ( $schema[ 'uri' ] === $uri ) {
-				return $schema;
-			}
-		}
-		return null;
-
-		// Return the requested schema.
-		return $this->schema[ $name ];
-	}
-
-	/**
-	 * Get the 'thing' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_thing_schema() {
-
-		return array(
-			'css_class'          => 'wl-thing',
-			'uri'                => 'http://schema.org/Thing',
-			'same_as'            => array( '*' ), // set as default.
-			'custom_fields'      => array(
-				self::FIELD_SAME_AS => array(
-					'predicate'   => 'http://schema.org/sameAs',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Thing',
-					'constraints' => array(
-						'cardinality' => INF
-					),
-					'input_field' => 'sameas'   // we need a custom metabox
-				)
-			),
-			// {{sameAs}} not present in the microdata template,
-			// because it is treated separately in *wl_content_embed_item_microdata*
-			'microdata_template' => '',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-	}
-
-	/**
-	 * Get the 'creative work' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_creative_work_schema() {
-
-		$schema = array(
-			'label'              => 'CreativeWork',
-			'description'        => 'A creative work (or a Music Album).',
-			'parents'            => array( 'thing' ), // give term slug as parent
-			'css_class'          => 'wl-creative-work',
-			'uri'                => 'http://schema.org/CreativeWork',
-			'same_as'            => array(
-				'http://schema.org/MusicAlbum',
-				'http://schema.org/Product'
-			),
-			'custom_fields'      => array(
-				self::FIELD_AUTHOR => array(
-					'predicate'   => 'http://schema.org/author',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => array( 'Person', 'Organization' ),
-						'cardinality' => INF
-					)
-				),
-			),
-			'microdata_template' => '{{author}}',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'event' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_event_schema() {
-
-		$schema = array(
-			'label'              => 'Event',
-			'description'        => 'An event . ',
-			'parents'            => array( 'thing' ),
-			'css_class'          => 'wl-event',
-			'uri'                => self::SCHEMA_EVENT_TYPE,
-			'same_as'            => array( 'http://dbpedia.org/ontology/Event' ),
-			'custom_fields'      => array(
-				self::FIELD_DATE_START => array(
-					'predicate'   => 'http://schema.org/startDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:datetime',
-					'constraints' => ''
-				),
-				self::FIELD_DATE_END   => array(
-					'predicate'   => 'http://schema.org/endDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:datetime',
-					'constraints' => ''
-				),
-				self::FIELD_LOCATION   => array(
-					'predicate'   => 'http://schema.org/location',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/PostalAddress',
-					'constraints' => array(
-						'uri_type'    => array( 'Place', 'LocalBusiness' ),
-						'cardinality' => INF
-					)
-				)
-			),
-			'microdata_template' =>
-				'{{startDate}}
+    /**
+     * The 'affiliation' field name.
+     *
+     * @since 3.2.0
+     */
+    const FIELD_AFFILIATION = 'wl_affiliation';
+
+    /**
+     * The 'URI' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_URI = 'uri';
+
+    /**
+     * The 'date' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_DATE = 'date';
+
+    /**
+     * The 'double' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_DOUBLE = 'double';
+
+    /**
+     * The 'string' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_STRING = 'string';
+
+    /**
+     * The 'integer' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_INTEGER = 'int';
+
+    /**
+     * The 'boolean' data type name.
+     *
+     * @since 3.1.0
+     */
+    const DATA_TYPE_BOOLEAN = 'bool';
+
+    /**
+     * The schema.org Event type URI.
+     *
+     * @since 3.1.0
+     */
+    const SCHEMA_EVENT_TYPE = 'http://schema.org/Event';
+
+    /**
+     * The Schema service singleton instance.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Schema_Service $instance The Schema service singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * WordLift's schema.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var array $schema WordLift's schema.
+     */
+    private $schema;
+
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Wordlift_Schema_Service constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
+
+        // Create a singleton instance of the Schema service, useful to provide static functions to global functions.
+        self::$instance = $this;
+
+        // Set the taxonomy data.
+        // Note: parent types must be defined before child types.
+        $this->schema = array(
+            'thing'         => $this->get_thing_schema(),
+            'creative-work' => $this->get_creative_work_schema(),
+            'event'         => $this->get_event_schema(),
+            'organization'  => $this->get_organization_schema(),
+            'person'        => $this->get_person_schema(),
+            'place'         => $this->get_place_schema(),
+            'localbusiness' => $this->get_local_business_schema()
+        );
+
+    }
+
+    /**
+     * Get a reference to the Schema service.
+     *
+     * @since 3.1.0
+     *
+     * @return Wordlift_Schema_Service A reference to the Schema service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the WordLift's schema.
+     *
+     * @param string $name The schema name.
+     *
+     * @return array|null An array with the schema configuration or NULL if the schema is not found.
+     *
+     * @since 3.1.0
+     */
+    public function get_schema( $name ) {
+
+        // $this->log_service->trace( "Get schema [ name :: $name ]" );
+
+        // Check if the schema exists and, if not, return NULL.
+        if ( ! isset( $this->schema[ $name ] ) ) {
+            return null;
+        }
+
+        // Return the requested schema.
+        return $this->schema[ $name ];
+    }
+
+    /**
+     * Get the WordLift's schema trough schema type uri.
+     *
+     * @param string $uri The schema uri.
+     *
+     * @return array|null An array with the schema configuration or NULL if the schema is not found.
+     *
+     * @since 3.3.0
+     */
+    public function get_schema_by_uri( $uri ) {
+
+        foreach ( $this->schema as $name => $schema ) {
+            if ( $schema[ 'uri' ] === $uri ) {
+                return $schema;
+            }
+        }
+        return null;
+
+        // Return the requested schema.
+        return $this->schema[ $name ];
+    }
+
+    /**
+     * Get the 'thing' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_thing_schema() {
+
+        return array(
+            'css_class'          => 'wl-thing',
+            'uri'                => 'http://schema.org/Thing',
+            'same_as'            => array( '*' ), // set as default.
+            'custom_fields'      => array(
+                self::FIELD_SAME_AS => array(
+                    'predicate'   => 'http://schema.org/sameAs',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Thing',
+                    'constraints' => array(
+                        'cardinality' => INF
+                    ),
+                    'input_field' => 'sameas'   // we need a custom metabox
+                )
+            ),
+            // {{sameAs}} not present in the microdata template,
+            // because it is treated separately in *wl_content_embed_item_microdata*
+            'microdata_template' => '',
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+    }
+
+    /**
+     * Get the 'creative work' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_creative_work_schema() {
+
+        $schema = array(
+            'label'              => 'CreativeWork',
+            'description'        => 'A creative work (or a Music Album).',
+            'parents'            => array( 'thing' ), // give term slug as parent
+            'css_class'          => 'wl-creative-work',
+            'uri'                => 'http://schema.org/CreativeWork',
+            'same_as'            => array(
+                'http://schema.org/MusicAlbum',
+                'http://schema.org/Product'
+            ),
+            'custom_fields'      => array(
+                self::FIELD_AUTHOR => array(
+                    'predicate'   => 'http://schema.org/author',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => array( 'Person', 'Organization' ),
+                        'cardinality' => INF
+                    )
+                ),
+            ),
+            'microdata_template' => '{{author}}',
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'event' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_event_schema() {
+
+        $schema = array(
+            'label'              => 'Event',
+            'description'        => 'An event . ',
+            'parents'            => array( 'thing' ),
+            'css_class'          => 'wl-event',
+            'uri'                => self::SCHEMA_EVENT_TYPE,
+            'same_as'            => array( 'http://dbpedia.org/ontology/Event' ),
+            'custom_fields'      => array(
+                self::FIELD_DATE_START => array(
+                    'predicate'   => 'http://schema.org/startDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:datetime',
+                    'constraints' => ''
+                ),
+                self::FIELD_DATE_END   => array(
+                    'predicate'   => 'http://schema.org/endDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:datetime',
+                    'constraints' => ''
+                ),
+                self::FIELD_LOCATION   => array(
+                    'predicate'   => 'http://schema.org/location',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/PostalAddress',
+                    'constraints' => array(
+                        'uri_type'    => array( 'Place', 'LocalBusiness' ),
+                        'cardinality' => INF
+                    )
+                )
+            ),
+            'microdata_template' =>
+                '{{startDate}}
                                 {{endDate}}
                                 {{location}}',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'organization' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_organization_schema() {
-
-		$schema = array(
-			'label'              => 'Organization',
-			'description'        => 'An organization, including a government or a newspaper.',
-			'parents'            => array( 'thing' ),
-			'css_class'          => 'wl-organization',
-			'uri'                => 'http://schema.org/Organization',
-			'same_as'            => array(
-				'http://rdf.freebase.com/ns/organization.organization',
-				'http://rdf.freebase.com/ns/government.government',
-				'http://schema.org/Newspaper'
-			),
-			'custom_fields'      => array(
-				self::FIELD_FOUNDER => array(
-					'predicate'   => 'http://schema.org/founder',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => 'Person',
-						'cardinality' => INF
-					)
-				),
-				self::FIELD_ADDRESS       => array(
-					'predicate'   => 'http://schema.org/streetAddress',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_PO_BOX => array(
-					'predicate'   => 'http://schema.org/postOfficeBoxNumber',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_POSTAL_CODE       => array(
-					'predicate'   => 'http://schema.org/postalCode',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_LOCALITY       => array(
-					'predicate'   => 'http://schema.org/addressLocality',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_REGION       => array(
-					'predicate'   => 'http://schema.org/addressRegion',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_COUNTRY       => array(
-					'predicate'   => 'http://schema.org/addressCountry',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_EMAIL => array(
-					'predicate'   => 'http://schema.org/email',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => ''
-				)
-			),
-			'microdata_template' =>
-				'{{founder}}
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'organization' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_organization_schema() {
+
+        $schema = array(
+            'label'              => 'Organization',
+            'description'        => 'An organization, including a government or a newspaper.',
+            'parents'            => array( 'thing' ),
+            'css_class'          => 'wl-organization',
+            'uri'                => 'http://schema.org/Organization',
+            'same_as'            => array(
+                'http://rdf.freebase.com/ns/organization.organization',
+                'http://rdf.freebase.com/ns/government.government',
+                'http://schema.org/Newspaper'
+            ),
+            'custom_fields'      => array(
+                self::FIELD_FOUNDER => array(
+                    'predicate'   => 'http://schema.org/founder',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => 'Person',
+                        'cardinality' => INF
+                    )
+                ),
+                self::FIELD_ADDRESS       => array(
+                    'predicate'   => 'http://schema.org/streetAddress',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_PO_BOX => array(
+                    'predicate'   => 'http://schema.org/postOfficeBoxNumber',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_POSTAL_CODE       => array(
+                    'predicate'   => 'http://schema.org/postalCode',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_LOCALITY       => array(
+                    'predicate'   => 'http://schema.org/addressLocality',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_REGION       => array(
+                    'predicate'   => 'http://schema.org/addressRegion',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_COUNTRY       => array(
+                    'predicate'   => 'http://schema.org/addressCountry',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_EMAIL => array(
+                    'predicate'   => 'http://schema.org/email',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => ''
+                )
+            ),
+            'microdata_template' =>
+                '{{founder}}
 				<span itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
 					{{streetAddress}}{{postOfficeBoxNumber}}{{postalCode}}{{addressLocality}}{{addressRegion}}{{addressCountry}}{{email}}
 				</span>',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'person' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_person_schema() {
-
-		$schema = array(
-			'label'              => 'Person',
-			'description'        => 'A person (or a music artist).',
-			'parents'            => array( 'thing' ),
-			'css_class'          => 'wl-person',
-			'uri'                => 'http://schema.org/Person',
-			'same_as'            => array(
-				'http://rdf.freebase.com/ns/people.person',
-				'http://rdf.freebase.com/ns/music.artist',
-				'http://dbpedia.org/class/yago/LivingPeople'
-			),
-			'custom_fields'      => array(
-				self::FIELD_KNOWS       => array(
-					'predicate'   => 'http://schema.org/knows',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Person',
-					'constraints' => array(
-						'uri_type'    => 'Person',
-						'cardinality' => INF
-					)
-				),
-				self::FIELD_BIRTH_DATE  => array(
-					'predicate'   => 'http://schema.org/birthDate',
-					'type'        => self::DATA_TYPE_DATE,
-					'export_type' => 'xsd:date',
-					'constraints' => ''
-				),
-				self::FIELD_BIRTH_PLACE => array(
-					'predicate'   => 'http://schema.org/birthPlace',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Place',
-					'constraints' => array(
-						'uri_type' => 'Place'
-					)
-				),
-				self::FIELD_AFFILIATION => array(
-					'predicate'   => 'http://schema.org/affiliation',
-					'type'        => self::DATA_TYPE_URI,
-					'export_type' => 'http://schema.org/Organization',
-					'constraints' => array(
-						'uri_type' => array( 'Organization', 'LocalBusiness' ),
-						'cardinality' => INF
-					)
-				),
-				self::FIELD_EMAIL => array(
-					'predicate'   => 'http://schema.org/email',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => array(
-						'cardinality' => INF
-					)
-				)
-			),
-			'microdata_template' =>
-				'{{birthDate}}
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'person' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_person_schema() {
+
+        $schema = array(
+            'label'              => 'Person',
+            'description'        => 'A person (or a music artist).',
+            'parents'            => array( 'thing' ),
+            'css_class'          => 'wl-person',
+            'uri'                => 'http://schema.org/Person',
+            'same_as'            => array(
+                'http://rdf.freebase.com/ns/people.person',
+                'http://rdf.freebase.com/ns/music.artist',
+                'http://dbpedia.org/class/yago/LivingPeople'
+            ),
+            'custom_fields'      => array(
+                self::FIELD_KNOWS       => array(
+                    'predicate'   => 'http://schema.org/knows',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Person',
+                    'constraints' => array(
+                        'uri_type'    => 'Person',
+                        'cardinality' => INF
+                    )
+                ),
+                self::FIELD_BIRTH_DATE  => array(
+                    'predicate'   => 'http://schema.org/birthDate',
+                    'type'        => self::DATA_TYPE_DATE,
+                    'export_type' => 'xsd:date',
+                    'constraints' => ''
+                ),
+                self::FIELD_BIRTH_PLACE => array(
+                    'predicate'   => 'http://schema.org/birthPlace',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Place',
+                    'constraints' => array(
+                        'uri_type' => 'Place'
+                    )
+                ),
+                self::FIELD_AFFILIATION => array(
+                    'predicate'   => 'http://schema.org/affiliation',
+                    'type'        => self::DATA_TYPE_URI,
+                    'export_type' => 'http://schema.org/Organization',
+                    'constraints' => array(
+                        'uri_type' => array( 'Organization', 'LocalBusiness' ),
+                        'cardinality' => INF
+                    )
+                ),
+                self::FIELD_EMAIL => array(
+                    'predicate'   => 'http://schema.org/email',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => array(
+                        'cardinality' => INF
+                    )
+                )
+            ),
+            'microdata_template' =>
+                '{{birthDate}}
                  {{birthPlace}}
                  {{knows}}
 				 {{affiliation}}
 				 {{email}}',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-
-	}
-
-	/**
-	 * Get the 'place' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_place_schema() {
-
-		$schema = array(
-			'label'              => 'Place',
-			'description'        => 'A place.',
-			'parents'            => array( 'thing' ),
-			'css_class'          => 'wl-place',
-			'uri'                => 'http://schema.org/Place',
-			'same_as'            => array(
-				'http://rdf.freebase.com/ns/location.location',
-				'http://www.opengis.net/gml/_Feature'
-			),
-			'custom_fields'      => array(
-				self::FIELD_GEO_LATITUDE  => array(
-					'predicate'   => 'http://schema.org/latitude',
-					'type'        => self::DATA_TYPE_DOUBLE,
-					'export_type' => 'xsd:double',
-					'constraints' => '',
-					'input_field' => 'coordinates'   // to build custom metabox
-				),
-				self::FIELD_GEO_LONGITUDE => array(
-					'predicate'   => 'http://schema.org/longitude',
-					'type'        => self::DATA_TYPE_DOUBLE,
-					'export_type' => 'xsd:double',
-					'constraints' => '',
-					'input_field' => 'coordinates'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS       => array(
-					'predicate'   => 'http://schema.org/streetAddress',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_PO_BOX => array(
-					'predicate'   => 'http://schema.org/postOfficeBoxNumber',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_POSTAL_CODE       => array(
-					'predicate'   => 'http://schema.org/postalCode',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_LOCALITY       => array(
-					'predicate'   => 'http://schema.org/addressLocality',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_REGION       => array(
-					'predicate'   => 'http://schema.org/addressRegion',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				),
-				self::FIELD_ADDRESS_COUNTRY       => array(
-					'predicate'   => 'http://schema.org/addressCountry',
-					'type'        => self::DATA_TYPE_STRING,
-					'export_type' => 'xsd:string',
-					'constraints' => '',
-					'input_field' => 'address'   // to build custom metabox
-				)				
-			),
-			'microdata_template' =>
-				'<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+
+    }
+
+    /**
+     * Get the 'place' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_place_schema() {
+
+        $schema = array(
+            'label'              => 'Place',
+            'description'        => 'A place.',
+            'parents'            => array( 'thing' ),
+            'css_class'          => 'wl-place',
+            'uri'                => 'http://schema.org/Place',
+            'same_as'            => array(
+                'http://rdf.freebase.com/ns/location.location',
+                'http://www.opengis.net/gml/_Feature'
+            ),
+            'custom_fields'      => array(
+                self::FIELD_GEO_LATITUDE  => array(
+                    'predicate'   => 'http://schema.org/latitude',
+                    'type'        => self::DATA_TYPE_DOUBLE,
+                    'export_type' => 'xsd:double',
+                    'constraints' => '',
+                    'input_field' => 'coordinates'   // to build custom metabox
+                ),
+                self::FIELD_GEO_LONGITUDE => array(
+                    'predicate'   => 'http://schema.org/longitude',
+                    'type'        => self::DATA_TYPE_DOUBLE,
+                    'export_type' => 'xsd:double',
+                    'constraints' => '',
+                    'input_field' => 'coordinates'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS       => array(
+                    'predicate'   => 'http://schema.org/streetAddress',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_PO_BOX => array(
+                    'predicate'   => 'http://schema.org/postOfficeBoxNumber',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_POSTAL_CODE       => array(
+                    'predicate'   => 'http://schema.org/postalCode',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_LOCALITY       => array(
+                    'predicate'   => 'http://schema.org/addressLocality',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_REGION       => array(
+                    'predicate'   => 'http://schema.org/addressRegion',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                ),
+                self::FIELD_ADDRESS_COUNTRY       => array(
+                    'predicate'   => 'http://schema.org/addressCountry',
+                    'type'        => self::DATA_TYPE_STRING,
+                    'export_type' => 'xsd:string',
+                    'constraints' => '',
+                    'input_field' => 'address'   // to build custom metabox
+                )				
+            ),
+            'microdata_template' =>
+                '<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
 					{{latitude}}
 					{{longitude}}
 				</span>
 				<span itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
 					{{streetAddress}}{{postOfficeBoxNumber}}{{postalCode}}{{addressLocality}}{{addressRegion}}{{addressCountry}}
 				</span>',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-		// Merge the custom fields with those provided by the thing schema.
-		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
-
-		return $schema;
-	}
-
-	/**
-	 * Get the 'local business' schema.
-	 *
-	 * @return array An array with the schema configuration.
-	 *
-	 * @since 3.1.0
-	 */
-	private function get_local_business_schema() {
-
-		$schema = array(
-			'label'              => 'LocalBusiness',
-			'description'        => 'A local business.',
-			'parents'            => array( 'place', 'organization' ),
-			'css_class'          => 'wl-local-business',
-			'uri'                => 'http://schema.org/LocalBusiness',
-			'same_as'            => array(
-				'http://rdf.freebase.com/ns/business/business_location',
-				'https://schema.org/Store'
-			),
-			'custom_fields'      => array(),
-			'microdata_template' => '<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+        // Merge the custom fields with those provided by the thing schema.
+        $thing_schema            = $this->get_thing_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+
+        return $schema;
+    }
+
+    /**
+     * Get the 'local business' schema.
+     *
+     * @return array An array with the schema configuration.
+     *
+     * @since 3.1.0
+     */
+    private function get_local_business_schema() {
+
+        $schema = array(
+            'label'              => 'LocalBusiness',
+            'description'        => 'A local business.',
+            'parents'            => array( 'place', 'organization' ),
+            'css_class'          => 'wl-local-business',
+            'uri'                => 'http://schema.org/LocalBusiness',
+            'same_as'            => array(
+                'http://rdf.freebase.com/ns/business/business_location',
+                'https://schema.org/Store'
+            ),
+            'custom_fields'      => array(),
+            'microdata_template' => '<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
                                     {{latitude}}
                                     {{longitude}}
                                 </span>
@@ -739,17 +739,17 @@ 
 								</span>
                                 {{founder}}
 								{{email}}',
-			'templates'          => array(
-				'subtitle' => '{{id}}'
-			)
-		);
-
-		// Merge the custom fields with those provided by the place and organization schema.
-		$place_schema            = $this->get_place_schema();
-		$organization_schema     = $this->get_organization_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
-
-		return $schema;
-	}
+            'templates'          => array(
+                'subtitle' => '{{id}}'
+            )
+        );
+
+        // Merge the custom fields with those provided by the place and organization schema.
+        $place_schema            = $this->get_place_schema();
+        $organization_schema     = $this->get_organization_schema();
+        $schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
+
+        return $schema;
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -229,7 +229,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Schema_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Schema_Service');
 
 		// Create a singleton instance of the Schema service, useful to provide static functions to global functions.
 		self::$instance = $this;
@@ -269,17 +269,17 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	public function get_schema( $name ) {
+	public function get_schema($name) {
 
 		// $this->log_service->trace( "Get schema [ name :: $name ]" );
 
 		// Check if the schema exists and, if not, return NULL.
-		if ( ! isset( $this->schema[ $name ] ) ) {
+		if ( ! isset($this->schema[$name])) {
 			return null;
 		}
 
 		// Return the requested schema.
-		return $this->schema[ $name ];
+		return $this->schema[$name];
 	}
 
 	/**
@@ -291,17 +291,17 @@ 
 	 *
 	 * @since 3.3.0
 	 */
-	public function get_schema_by_uri( $uri ) {
+	public function get_schema_by_uri($uri) {
 
-		foreach ( $this->schema as $name => $schema ) {
-			if ( $schema[ 'uri' ] === $uri ) {
+		foreach ($this->schema as $name => $schema) {
+			if ($schema['uri'] === $uri) {
 				return $schema;
 			}
 		}
 		return null;
 
 		// Return the requested schema.
-		return $this->schema[ $name ];
+		return $this->schema[$name];
 	}
 
 	/**
@@ -316,7 +316,7 @@ 
 		return array(
 			'css_class'          => 'wl-thing',
 			'uri'                => 'http://schema.org/Thing',
-			'same_as'            => array( '*' ), // set as default.
+			'same_as'            => array('*'), // set as default.
 			'custom_fields'      => array(
 				self::FIELD_SAME_AS => array(
 					'predicate'   => 'http://schema.org/sameAs',
@@ -350,7 +350,7 @@ 
 		$schema = array(
 			'label'              => 'CreativeWork',
 			'description'        => 'A creative work (or a Music Album).',
-			'parents'            => array( 'thing' ), // give term slug as parent
+			'parents'            => array('thing'), // give term slug as parent
 			'css_class'          => 'wl-creative-work',
 			'uri'                => 'http://schema.org/CreativeWork',
 			'same_as'            => array(
@@ -363,7 +363,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/Person',
 					'constraints' => array(
-						'uri_type'    => array( 'Person', 'Organization' ),
+						'uri_type'    => array('Person', 'Organization'),
 						'cardinality' => INF
 					)
 				),
@@ -376,7 +376,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -393,10 +393,10 @@ 
 		$schema = array(
 			'label'              => 'Event',
 			'description'        => 'An event . ',
-			'parents'            => array( 'thing' ),
+			'parents'            => array('thing'),
 			'css_class'          => 'wl-event',
 			'uri'                => self::SCHEMA_EVENT_TYPE,
-			'same_as'            => array( 'http://dbpedia.org/ontology/Event' ),
+			'same_as'            => array('http://dbpedia.org/ontology/Event'),
 			'custom_fields'      => array(
 				self::FIELD_DATE_START => array(
 					'predicate'   => 'http://schema.org/startDate',
@@ -415,7 +415,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/PostalAddress',
 					'constraints' => array(
-						'uri_type'    => array( 'Place', 'LocalBusiness' ),
+						'uri_type'    => array('Place', 'LocalBusiness'),
 						'cardinality' => INF
 					)
 				)
@@ -431,7 +431,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -448,7 +448,7 @@ 
 		$schema = array(
 			'label'              => 'Organization',
 			'description'        => 'An organization, including a government or a newspaper.',
-			'parents'            => array( 'thing' ),
+			'parents'            => array('thing'),
 			'css_class'          => 'wl-organization',
 			'uri'                => 'http://schema.org/Organization',
 			'same_as'            => array(
@@ -527,7 +527,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -544,7 +544,7 @@ 
 		$schema = array(
 			'label'              => 'Person',
 			'description'        => 'A person (or a music artist).',
-			'parents'            => array( 'thing' ),
+			'parents'            => array('thing'),
 			'css_class'          => 'wl-person',
 			'uri'                => 'http://schema.org/Person',
 			'same_as'            => array(
@@ -581,7 +581,7 @@ 
 					'type'        => self::DATA_TYPE_URI,
 					'export_type' => 'http://schema.org/Organization',
 					'constraints' => array(
-						'uri_type' => array( 'Organization', 'LocalBusiness' ),
+						'uri_type' => array('Organization', 'LocalBusiness'),
 						'cardinality' => INF
 					)
 				),
@@ -607,7 +607,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 
@@ -625,7 +625,7 @@ 
 		$schema = array(
 			'label'              => 'Place',
 			'description'        => 'A place.',
-			'parents'            => array( 'thing' ),
+			'parents'            => array('thing'),
 			'css_class'          => 'wl-place',
 			'uri'                => 'http://schema.org/Place',
 			'same_as'            => array(
@@ -705,7 +705,7 @@ 
 
 		// Merge the custom fields with those provided by the thing schema.
 		$thing_schema            = $this->get_thing_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $thing_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $thing_schema['custom_fields']);
 
 		return $schema;
 	}
@@ -722,7 +722,7 @@ 
 		$schema = array(
 			'label'              => 'LocalBusiness',
 			'description'        => 'A local business.',
-			'parents'            => array( 'place', 'organization' ),
+			'parents'            => array('place', 'organization'),
 			'css_class'          => 'wl-local-business',
 			'uri'                => 'http://schema.org/LocalBusiness',
 			'same_as'            => array(
@@ -747,7 +747,7 @@ 
 		// Merge the custom fields with those provided by the place and organization schema.
 		$place_schema            = $this->get_place_schema();
 		$organization_schema     = $this->get_organization_schema();
-		$schema['custom_fields'] = array_merge( $schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields'] );
+		$schema['custom_fields'] = array_merge($schema['custom_fields'], $place_schema['custom_fields'], $organization_schema['custom_fields']);
 
 		return $schema;
 	}

src/admin/WL_Metabox/WL_Metabox.php

Indentation +233 added lines, -233 removed lines

@@ -14,255 +14,255 @@
  */
 class WL_Metabox {
 
-	public $fields;
-
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * WL_Metabox constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		// Create a logger instance.
-		$this->log_service = Wordlift_Log_Service::get_logger( 'WL_Metabox' );
-
-		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array( &$this, 'save_form_data' ) );
-
-		// Enqueue js and css
-		$this->enqueue_scripts_and_styles();
-
-	}
-
-	/**
-	 * Add a callback to print the metabox in page.
-	 * Wordpress will fire the $this->html() callback at the right time.
-	 */
-	public function add_main_metabox() {
-
-		// Add main metabox (will print also the inner fields)
-		$id		= uniqid( 'wl-metabox-' );
-		$title	= get_the_title() . ' ' . __('properties', 'wordlift');
-		add_meta_box( $id, $title, array(
-			$this,
-			'html'
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+    public $fields;
+
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * WL_Metabox constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        // Create a logger instance.
+        $this->log_service = Wordlift_Log_Service::get_logger( 'WL_Metabox' );
+
+        // Add hooks to print metaboxes and save submitted data.
+        add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
+        add_action( 'wl_linked_data_save_post', array( &$this, 'save_form_data' ) );
+
+        // Enqueue js and css
+        $this->enqueue_scripts_and_styles();
+
+    }
+
+    /**
+     * Add a callback to print the metabox in page.
+     * Wordpress will fire the $this->html() callback at the right time.
+     */
+    public function add_main_metabox() {
+
+        // Add main metabox (will print also the inner fields)
+        $id		= uniqid( 'wl-metabox-' );
+        $title	= get_the_title() . ' ' . __('properties', 'wordlift');
+        add_meta_box( $id, $title, array(
+            $this,
+            'html'
+        ), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
 		
-		// Add filter to change the metabox CSS class
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
-	}
-
-	/**
-	 * Called from WP to print the metabox content in page.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param WP_Post $post The post.
-	 */
-	public function html( $post ) {
-
-		// Build the fields we need to print.
-		$this->instantiate_fields( $post->ID );
-
-		// Loop over the fields
-		foreach ( $this->fields as $field ) {
+        // Add filter to change the metabox CSS class
+        add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+    }
+
+    /**
+     * Called from WP to print the metabox content in page.
+     *
+     * @since 3.1.0
+     *
+     * @param WP_Post $post The post.
+     */
+    public function html( $post ) {
+
+        // Build the fields we need to print.
+        $this->instantiate_fields( $post->ID );
+
+        // Loop over the fields
+        foreach ( $this->fields as $field ) {
 
-			// load data from DB (values will be available in $field->data)
-			$field->get_data();
-
-			// print field HTML (nonce included)
-			echo $field->html();
-		}
-
-	}
-
-	/**
-	 * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
-	 *
-	 * Note: the first function that calls this method will instantiate the fields.
-	 * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id The post id.
-	 */
-	public function instantiate_fields( $post_id ) {
-
-		// This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering
-		if ( isset( $this->fields ) ) {
-			return;
-		}
-
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
-
-		if ( isset( $entity_type ) ) {
-
-			/**
-			 * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
-			 * We must divide fields in two groups:
-			 * - simple: accept values for one property
-			 * - grouped: accept values for more properties, or for one property that needs a specific metabox.
-			 */
-			$metaboxes         = $this->group_properties_by_input_field( $entity_type );
-			$simple_metaboxes  = $metaboxes[0];
-			$grouped_metaboxes = $metaboxes[1];
-
-			// Loop over simple entity properties
-			foreach ( $simple_metaboxes as $key => $property ) {
-
-				// Info passed to the metabox
-				$info         = array();
-				$info[ $key ] = $property;
-
-				// Build the requested field as WL_Metabox_Field_ object
-				$this->add_field( $info );
-			}
-
-			// Loop over grouped properties
-			foreach ( $grouped_metaboxes as $key => $property ) {
-
-				// Info passed to the metabox
-				$info         = array();
-				$info[ $key ] = $property;
-
-				// Build the requested field group as WL_Metabox_Field_ object
-				$this->add_field( $info, true );
-			}
-
-		}
-	}
-
-	/**
-	 * Separes metaboxes in simple and grouped.
-	 *
-	 * @param array $custom_fields Information on the entity type.
-	 */
-	public function group_properties_by_input_field( $custom_fields ) {
-
-		$simple_properties  = array();
-		$grouped_properties = array();
-
-		// Loop over possible entity properties
-		foreach ( $custom_fields as $key => $property ) {
-
-			// Check presence of predicate and type
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
-
-				// Check if input_field is defined
-				if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
-
-					$grouped_key = $property['input_field'];
-
-					// Update list of grouped properties
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
-
-				} else {
-
-					// input_field not defined, add simple metabox
-					$simple_properties[ $key ] = $property;
-				}
-			}
-		}
+            // load data from DB (values will be available in $field->data)
+            $field->get_data();
+
+            // print field HTML (nonce included)
+            echo $field->html();
+        }
+
+    }
+
+    /**
+     * Read the WL <-> Schema mapping and build the Fields for the entity being edited.
+     *
+     * Note: the first function that calls this method will instantiate the fields.
+     * Why it isn't called from the constructor? Because we need to hook this process as late as possible.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id The post id.
+     */
+    public function instantiate_fields( $post_id ) {
+
+        // This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering
+        if ( isset( $this->fields ) ) {
+            return;
+        }
+
+        $entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+
+        if ( isset( $entity_type ) ) {
+
+            /**
+             * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
+             * We must divide fields in two groups:
+             * - simple: accept values for one property
+             * - grouped: accept values for more properties, or for one property that needs a specific metabox.
+             */
+            $metaboxes         = $this->group_properties_by_input_field( $entity_type );
+            $simple_metaboxes  = $metaboxes[0];
+            $grouped_metaboxes = $metaboxes[1];
+
+            // Loop over simple entity properties
+            foreach ( $simple_metaboxes as $key => $property ) {
+
+                // Info passed to the metabox
+                $info         = array();
+                $info[ $key ] = $property;
+
+                // Build the requested field as WL_Metabox_Field_ object
+                $this->add_field( $info );
+            }
+
+            // Loop over grouped properties
+            foreach ( $grouped_metaboxes as $key => $property ) {
+
+                // Info passed to the metabox
+                $info         = array();
+                $info[ $key ] = $property;
+
+                // Build the requested field group as WL_Metabox_Field_ object
+                $this->add_field( $info, true );
+            }
+
+        }
+    }
+
+    /**
+     * Separes metaboxes in simple and grouped.
+     *
+     * @param array $custom_fields Information on the entity type.
+     */
+    public function group_properties_by_input_field( $custom_fields ) {
+
+        $simple_properties  = array();
+        $grouped_properties = array();
+
+        // Loop over possible entity properties
+        foreach ( $custom_fields as $key => $property ) {
+
+            // Check presence of predicate and type
+            if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+
+                // Check if input_field is defined
+                if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
+
+                    $grouped_key = $property['input_field'];
+
+                    // Update list of grouped properties
+                    $grouped_properties[ $grouped_key ][ $key ] = $property;
+
+                } else {
+
+                    // input_field not defined, add simple metabox
+                    $simple_properties[ $key ] = $property;
+                }
+            }
+        }
 
-		return array( $simple_properties, $grouped_properties );
-	}
-
-	/**
-	 * Add a Field to the current Metabox, based on the description of the Field.
-	 * This method is a rude factory for Field objects.
-	 *
-	 * @param type $args
-	 * @param type $grouped Flag to distinguish between simple and grouped Fields
-	 */
-	public function add_field( $args, $grouped = false ) {
-
-		if ( $grouped ) {
-			// Special fields (sameas, coordinates, etc.)
-
-			// Build Field with a custom class (e.g. WL_Metabox_Field_date)
-			$field_class = 'WL_Metabox_Field_' . key( $args );
-
-		} else {
-			// Simple fields (string, uri, boolean, etc.)
+        return array( $simple_properties, $grouped_properties );
+    }
+
+    /**
+     * Add a Field to the current Metabox, based on the description of the Field.
+     * This method is a rude factory for Field objects.
+     *
+     * @param type $args
+     * @param type $grouped Flag to distinguish between simple and grouped Fields
+     */
+    public function add_field( $args, $grouped = false ) {
+
+        if ( $grouped ) {
+            // Special fields (sameas, coordinates, etc.)
+
+            // Build Field with a custom class (e.g. WL_Metabox_Field_date)
+            $field_class = 'WL_Metabox_Field_' . key( $args );
+
+        } else {
+            // Simple fields (string, uri, boolean, etc.)
 
-			// Which field? We want to use the class that is specific for the field.
-			$meta = key( $args );
-			if ( ! isset( $args[ $meta ]['type'] ) || ( $args[ $meta ]['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
-				// Use default WL_Metabox_Field (manages strings)
-				$field_class = 'WL_Metabox_Field';
-			} else {
-				// Build Field with a custom class (e.g. WL_Metabox_Field_date)
-				$field_class = 'WL_Metabox_Field_' . $args[ $meta ]['type'];
-			}
-		}
+            // Which field? We want to use the class that is specific for the field.
+            $meta = key( $args );
+            if ( ! isset( $args[ $meta ]['type'] ) || ( $args[ $meta ]['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
+                // Use default WL_Metabox_Field (manages strings)
+                $field_class = 'WL_Metabox_Field';
+            } else {
+                // Build Field with a custom class (e.g. WL_Metabox_Field_date)
+                $field_class = 'WL_Metabox_Field_' . $args[ $meta ]['type'];
+            }
+        }
 
-		// Call apropriate constructor (e.g. WL_Metabox_Field_... )
-		$this->fields[] = new $field_class( $args );
-	}
+        // Call apropriate constructor (e.g. WL_Metabox_Field_... )
+        $this->fields[] = new $field_class( $args );
+    }
 
-	public function save_form_data( $entity_id ) {
+    public function save_form_data( $entity_id ) {
 
-		// Build Field objects
-		$this->instantiate_fields( $entity_id );
+        // Build Field objects
+        $this->instantiate_fields( $entity_id );
 
-		// Check if WL metabox form was posted
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			return;
-		}
+        // Check if WL metabox form was posted
+        if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+            return;
+        }
 
-		foreach ( $this->fields as $field ) {
+        foreach ( $this->fields as $field ) {
 
-			// Verify nonce
-			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+            // Verify nonce
+            $valid_nonce = $field->verify_nonce();
+            if ( $valid_nonce ) {
 
-				$posted_data = $_POST['wl_metaboxes'];
-				$field_name  = $field->meta_name;
+                $posted_data = $_POST['wl_metaboxes'];
+                $field_name  = $field->meta_name;
 
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+                // Each Filed only deals with its values.
+                if ( isset( $posted_data[ $field_name ] ) ) {
 
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
-					}
+                    $values = $posted_data[ $field_name ];
+                    if ( ! is_array( $values ) ) {
+                        $values = array( $values );
+                    }
 
-					// Save data permanently
-					$field->save_data( $values );
-				}
-			}
-		}
+                    // Save data permanently
+                    $field->save_data( $values );
+                }
+            }
+        }
 
-		wl_linked_data_push_to_redlink( $entity_id );
-	}
+        wl_linked_data_push_to_redlink( $entity_id );
+    }
 
-	// print on page all the js and css the fields will need
-	public function enqueue_scripts_and_styles() {
+    // print on page all the js and css the fields will need
+    public function enqueue_scripts_and_styles() {
 
-		// dateTimePicker
-		wp_enqueue_style( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/css/jquery.datetimepicker.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.full.min.js', array( 'jquery' ) );
+        // dateTimePicker
+        wp_enqueue_style( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/css/jquery.datetimepicker.css' );
+        wp_enqueue_script( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.full.min.js', array( 'jquery' ) );
 		
-		// Leaflet.
-		wp_enqueue_style( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
-		wp_enqueue_script( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js', __FILE__ );
-
-		// Add AJAX autocomplete to facilitate metabox editing
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
-		wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'action'   => 'entity_by_title'
-			)
-		);
-	}
+        // Leaflet.
+        wp_enqueue_style( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
+        wp_enqueue_script( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js', __FILE__ );
+
+        // Add AJAX autocomplete to facilitate metabox editing
+        wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
+        wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
+                'ajax_url' => admin_url( 'admin-ajax.php' ),
+                'action'   => 'entity_by_title'
+            )
+        );
+    }
 }

Spacing +60 added lines, -60 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-require_once( 'WL_Metabox_Field.php' );
-require_once( 'WL_Metabox_Field_date.php' );
-require_once( 'WL_Metabox_Field_uri.php' );
-require_once( 'WL_Metabox_Field_coordinates.php' );
-require_once( 'WL_Metabox_Field_sameas.php' );
-require_once( 'WL_Metabox_Field_address.php' );
+require_once('WL_Metabox_Field.php');
+require_once('WL_Metabox_Field_date.php');
+require_once('WL_Metabox_Field_uri.php');
+require_once('WL_Metabox_Field_coordinates.php');
+require_once('WL_Metabox_Field_sameas.php');
+require_once('WL_Metabox_Field_address.php');
 
 /**
  * Class WL_Metabox
@@ -33,11 +33,11 @@ 
 	public function __construct() {
 
 		// Create a logger instance.
-		$this->log_service = Wordlift_Log_Service::get_logger( 'WL_Metabox' );
+		$this->log_service = Wordlift_Log_Service::get_logger('WL_Metabox');
 
 		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array( &$this, 'save_form_data' ) );
+		add_action('add_meta_boxes', array(&$this, 'add_main_metabox'));
+		add_action('wl_linked_data_save_post', array(&$this, 'save_form_data'));
 
 		// Enqueue js and css
 		$this->enqueue_scripts_and_styles();
@@ -51,15 +51,15 @@ 
 	public function add_main_metabox() {
 
 		// Add main metabox (will print also the inner fields)
-		$id		= uniqid( 'wl-metabox-' );
-		$title	= get_the_title() . ' ' . __('properties', 'wordlift');
-		add_meta_box( $id, $title, array(
+		$id = uniqid('wl-metabox-');
+		$title = get_the_title().' '.__('properties', 'wordlift');
+		add_meta_box($id, $title, array(
 			$this,
 			'html'
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high');
 		
 		// Add filter to change the metabox CSS class
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+		add_filter("postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class');
 	}
 
 	/**
@@ -69,13 +69,13 @@ 
 	 *
 	 * @param WP_Post $post The post.
 	 */
-	public function html( $post ) {
+	public function html($post) {
 
 		// Build the fields we need to print.
-		$this->instantiate_fields( $post->ID );
+		$this->instantiate_fields($post->ID);
 
 		// Loop over the fields
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// load data from DB (values will be available in $field->data)
 			$field->get_data();
@@ -96,16 +96,16 @@ 
 	 *
 	 * @param int $post_id The post id.
 	 */
-	public function instantiate_fields( $post_id ) {
+	public function instantiate_fields($post_id) {
 
 		// This function must be called only once. Not called from the constructor because WP hooks have a rococo ordering
-		if ( isset( $this->fields ) ) {
+		if (isset($this->fields)) {
 			return;
 		}
 
-		$entity_type = wl_entity_taxonomy_get_custom_fields( $post_id );
+		$entity_type = wl_entity_taxonomy_get_custom_fields($post_id);
 
-		if ( isset( $entity_type ) ) {
+		if (isset($entity_type)) {
 
 			/**
 			 * In some special case, properties must be grouped in one field (e.g. coordinates) or dealed with custom methods.
@@ -113,30 +113,30 @@ 
 			 * - simple: accept values for one property
 			 * - grouped: accept values for more properties, or for one property that needs a specific metabox.
 			 */
-			$metaboxes         = $this->group_properties_by_input_field( $entity_type );
+			$metaboxes         = $this->group_properties_by_input_field($entity_type);
 			$simple_metaboxes  = $metaboxes[0];
 			$grouped_metaboxes = $metaboxes[1];
 
 			// Loop over simple entity properties
-			foreach ( $simple_metaboxes as $key => $property ) {
+			foreach ($simple_metaboxes as $key => $property) {
 
 				// Info passed to the metabox
 				$info         = array();
-				$info[ $key ] = $property;
+				$info[$key] = $property;
 
 				// Build the requested field as WL_Metabox_Field_ object
-				$this->add_field( $info );
+				$this->add_field($info);
 			}
 
 			// Loop over grouped properties
-			foreach ( $grouped_metaboxes as $key => $property ) {
+			foreach ($grouped_metaboxes as $key => $property) {
 
 				// Info passed to the metabox
 				$info         = array();
-				$info[ $key ] = $property;
+				$info[$key] = $property;
 
 				// Build the requested field group as WL_Metabox_Field_ object
-				$this->add_field( $info, true );
+				$this->add_field($info, true);
 			}
 
 		}
@@ -147,34 +147,34 @@ 
 	 *
 	 * @param array $custom_fields Information on the entity type.
 	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+	public function group_properties_by_input_field($custom_fields) {
 
 		$simple_properties  = array();
 		$grouped_properties = array();
 
 		// Loop over possible entity properties
-		foreach ( $custom_fields as $key => $property ) {
+		foreach ($custom_fields as $key => $property) {
 
 			// Check presence of predicate and type
-			if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+			if (isset($property['predicate']) && isset($property['type'])) {
 
 				// Check if input_field is defined
-				if ( isset( $property['input_field'] ) && $property['input_field'] !== '' ) {
+				if (isset($property['input_field']) && $property['input_field'] !== '') {
 
 					$grouped_key = $property['input_field'];
 
 					// Update list of grouped properties
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+					$grouped_properties[$grouped_key][$key] = $property;
 
 				} else {
 
 					// input_field not defined, add simple metabox
-					$simple_properties[ $key ] = $property;
+					$simple_properties[$key] = $property;
 				}
 			}
 		}
 
-		return array( $simple_properties, $grouped_properties );
+		return array($simple_properties, $grouped_properties);
 	}
 
 	/**
@@ -184,83 +184,83 @@ 
 	 * @param type $args
 	 * @param type $grouped Flag to distinguish between simple and grouped Fields
 	 */
-	public function add_field( $args, $grouped = false ) {
+	public function add_field($args, $grouped = false) {
 
-		if ( $grouped ) {
+		if ($grouped) {
 			// Special fields (sameas, coordinates, etc.)
 
 			// Build Field with a custom class (e.g. WL_Metabox_Field_date)
-			$field_class = 'WL_Metabox_Field_' . key( $args );
+			$field_class = 'WL_Metabox_Field_'.key($args);
 
 		} else {
 			// Simple fields (string, uri, boolean, etc.)
 
 			// Which field? We want to use the class that is specific for the field.
-			$meta = key( $args );
-			if ( ! isset( $args[ $meta ]['type'] ) || ( $args[ $meta ]['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING ) ) {
+			$meta = key($args);
+			if ( ! isset($args[$meta]['type']) || ($args[$meta]['type'] == Wordlift_Schema_Service::DATA_TYPE_STRING)) {
 				// Use default WL_Metabox_Field (manages strings)
 				$field_class = 'WL_Metabox_Field';
 			} else {
 				// Build Field with a custom class (e.g. WL_Metabox_Field_date)
-				$field_class = 'WL_Metabox_Field_' . $args[ $meta ]['type'];
+				$field_class = 'WL_Metabox_Field_'.$args[$meta]['type'];
 			}
 		}
 
 		// Call apropriate constructor (e.g. WL_Metabox_Field_... )
-		$this->fields[] = new $field_class( $args );
+		$this->fields[] = new $field_class($args);
 	}
 
-	public function save_form_data( $entity_id ) {
+	public function save_form_data($entity_id) {
 
 		// Build Field objects
-		$this->instantiate_fields( $entity_id );
+		$this->instantiate_fields($entity_id);
 
 		// Check if WL metabox form was posted
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+		if ( ! isset($_POST['wl_metaboxes'])) {
 			return;
 		}
 
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// Verify nonce
 			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+			if ($valid_nonce) {
 
 				$posted_data = $_POST['wl_metaboxes'];
 				$field_name  = $field->meta_name;
 
 				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+				if (isset($posted_data[$field_name])) {
 
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
+					$values = $posted_data[$field_name];
+					if ( ! is_array($values)) {
+						$values = array($values);
 					}
 
 					// Save data permanently
-					$field->save_data( $values );
+					$field->save_data($values);
 				}
 			}
 		}
 
-		wl_linked_data_push_to_redlink( $entity_id );
+		wl_linked_data_push_to_redlink($entity_id);
 	}
 
 	// print on page all the js and css the fields will need
 	public function enqueue_scripts_and_styles() {
 
 		// dateTimePicker
-		wp_enqueue_style( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/css/jquery.datetimepicker.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.full.min.js', array( 'jquery' ) );
+		wp_enqueue_style('jquery-ui-timepicker', dirname(plugin_dir_url(__FILE__)).'/css/jquery.datetimepicker.css');
+		wp_enqueue_script('jquery-ui-timepicker', dirname(plugin_dir_url(__FILE__)).'/js/jquery.datetimepicker.full.min.js', array('jquery'));
 		
 		// Leaflet.
-		wp_enqueue_style( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.css' );
-		wp_enqueue_script( 'leaflet', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/bower_components/leaflet/dist/leaflet.js', __FILE__ );
+		wp_enqueue_style('leaflet', dirname(dirname(plugin_dir_url(__FILE__))).'/bower_components/leaflet/dist/leaflet.css');
+		wp_enqueue_script('leaflet', dirname(dirname(plugin_dir_url(__FILE__))).'/bower_components/leaflet/dist/leaflet.js', __FILE__);
 
 		// Add AJAX autocomplete to facilitate metabox editing
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wl_entity_metabox_utilities.js' );
-		wp_localize_script( 'wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_enqueue_script('wl-entity-metabox-utility', dirname(plugin_dir_url(__FILE__)).'/js/wl_entity_metabox_utilities.js');
+		wp_localize_script('wl-entity-metabox-utility', 'wlEntityMetaboxParams', array(
+				'ajax_url' => admin_url('admin-ajax.php'),
 				'action'   => 'entity_by_title'
 			)
 		);

src/admin/class-wordlift-admin-entity-list.php

Indentation +176 added lines, -176 removed lines

@@ -13,200 +13,200 @@
  */
 class Wordlift_Entity_List_Service {
 	
-	/**
-	 * Size of the entity thumbnail in pixels
-	 * 
-	 * @since  3.3.0
-	 */
-	const THUMB_SIZE = 50;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_List_Service' );
-
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * Register custom columns for entity listing in backend
-	 * @see https://codex.wordpress.org/Plugin_API/Action_Reference/manage_posts_custom_column
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param array $columns the default columns.
-	 *
-	 * @return array Enhanced columns array.
-	 */
-	public function register_custom_columns( $columns ) {
+    /**
+     * Size of the entity thumbnail in pixels
+     * 
+     * @since  3.3.0
+     */
+    const THUMB_SIZE = 50;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.3.0
+     *
+     * @param \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    public function __construct( $entity_service ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_List_Service' );
+
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * Register custom columns for entity listing in backend
+     * @see https://codex.wordpress.org/Plugin_API/Action_Reference/manage_posts_custom_column
+     *
+     * @since 3.3.0
+     *
+     * @param array $columns the default columns.
+     *
+     * @return array Enhanced columns array.
+     */
+    public function register_custom_columns( $columns ) {
 		
-		// Take away first column and keep a reference,
-		// so we can later insert the thumbnail between the first and the rest of columns.
-		$columns_cb = $columns['cb'];
-		unset( $columns['cb'] );
+        // Take away first column and keep a reference,
+        // so we can later insert the thumbnail between the first and the rest of columns.
+        $columns_cb = $columns['cb'];
+        unset( $columns['cb'] );
 		
-		// Thumbnails column is inserted in second place, while the related posts on the end.
-		$columns = array_merge(
-			array( 'cb'                      => $columns_cb ),                      // re-add first column
-			array( 'wl_column_thumbnail'     => __( 'Image', 'wordlift' ) ),        // thumb
-			$columns,                                                               // default columns (without the first)
-			array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
-			array( 'wl_column_rating' 		 => __( 'Rating', 'wordlift' ) ) // related posts
-		);
-
-		return $columns;		
-	}
-
-	/**
-	 * Render custom columns
-	 * @see https://codex.wordpress.org/Plugin_API/Action_Reference/manage_$post_type_posts_custom_column
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param string $column the current column.
-	 * @param int $entity_id An entity post id.
-	 *
-	 * @return true if the post is an entity otherwise false.
-	 */
-	public function render_custom_columns( $column, $entity_id ) {
+        // Thumbnails column is inserted in second place, while the related posts on the end.
+        $columns = array_merge(
+            array( 'cb'                      => $columns_cb ),                      // re-add first column
+            array( 'wl_column_thumbnail'     => __( 'Image', 'wordlift' ) ),        // thumb
+            $columns,                                                               // default columns (without the first)
+            array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
+            array( 'wl_column_rating' 		 => __( 'Rating', 'wordlift' ) ) // related posts
+        );
+
+        return $columns;		
+    }
+
+    /**
+     * Render custom columns
+     * @see https://codex.wordpress.org/Plugin_API/Action_Reference/manage_$post_type_posts_custom_column
+     *
+     * @since 3.3.0
+     *
+     * @param string $column the current column.
+     * @param int $entity_id An entity post id.
+     *
+     * @return true if the post is an entity otherwise false.
+     */
+    public function render_custom_columns( $column, $entity_id ) {
 		
-		switch ( $column ) {
+        switch ( $column ) {
 			
-			case 'wl_column_related_posts':
-				echo count( wl_core_get_related_post_ids( $entity_id ) );
-				break;
+            case 'wl_column_related_posts':
+                echo count( wl_core_get_related_post_ids( $entity_id ) );
+                break;
 			
-			case 'wl_column_thumbnail':
+            case 'wl_column_thumbnail':
 				
-				$edit_link = get_edit_post_link( $entity_id );
-				$thumb     = get_the_post_thumbnail( $entity_id, array( self::THUMB_SIZE, self::THUMB_SIZE ) );
+                $edit_link = get_edit_post_link( $entity_id );
+                $thumb     = get_the_post_thumbnail( $entity_id, array( self::THUMB_SIZE, self::THUMB_SIZE ) );
 				
-				if( ! $thumb ) {
-					$thumb = "<img src='" . WL_DEFAULT_THUMBNAIL_PATH . "' width='" . self::THUMB_SIZE . "' />";
-				}
-				echo "<a href='$edit_link'>$thumb</a>";
-				break;
-
-			case 'wl_column_rating':
-
-				$rating = $this->entity_service->get_rating_for( $entity_id );
-				echo '<i class="wl-traffic-light wl-tl-'. $rating[ 'traffic_light_score' ] . '">' . $rating[ 'percentage_score' ] . '%</i>';				
-				break;
-		}
+                if( ! $thumb ) {
+                    $thumb = "<img src='" . WL_DEFAULT_THUMBNAIL_PATH . "' width='" . self::THUMB_SIZE . "' />";
+                }
+                echo "<a href='$edit_link'>$thumb</a>";
+                break;
+
+            case 'wl_column_rating':
+
+                $rating = $this->entity_service->get_rating_for( $entity_id );
+                echo '<i class="wl-traffic-light wl-tl-'. $rating[ 'traffic_light_score' ] . '">' . $rating[ 'percentage_score' ] . '%</i>';				
+                break;
+        }
 		
-	}
+    }
 	
-	/**
-	 * Add wl-classification-scope select box before the 'Filter' button.
-	 *
-	 * @since 3.3.0
-	 */
-	public function restrict_manage_posts_classification_scope() {
+    /**
+     * Add wl-classification-scope select box before the 'Filter' button.
+     *
+     * @since 3.3.0
+     */
+    public function restrict_manage_posts_classification_scope() {
 		
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
-
-		$screen = get_current_screen();
-		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
-			return;
-		}
-
-		if( $screen->post_type !== Wordlift_Entity_Service::TYPE_NAME ){
-			return;
-		}
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( FALSE === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
+
+        $screen = get_current_screen();
+        // If there is any valid screen nothing to do
+        if ( NULL === $screen ) {
+            return;
+        }
+
+        if( $screen->post_type !== Wordlift_Entity_Service::TYPE_NAME ){
+            return;
+        }
 		
-		// Was a W already selected?
-		$selected = isset( $_GET[ 'wl-classification-scope' ] ) ? 
-			$_GET['wl-classification-scope'] : '' ;
+        // Was a W already selected?
+        $selected = isset( $_GET[ 'wl-classification-scope' ] ) ? 
+            $_GET['wl-classification-scope'] : '' ;
 		
-		// Print select box with the 4W
-		$all_w = array(
-			__( "All 'W'" ),
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHEN_RELATION
-		);
-		echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
-		foreach ( $all_w as $w ) {
-			$default  = ( $selected === $w ) ? 'selected' : '';
-			echo sprintf( '<option value="%s" %s >%s</option>', $w, $default, __( $w ) );
-		}
-		echo '</select>';
-	}
-
-	/**
-	 * Server side response operations for the classification filter set in *restrict_manage_posts_classification_scope_filter*
-	 *
-	 * @since 3.3.0
-	 * 
-	 * @param array $clauses WP main query clauses.
-	 * 
-	 * @return array Modified clauses.
-	 */
-	public function posts_clauses_classification_scope( $clauses ) {
+        // Print select box with the 4W
+        $all_w = array(
+            __( "All 'W'" ),
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHEN_RELATION
+        );
+        echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
+        foreach ( $all_w as $w ) {
+            $default  = ( $selected === $w ) ? 'selected' : '';
+            echo sprintf( '<option value="%s" %s >%s</option>', $w, $default, __( $w ) );
+        }
+        echo '</select>';
+    }
+
+    /**
+     * Server side response operations for the classification filter set in *restrict_manage_posts_classification_scope_filter*
+     *
+     * @since 3.3.0
+     * 
+     * @param array $clauses WP main query clauses.
+     * 
+     * @return array Modified clauses.
+     */
+    public function posts_clauses_classification_scope( $clauses ) {
 		
-		// Run only on admin page
-		if( ! is_admin() ) {
-			return $clauses;
-		}
-
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
-			return $clauses;
-		}
+        // Run only on admin page
+        if( ! is_admin() ) {
+            return $clauses;
+        }
+
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( FALSE === function_exists( 'get_current_screen' ) ) {
+            return $clauses;
+        }
 		
-		// Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set
-		$screen = get_current_screen();
+        // Only apply on entity list page, only if this is the main query and if the wl-classification-scope query param is set
+        $screen = get_current_screen();
 
-		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
-			return $clauses;
-		}
+        // If there is any valid screen nothing to do
+        if ( NULL === $screen ) {
+            return $clauses;
+        }
 
-		if( ! ( $screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) {
-			return $clauses;
-		}
+        if( ! ( $screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) {
+            return $clauses;
+        }
 			
-		// Check a valid W was requested
-		$requested_w = $_GET['wl-classification-scope'];
-		$all_w       = array(
-			WL_WHAT_RELATION,
-			WL_WHO_RELATION,
-			WL_WHERE_RELATION,
-			WL_WHEN_RELATION	
-		);
-		if ( ! in_array( $requested_w, $all_w ) ) {
-			return $clauses;
-		}
+        // Check a valid W was requested
+        $requested_w = $_GET['wl-classification-scope'];
+        $all_w       = array(
+            WL_WHAT_RELATION,
+            WL_WHO_RELATION,
+            WL_WHERE_RELATION,
+            WL_WHEN_RELATION	
+        );
+        if ( ! in_array( $requested_w, $all_w ) ) {
+            return $clauses;
+        }
 		
-		global $wpdb;
-		$wl_relation_table = wl_core_get_relation_instances_table_name();
+        global $wpdb;
+        $wl_relation_table = wl_core_get_relation_instances_table_name();
 		
-		// Change WP main query clauses
-		$clauses['join']     .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
-		$clauses['where']    .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
-		$clauses['distinct'] .= "DISTINCT";
+        // Change WP main query clauses
+        $clauses['join']     .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
+        $clauses['where']    .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
+        $clauses['distinct'] .= "DISTINCT";
 		
-		return $clauses;
-	}
+        return $clauses;
+    }
 }

Spacing +34 added lines, -34 removed lines

@@ -36,9 +36,9 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_List_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_List_Service');
 
 		$this->entity_service = $entity_service;
 
@@ -54,20 +54,20 @@ 
 	 *
 	 * @return array Enhanced columns array.
 	 */
-	public function register_custom_columns( $columns ) {
+	public function register_custom_columns($columns) {
 		
 		// Take away first column and keep a reference,
 		// so we can later insert the thumbnail between the first and the rest of columns.
 		$columns_cb = $columns['cb'];
-		unset( $columns['cb'] );
+		unset($columns['cb']);
 		
 		// Thumbnails column is inserted in second place, while the related posts on the end.
 		$columns = array_merge(
-			array( 'cb'                      => $columns_cb ),                      // re-add first column
-			array( 'wl_column_thumbnail'     => __( 'Image', 'wordlift' ) ),        // thumb
-			$columns,                                                               // default columns (without the first)
-			array( 'wl_column_related_posts' => __( 'Related Posts', 'wordlift' ) ), // related posts
-			array( 'wl_column_rating' 		 => __( 'Rating', 'wordlift' ) ) // related posts
+			array('cb'                      => $columns_cb), // re-add first column
+			array('wl_column_thumbnail'     => __('Image', 'wordlift')), // thumb
+			$columns, // default columns (without the first)
+			array('wl_column_related_posts' => __('Related Posts', 'wordlift')), // related posts
+			array('wl_column_rating' 		 => __('Rating', 'wordlift')) // related posts
 		);
 
 		return $columns;		
@@ -84,29 +84,29 @@ 
 	 *
 	 * @return true if the post is an entity otherwise false.
 	 */
-	public function render_custom_columns( $column, $entity_id ) {
+	public function render_custom_columns($column, $entity_id) {
 		
-		switch ( $column ) {
+		switch ($column) {
 			
 			case 'wl_column_related_posts':
-				echo count( wl_core_get_related_post_ids( $entity_id ) );
+				echo count(wl_core_get_related_post_ids($entity_id));
 				break;
 			
 			case 'wl_column_thumbnail':
 				
-				$edit_link = get_edit_post_link( $entity_id );
-				$thumb     = get_the_post_thumbnail( $entity_id, array( self::THUMB_SIZE, self::THUMB_SIZE ) );
+				$edit_link = get_edit_post_link($entity_id);
+				$thumb     = get_the_post_thumbnail($entity_id, array(self::THUMB_SIZE, self::THUMB_SIZE));
 				
-				if( ! $thumb ) {
-					$thumb = "<img src='" . WL_DEFAULT_THUMBNAIL_PATH . "' width='" . self::THUMB_SIZE . "' />";
+				if ( ! $thumb) {
+					$thumb = "<img src='".WL_DEFAULT_THUMBNAIL_PATH."' width='".self::THUMB_SIZE."' />";
 				}
 				echo "<a href='$edit_link'>$thumb</a>";
 				break;
 
 			case 'wl_column_rating':
 
-				$rating = $this->entity_service->get_rating_for( $entity_id );
-				echo '<i class="wl-traffic-light wl-tl-'. $rating[ 'traffic_light_score' ] . '">' . $rating[ 'percentage_score' ] . '%</i>';				
+				$rating = $this->entity_service->get_rating_for($entity_id);
+				echo '<i class="wl-traffic-light wl-tl-'.$rating['traffic_light_score'].'">'.$rating['percentage_score'].'%</i>';				
 				break;
 		}
 		
@@ -120,36 +120,36 @@ 
 	public function restrict_manage_posts_classification_scope() {
 		
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return;
 		}
 
 		$screen = get_current_screen();
 		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
+		if (NULL === $screen) {
 			return;
 		}
 
-		if( $screen->post_type !== Wordlift_Entity_Service::TYPE_NAME ){
+		if ($screen->post_type !== Wordlift_Entity_Service::TYPE_NAME) {
 			return;
 		}
 		
 		// Was a W already selected?
-		$selected = isset( $_GET[ 'wl-classification-scope' ] ) ? 
-			$_GET['wl-classification-scope'] : '' ;
+		$selected = isset($_GET['wl-classification-scope']) ? 
+			$_GET['wl-classification-scope'] : '';
 		
 		// Print select box with the 4W
 		$all_w = array(
-			__( "All 'W'" ),
+			__("All 'W'"),
 			WL_WHAT_RELATION,
 			WL_WHO_RELATION,
 			WL_WHERE_RELATION,
 			WL_WHEN_RELATION
 		);
 		echo '<select name="wl-classification-scope" id="wl-dropdown-classification-scope">';
-		foreach ( $all_w as $w ) {
-			$default  = ( $selected === $w ) ? 'selected' : '';
-			echo sprintf( '<option value="%s" %s >%s</option>', $w, $default, __( $w ) );
+		foreach ($all_w as $w) {
+			$default = ($selected === $w) ? 'selected' : '';
+			echo sprintf('<option value="%s" %s >%s</option>', $w, $default, __($w));
 		}
 		echo '</select>';
 	}
@@ -163,15 +163,15 @@ 
 	 * 
 	 * @return array Modified clauses.
 	 */
-	public function posts_clauses_classification_scope( $clauses ) {
+	public function posts_clauses_classification_scope($clauses) {
 		
 		// Run only on admin page
-		if( ! is_admin() ) {
+		if ( ! is_admin()) {
 			return $clauses;
 		}
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return $clauses;
 		}
 		
@@ -179,11 +179,11 @@ 
 		$screen = get_current_screen();
 
 		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
+		if (NULL === $screen) {
 			return $clauses;
 		}
 
-		if( ! ( $screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset( $_GET['wl-classification-scope'] ) ) ) {
+		if ( ! ($screen->post_type === Wordlift_Entity_Service::TYPE_NAME && is_main_query() && isset($_GET['wl-classification-scope']))) {
 			return $clauses;
 		}
 			
@@ -195,7 +195,7 @@ 
 			WL_WHERE_RELATION,
 			WL_WHEN_RELATION	
 		);
-		if ( ! in_array( $requested_w, $all_w ) ) {
+		if ( ! in_array($requested_w, $all_w)) {
 			return $clauses;
 		}
 		
@@ -204,7 +204,7 @@ 
 		
 		// Change WP main query clauses
 		$clauses['join']     .= "INNER JOIN {$wl_relation_table} ON {$wpdb->posts}.ID = {$wl_relation_table}.object_id";
-		$clauses['where']    .= $wpdb->prepare( "AND {$wl_relation_table}.predicate = %s", $requested_w );
+		$clauses['where']    .= $wpdb->prepare("AND {$wl_relation_table}.predicate = %s", $requested_w);
 		$clauses['distinct'] .= "DISTINCT";
 		
 		return $clauses;

src/admin/class-wordlift-admin-dashboard.php

Indentation +217 added lines, -217 removed lines

@@ -14,83 +14,83 @@ 
 class Wordlift_Dashboard_Service {
 	
 
-	/**
-	 * Transient Name
-	 * 
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_NAME = 'wl_dashboard_stats';
-
-	/**
-	 * Transient Expiration (in seconds)
-	 * 
-	 * @since  3.4.0
-	 */
-	const TRANSIENT_EXPIRATION = 86400;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.4.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * Create a Wordlift_Entity_List_Service.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	public function __construct( $entity_service ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Dashboard_Service' );
-
-		$this->entity_service = $entity_service;
-
-	}
-
-	/**
-	 * Return stats layout
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string Dashboard widget html markup
-	 */
-	public function dashboard_widget_callback( $post ) {
-
-		$enriched_posts_title = __( 'enriched posts', 'wordlift' ); 
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'annotated_posts_percentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )  
-		); 
-
-		$rating_title = __( 'avarage entity rating', 'wordlift' ); 
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
-		); 
-
-		$graph_title = __( 'triples in your graph', 'wordlift' ); 
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
-		); 
-
-		$triples_label = __( 'triples', 'wordlift' ); 
+    /**
+     * Transient Name
+     * 
+     * @since  3.4.0
+     */
+    const TRANSIENT_NAME = 'wl_dashboard_stats';
+
+    /**
+     * Transient Expiration (in seconds)
+     * 
+     * @since  3.4.0
+     */
+    const TRANSIENT_EXPIRATION = 86400;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.4.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * Create a Wordlift_Entity_List_Service.
+     *
+     * @since 3.4.0
+     *
+     * @param \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    public function __construct( $entity_service ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Dashboard_Service' );
+
+        $this->entity_service = $entity_service;
+
+    }
+
+    /**
+     * Return stats layout
+     *
+     * @since 3.4.0
+     *
+     * @return string Dashboard widget html markup
+     */
+    public function dashboard_widget_callback( $post ) {
+
+        $enriched_posts_title = __( 'enriched posts', 'wordlift' ); 
+        $enriched_posts_caption = sprintf( wp_kses(
+            __( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ), 
+            array(  'a' => array( 'href' => array() ) ) ), 
+            $this->render_stat_param( 'annotated_posts_percentage' ),
+            esc_url( admin_url( 'edit.php' ) ),
+            $this->render_stat_param( 'annotated_posts' ),
+            $this->render_stat_param( 'posts' )  
+        ); 
+
+        $rating_title = __( 'avarage entity rating', 'wordlift' ); 
+        $rating_caption = sprintf( wp_kses(
+            __( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift' ), 
+            array(  'a' => array( 'href' => array() ) ) ), 
+            $this->render_stat_param( 'entities' ),
+            esc_url( admin_url( 'edit.php?post_type=entity' ) ),
+            $this->render_stat_param( 'rating' )
+        ); 
+
+        $graph_title = __( 'triples in your graph', 'wordlift' ); 
+        $graph_caption = sprintf( wp_kses(
+            __( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ), 
+            array(  'a' => array( 'href' => array() ) ) ), 
+            $this->render_stat_param( 'wikidata' ),
+            esc_url( 'https://www.wikidata.org/' )
+        ); 
+
+        $triples_label = __( 'triples', 'wordlift' ); 
 		
-		echo <<<EOF
+        echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
 		<div class="wl-stat-card">
 			<div class="wl-stat-graph-wrapper">
@@ -119,161 +119,161 @@ 
 	</div>
 EOF;
 
-	}
-
-	/**
-	 * Return stats
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string markup
-	 */
-	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array( $this, 'dashboard_widget_callback' ) );
-	}
-
-	/**
-	 * Return stats
-	 * @uses https://codex.wordpress.org/Function_Reference/set_transient
-	 *
-	 * @since 3.4.0
-	 *
-	 * @return string JSON obj with all available stats.
-	 */
-	public function ajax_get_stats() {
+    }
+
+    /**
+     * Return stats
+     *
+     * @since 3.4.0
+     *
+     * @return string markup
+     */
+    public function add_dashboard_widgets() {
+        wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array( $this, 'dashboard_widget_callback' ) );
+    }
+
+    /**
+     * Return stats
+     * @uses https://codex.wordpress.org/Function_Reference/set_transient
+     *
+     * @since 3.4.0
+     *
+     * @return string JSON obj with all available stats.
+     */
+    public function ajax_get_stats() {
 		
-		// If needed, the transient is force to reloaed
-		if ( isset( $_GET[ 'force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
-		}
-
-		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
-
-		if ( !$stats ) {
-			// Calculate stats
-			$stats = array(
-				'entities'	=>	$this->count_entities(),
-				'posts'	=>	$this->count_posts(),
-				'annotated_posts'	=>	$this->count_annotated_posts(),
-				'triples'	=> $this->count_triples(),
-				'rating' => $this->avarage_entities_rating(),
-			);	
-			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
-		}
-		// Return stats as json object
-		wl_core_send_json( $stats );
-	}
-
-	/**
-	 * Calculate total number of published posts
-	 * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of published posts.
-	 */
-	public function count_posts() {
+        // If needed, the transient is force to reloaed
+        if ( isset( $_GET[ 'force_reload'] ) ) {
+            delete_transient( self::TRANSIENT_NAME );
+        }
+
+        // Try to retrieve the transient
+        $stats = get_transient( self::TRANSIENT_NAME );
+
+        if ( !$stats ) {
+            // Calculate stats
+            $stats = array(
+                'entities'	=>	$this->count_entities(),
+                'posts'	=>	$this->count_posts(),
+                'annotated_posts'	=>	$this->count_annotated_posts(),
+                'triples'	=> $this->count_triples(),
+                'rating' => $this->avarage_entities_rating(),
+            );	
+            // Cache stats results trough transient
+            set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+        }
+        // Return stats as json object
+        wl_core_send_json( $stats );
+    }
+
+    /**
+     * Calculate total number of published posts
+     * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of published posts.
+     */
+    public function count_posts() {
 		
-		return (int) wp_count_posts()->publish;		
-	}
-
-	/**
-	 * Calculate total number of annotated published posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of annotated published posts.
-	 */
-	public function count_annotated_posts() {
+        return (int) wp_count_posts()->publish;		
+    }
+
+    /**
+     * Calculate total number of annotated published posts
+     * @since 3.4.0
+     *
+     * @return int Total number of annotated published posts.
+     */
+    public function count_annotated_posts() {
 		
-		// Prepare interaction with db
-    	global $wpdb;
-    	// Retrieve Wordlift relation instances table name
-    	$table_name = wl_core_get_relation_instances_table_name();
-    	// Calculate sql statement
-		$sql_statement = <<<EOF
+        // Prepare interaction with db
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+        // Calculate sql statement
+        $sql_statement = <<<EOF
     		SELECT COUNT(distinct(p.id)) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 EOF;
-		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement ); 
+        // Perform the query
+        return (int) $wpdb->get_var( $sql_statement ); 
 		
-	}
-
-	/**
-	 * Calculate the avarage entities rating
-	 * @since 3.4.0
-	 *
-	 * @return int Avarage entities rating.
-	 */
-	public function avarage_entities_rating() {
+    }
+
+    /**
+     * Calculate the avarage entities rating
+     * @since 3.4.0
+     *
+     * @return int Avarage entities rating.
+     */
+    public function avarage_entities_rating() {
 		
-		// Prepare interaction with db
-    	global $wpdb;
-		$query = $wpdb->prepare( 
-			"SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
-   			Wordlift_Entity_Service::RATING_RAW_SCORE_META_KEY
-			);
-		// Perform the query
-		return $this->entity_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) ); 	
-	}
-
-	/**
-	 * Calculate total number of published entities
-	 * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of posts.
-	 */
-	public function count_entities() {
+        // Prepare interaction with db
+        global $wpdb;
+        $query = $wpdb->prepare( 
+            "SELECT AVG(meta_value) FROM $wpdb->postmeta where meta_key = %s",
+                Wordlift_Entity_Service::RATING_RAW_SCORE_META_KEY
+            );
+        // Perform the query
+        return $this->entity_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) ); 	
+    }
+
+    /**
+     * Calculate total number of published entities
+     * @uses https://codex.wordpress.org/it:Riferimento_funzioni/wp_count_posts
+     * @since 3.4.0
+     *
+     * @return int Total number of posts.
+     */
+    public function count_entities() {
 		
-		return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;		
-	}
-
-	/**
-	 * Calculate total number of published rdf triples
-	 * @since 3.4.0
-	 *
-	 * @return int Total number of triples.
-	 */
-	public function count_triples() {
+        return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;		
+    }
+
+    /**
+     * Calculate total number of published rdf triples
+     * @since 3.4.0
+     *
+     * @return int Total number of triples.
+     */
+    public function count_triples() {
 		
-		// Set the SPARQL query.
-		$sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
-		// Send the request.
-		$response = $this->rl_sparql_select( $sparql );
-
-		// Return the error in case of failure.
-		if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
-			return (int) FALSE;
-		}
-
-		// Get the body.
-		$body = $response['body'];
-		// Get the values.
-		$matches = array();
-		if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
-			// Return the counts.
-			return (int) $matches[1];
-		}
+        // Set the SPARQL query.
+        $sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
+        // Send the request.
+        $response = $this->rl_sparql_select( $sparql );
+
+        // Return the error in case of failure.
+        if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+            return (int) FALSE;
+        }
+
+        // Get the body.
+        $body = $response['body'];
+        // Get the values.
+        $matches = array();
+        if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
+            // Return the counts.
+            return (int) $matches[1];
+        }
 		
-		return (int) FALSE;
-	}
+        return (int) FALSE;
+    }
 
-	private function rl_sparql_select( $query ) {
+    private function rl_sparql_select( $query ) {
 
-		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
-		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
-		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+        // Prepare the SPARQL statement by prepending the default namespaces.
+        $sparql = rl_sparql_prefixes() . "\n" . $query;
+        // Get the SPARQL SELECT URL.
+        $url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+        // Prepare the request.
+        $args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
 
-		return wp_remote_get( $url, $args );
-	}
+        return wp_remote_get( $url, $args );
+    }
 
-	private function render_stat_param( $param ) {
+    private function render_stat_param( $param ) {
 
-		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
-	}
+        return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
+    }
 
 }

Spacing +46 added lines, -46 removed lines

@@ -44,9 +44,9 @@ 
 	 *
 	 * @param \Wordlift_Entity_Service $entity_service The Entity service.
 	 */
-	public function __construct( $entity_service ) {
+	public function __construct($entity_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Dashboard_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Dashboard_Service');
 
 		$this->entity_service = $entity_service;
 
@@ -59,36 +59,36 @@ 
 	 *
 	 * @return string Dashboard widget html markup
 	 */
-	public function dashboard_widget_callback( $post ) {
-
-		$enriched_posts_title = __( 'enriched posts', 'wordlift' ); 
-		$enriched_posts_caption = sprintf( wp_kses(
-			__( '%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'annotated_posts_percentage' ),
-			esc_url( admin_url( 'edit.php' ) ),
-			$this->render_stat_param( 'annotated_posts' ),
-			$this->render_stat_param( 'posts' )  
+	public function dashboard_widget_callback($post) {
+
+		$enriched_posts_title = __('enriched posts', 'wordlift'); 
+		$enriched_posts_caption = sprintf(wp_kses(
+			__('%1$s, of your <a href="%2$s">posts</a> are annotated. This means %3$s annotated posts on %4$s.', 'wordlift'), 
+			array('a' => array('href' => array())) ), 
+			$this->render_stat_param('annotated_posts_percentage'),
+			esc_url(admin_url('edit.php')),
+			$this->render_stat_param('annotated_posts'),
+			$this->render_stat_param('posts')  
 		); 
 
-		$rating_title = __( 'avarage entity rating', 'wordlift' ); 
-		$rating_caption = sprintf( wp_kses(
-			__( 'You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'entities' ),
-			esc_url( admin_url( 'edit.php?post_type=entity' ) ),
-			$this->render_stat_param( 'rating' )
+		$rating_title = __('avarage entity rating', 'wordlift'); 
+		$rating_caption = sprintf(wp_kses(
+			__('You have %1$s entities in your <a href="%2$s">vocabulary</a> with an avarage rating of %3$s.', 'wordlift'), 
+			array('a' => array('href' => array())) ), 
+			$this->render_stat_param('entities'),
+			esc_url(admin_url('edit.php?post_type=entity')),
+			$this->render_stat_param('rating')
 		); 
 
-		$graph_title = __( 'triples in your graph', 'wordlift' ); 
-		$graph_caption = sprintf( wp_kses(
-			__( 'Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift' ), 
-			array(  'a' => array( 'href' => array() ) ) ), 
-			$this->render_stat_param( 'wikidata' ),
-			esc_url( 'https://www.wikidata.org/' )
+		$graph_title = __('triples in your graph', 'wordlift'); 
+		$graph_caption = sprintf(wp_kses(
+			__('Your graphs size corresponds to %1$s of <a href="%2$s">Wikidata</a>.', 'wordlift'), 
+			array('a' => array('href' => array())) ), 
+			$this->render_stat_param('wikidata'),
+			esc_url('https://www.wikidata.org/')
 		); 
 
-		$triples_label = __( 'triples', 'wordlift' ); 
+		$triples_label = __('triples', 'wordlift'); 
 		
 		echo <<<EOF
 	<div id="wl-dashboard-widget-inner-wrapper">
@@ -129,7 +129,7 @@ 
 	 * @return string markup
 	 */
 	public function add_dashboard_widgets() {
-		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array( $this, 'dashboard_widget_callback' ) );
+		wp_add_dashboard_widget('wordlift-dashboard-widget', 'WordLift Dashboard', array($this, 'dashboard_widget_callback'));
 	}
 
 	/**
@@ -143,14 +143,14 @@ 
 	public function ajax_get_stats() {
 		
 		// If needed, the transient is force to reloaed
-		if ( isset( $_GET[ 'force_reload'] ) ) {
-			delete_transient( self::TRANSIENT_NAME );
+		if (isset($_GET['force_reload'])) {
+			delete_transient(self::TRANSIENT_NAME);
 		}
 
 		// Try to retrieve the transient
-		$stats = get_transient( self::TRANSIENT_NAME );
+		$stats = get_transient(self::TRANSIENT_NAME);
 
-		if ( !$stats ) {
+		if ( ! $stats) {
 			// Calculate stats
 			$stats = array(
 				'entities'	=>	$this->count_entities(),
@@ -160,10 +160,10 @@ 
 				'rating' => $this->avarage_entities_rating(),
 			);	
 			// Cache stats results trough transient
-			set_transient( self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION );
+			set_transient(self::TRANSIENT_NAME, $stats, self::TRANSIENT_EXPIRATION);
 		}
 		// Return stats as json object
-		wl_core_send_json( $stats );
+		wl_core_send_json($stats);
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
     		SELECT COUNT(distinct(p.id)) FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.subject_id AND p.post_type = 'post' AND p.post_status = 'publish';
 EOF;
 		// Perform the query
-		return (int) $wpdb->get_var( $sql_statement ); 
+		return (int) $wpdb->get_var($sql_statement); 
 		
 	}
 
@@ -214,7 +214,7 @@ 
    			Wordlift_Entity_Service::RATING_RAW_SCORE_META_KEY
 			);
 		// Perform the query
-		return $this->entity_service->convert_raw_score_to_percentage( $wpdb->get_var( $query ) ); 	
+		return $this->entity_service->convert_raw_score_to_percentage($wpdb->get_var($query)); 	
 	}
 
 	/**
@@ -226,7 +226,7 @@ 
 	 */
 	public function count_entities() {
 		
-		return (int) wp_count_posts( Wordlift_Entity_Service::TYPE_NAME )->publish;		
+		return (int) wp_count_posts(Wordlift_Entity_Service::TYPE_NAME)->publish;		
 	}
 
 	/**
@@ -240,10 +240,10 @@ 
 		// Set the SPARQL query.
 		$sparql = 'SELECT (COUNT(*) AS ?no) { ?s ?p ?o  }';
 		// Send the request.
-		$response = $this->rl_sparql_select( $sparql );
+		$response = $this->rl_sparql_select($sparql);
 
 		// Return the error in case of failure.
-		if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+		if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 			return (int) FALSE;
 		}
 
@@ -251,7 +251,7 @@ 
 		$body = $response['body'];
 		// Get the values.
 		$matches = array();
-		if ( 1 === preg_match( '/(\d+)/im', $body, $matches ) && 2 === count( $matches ) ) {
+		if (1 === preg_match('/(\d+)/im', $body, $matches) && 2 === count($matches)) {
 			// Return the counts.
 			return (int) $matches[1];
 		}
@@ -259,21 +259,21 @@ 
 		return (int) FALSE;
 	}
 
-	private function rl_sparql_select( $query ) {
+	private function rl_sparql_select($query) {
 
 		// Prepare the SPARQL statement by prepending the default namespaces.
-		$sparql = rl_sparql_prefixes() . "\n" . $query;
+		$sparql = rl_sparql_prefixes()."\n".$query;
 		// Get the SPARQL SELECT URL.
-		$url = wl_configuration_get_query_select_url( 'csv' ) . urlencode( $sparql );
+		$url = wl_configuration_get_query_select_url('csv').urlencode($sparql);
 		// Prepare the request.
-		$args = unserialize( WL_REDLINK_API_HTTP_OPTIONS );
+		$args = unserialize(WL_REDLINK_API_HTTP_OPTIONS);
 
-		return wp_remote_get( $url, $args );
+		return wp_remote_get($url, $args);
 	}
 
-	private function render_stat_param( $param ) {
+	private function render_stat_param($param) {
 
-		return '<span id="wl-dashboard-widget-' . $param . '" class="wl-stat-value"></span>';
+		return '<span id="wl-dashboard-widget-'.$param.'" class="wl-stat-value"></span>';
 	}
 
 }

src/admin/class-wordlift-entity-types-taxonomy-walker.php

Indentation +61 added lines, -61 removed lines

@@ -4,7 +4,7 @@ 
  * Entity Types taxonomy.
  */
 if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/template.php' );
+    require_once( ABSPATH . 'wp-admin/includes/template.php' );
 }
 
 /**
@@ -14,79 +14,79 @@ 
  */
 class Wordlift_Entity_Types_Taxonomy_Walker extends Walker_Category_Checklist {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
 
-	/**
-	 * Create an instance of Wordlift_Entity_Types_Taxonomy_Walker.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
+    /**
+     * Create an instance of Wordlift_Entity_Types_Taxonomy_Walker.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Types_Taxonomy_Walker' );
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Types_Taxonomy_Walker' );
 
-	}
+    }
 
-	/**
-	 * Entity taxonomy metabox must show exclusive options, no checkboxes.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param $args
-	 *
-	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
-	 */
-	function terms_checklist_args( $args ) {
+    /**
+     * Entity taxonomy metabox must show exclusive options, no checkboxes.
+     *
+     * @since 3.1.0
+     *
+     * @param $args
+     *
+     * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
+     */
+    function terms_checklist_args( $args ) {
 
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
-			return $args;
-		}
+        if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+            return $args;
+        }
 
-		// We override the way WP prints the taxonomy metabox HTML
-		$args['walker']        = $this;
-		$args['checked_ontop'] = false;
+        // We override the way WP prints the taxonomy metabox HTML
+        $args['walker']        = $this;
+        $args['checked_ontop'] = false;
 
-		return $args;
+        return $args;
 
-	}
+    }
 
 
-	/**
-	 * Change checkboxes to radios.
-	 *
-	 * $max_depth = -1 means flatly display every element.
-	 * $max_depth = 0 means display all levels.
-	 * $max_depth > 0 specifies the number of display levels.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param array $elements An array of elements.
-	 * @param int $max_depth The maximum hierarchical depth.
-	 *
-	 * @param array $args Additional arguments.
-	 *
-	 * @return string The hierarchical item output.
-	 */
-	public function walk( $elements, $max_depth, $args = array() ) {
+    /**
+     * Change checkboxes to radios.
+     *
+     * $max_depth = -1 means flatly display every element.
+     * $max_depth = 0 means display all levels.
+     * $max_depth > 0 specifies the number of display levels.
+     *
+     * @since 3.1.0
+     *
+     * @param array $elements An array of elements.
+     * @param int $max_depth The maximum hierarchical depth.
+     *
+     * @param array $args Additional arguments.
+     *
+     * @return string The hierarchical item output.
+     */
+    public function walk( $elements, $max_depth, $args = array() ) {
 
-		$output = parent::walk( $elements, $max_depth, $args );
+        $output = parent::walk( $elements, $max_depth, $args );
 		
-		global $post; 
+        global $post; 
 		
-		$output = str_replace(
-			array( "type=\"checkbox\"", "type='checkbox'" ),
-			array( "type=\"radio\"", "type='radio'" ),
-			$output
-		);
+        $output = str_replace(
+            array( "type=\"checkbox\"", "type='checkbox'" ),
+            array( "type=\"radio\"", "type='radio'" ),
+            $output
+        );
 
-		return $output;
-	}
+        return $output;
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -3,8 +3,8 @@ 
  * This file contains the Entity Types Taxonomy Walker whose main role is to turn checkboxes to radios for the
  * Entity Types taxonomy.
  */
-if ( ! class_exists( 'Walker_Category_Checklist' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/template.php' );
+if ( ! class_exists('Walker_Category_Checklist')) {
+	require_once(ABSPATH.'wp-admin/includes/template.php');
 }
 
 /**
@@ -30,7 +30,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Types_Taxonomy_Walker' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_Types_Taxonomy_Walker');
 
 	}
 
@@ -43,9 +43,9 @@ 
 	 *
 	 * @return array An array of arguments, with this walker in case the taxonomy is the Entity Type taxonomy.
 	 */
-	function terms_checklist_args( $args ) {
+	function terms_checklist_args($args) {
 
-		if ( ! isset( $args['taxonomy'] ) || Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy'] ) {
+		if ( ! isset($args['taxonomy']) || Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME !== $args['taxonomy']) {
 			return $args;
 		}
 
@@ -74,15 +74,15 @@ 
 	 *
 	 * @return string The hierarchical item output.
 	 */
-	public function walk( $elements, $max_depth, $args = array() ) {
+	public function walk($elements, $max_depth, $args = array()) {
 
-		$output = parent::walk( $elements, $max_depth, $args );
+		$output = parent::walk($elements, $max_depth, $args);
 		
 		global $post; 
 		
 		$output = str_replace(
-			array( "type=\"checkbox\"", "type='checkbox'" ),
-			array( "type=\"radio\"", "type='radio'" ),
+			array("type=\"checkbox\"", "type='checkbox'"),
+			array("type=\"radio\"", "type='radio'"),
 			$output
 		);
 

src/wordlift_entity_type.php

Indentation +76 added lines, -76 removed lines

@@ -5,33 +5,33 @@ 
  */
 function wl_entity_type_register() {
 
-	$labels = array(
-		'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-		'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-		'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-		'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-		'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-		'new_item'           => __( 'New Entity', 'wordlift' ),
-		'all_items'          => __( 'All Entities', 'wordlift' ),
-		'view_item'          => __( 'View Entity', 'wordlift' ),
-		'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-		'not_found'          => __( 'No entities found', 'wordlift' ),
-		'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
-		'parent_item_colon'  => '',
-		'menu_name'          => __( 'Vocabulary', 'wordlift' )
-	);
-
-	$args = array(
-		'labels'        => $labels,
-		'description'   => 'Holds our vocabulary (set of entities) and entity specific data',
-		'public'        => true,
-		'menu_position' => 20, // after the pages menu.
-		'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'comments' ),
-		'has_archive'   => true,
-		'menu_icon'		=> 'dashicons-tag'
-	);
-
-	register_post_type( Wordlift_Entity_Service::TYPE_NAME, $args );
+    $labels = array(
+        'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
+        'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
+        'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
+        'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
+        'edit_item'          => __( 'Edit Entity', 'wordlift' ),
+        'new_item'           => __( 'New Entity', 'wordlift' ),
+        'all_items'          => __( 'All Entities', 'wordlift' ),
+        'view_item'          => __( 'View Entity', 'wordlift' ),
+        'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
+        'not_found'          => __( 'No entities found', 'wordlift' ),
+        'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+        'parent_item_colon'  => '',
+        'menu_name'          => __( 'Vocabulary', 'wordlift' )
+    );
+
+    $args = array(
+        'labels'        => $labels,
+        'description'   => 'Holds our vocabulary (set of entities) and entity specific data',
+        'public'        => true,
+        'menu_position' => 20, // after the pages menu.
+        'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'comments' ),
+        'has_archive'   => true,
+        'menu_icon'		=> 'dashicons-tag'
+    );
+
+    register_post_type( Wordlift_Entity_Service::TYPE_NAME, $args );
 }
 
 add_action( 'init', 'wl_entity_type_register' );
@@ -46,30 +46,30 @@ 
 
 //	wl_write_log( "wl_set_entity_main_type [ post id :: $post_id ][ type uri :: $type_uri ]" );
 
-	// If the type URI is empty we remove the type.
-	if ( empty( $type_uri ) ) {
-		wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-		return;
-	}
-
-	// Get all the terms bound to the wl_entity_type taxonomy.
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-		'hide_empty' => false,
-		'fields'     => 'id=>slug'
-	) );
-
-	// Check which term matches the specified URI.
-	foreach ( $terms as $term_id => $term_slug ) {
-		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
-		// Set the related term ID.
-		if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
-			wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
-
-			return;
-		}
-	}
+    // If the type URI is empty we remove the type.
+    if ( empty( $type_uri ) ) {
+        wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+        return;
+    }
+
+    // Get all the terms bound to the wl_entity_type taxonomy.
+    $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+        'hide_empty' => false,
+        'fields'     => 'id=>slug'
+    ) );
+
+    // Check which term matches the specified URI.
+    foreach ( $terms as $term_id => $term_slug ) {
+        // Load the type data.
+        $type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
+        // Set the related term ID.
+        if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
+            wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+
+            return;
+        }
+    }
 }
 
 /**
@@ -77,46 +77,46 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
-		'hide_empty' => false
-	) );
+    $terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+        'hide_empty' => false
+    ) );
 
-	echo <<<EOF
+    echo <<<EOF
     <script type="text/javascript">
         (function() {
         var t = [];
 
 EOF;
 
-	// Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
-	// to be used by the JavaScript client library.
-	foreach ( $terms as $term ) {
+    // Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
+    // to be used by the JavaScript client library.
+    foreach ( $terms as $term ) {
 
-		$term_name = $term->name;
+        $term_name = $term->name;
 
-		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+        // Load the type data.
+        $type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
 
-		// Skip types that are not defined.
-		if ( ! empty( $type['uri'] ) ) {
+        // Skip types that are not defined.
+        if ( ! empty( $type['uri'] ) ) {
 
-			// Prepare the JSON output then print it to the browser.
-			$json = json_encode( array(
-				'label'     => $term_name,
-				'uri'       => $type['uri'],
-				'css'       => $type['css_class'],
-				'sameAs'    => $type['same_as'],
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			) );
+            // Prepare the JSON output then print it to the browser.
+            $json = json_encode( array(
+                'label'     => $term_name,
+                'uri'       => $type['uri'],
+                'css'       => $type['css_class'],
+                'sameAs'    => $type['same_as'],
+                'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
+            ) );
 
-			// Output the type data.
-			echo "t.push($json);\n";
+            // Output the type data.
+            echo "t.push($json);\n";
 
-		}
+        }
 
-	}
+    }
 
-	echo <<<EOF
+    echo <<<EOF
             if ('undefined' == typeof window.wordlift) {
                 window.wordlift = {}
             }

Spacing +34 added lines, -34 removed lines

@@ -6,19 +6,19 @@ 
 function wl_entity_type_register() {
 
 	$labels = array(
-		'name'               => _x( 'Vocabulary', 'post type general name', 'wordlift' ),
-		'singular_name'      => _x( 'Entity', 'post type singular name', 'wordlift' ),
-		'add_new'            => _x( 'Add New Entity', 'entity', 'wordlift' ),
-		'add_new_item'       => __( 'Add New Entity', 'wordlift' ),
-		'edit_item'          => __( 'Edit Entity', 'wordlift' ),
-		'new_item'           => __( 'New Entity', 'wordlift' ),
-		'all_items'          => __( 'All Entities', 'wordlift' ),
-		'view_item'          => __( 'View Entity', 'wordlift' ),
-		'search_items'       => __( 'Search in Vocabulary', 'wordlift' ),
-		'not_found'          => __( 'No entities found', 'wordlift' ),
-		'not_found_in_trash' => __( 'No entities found in the Trash', 'wordlift' ),
+		'name'               => _x('Vocabulary', 'post type general name', 'wordlift'),
+		'singular_name'      => _x('Entity', 'post type singular name', 'wordlift'),
+		'add_new'            => _x('Add New Entity', 'entity', 'wordlift'),
+		'add_new_item'       => __('Add New Entity', 'wordlift'),
+		'edit_item'          => __('Edit Entity', 'wordlift'),
+		'new_item'           => __('New Entity', 'wordlift'),
+		'all_items'          => __('All Entities', 'wordlift'),
+		'view_item'          => __('View Entity', 'wordlift'),
+		'search_items'       => __('Search in Vocabulary', 'wordlift'),
+		'not_found'          => __('No entities found', 'wordlift'),
+		'not_found_in_trash' => __('No entities found in the Trash', 'wordlift'),
 		'parent_item_colon'  => '',
-		'menu_name'          => __( 'Vocabulary', 'wordlift' )
+		'menu_name'          => __('Vocabulary', 'wordlift')
 	);
 
 	$args = array(
@@ -26,15 +26,15 @@ 
 		'description'   => 'Holds our vocabulary (set of entities) and entity specific data',
 		'public'        => true,
 		'menu_position' => 20, // after the pages menu.
-		'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'comments' ),
+		'supports'      => array('title', 'editor', 'thumbnail', 'excerpt', 'comments'),
 		'has_archive'   => true,
 		'menu_icon'		=> 'dashicons-tag'
 	);
 
-	register_post_type( Wordlift_Entity_Service::TYPE_NAME, $args );
+	register_post_type(Wordlift_Entity_Service::TYPE_NAME, $args);
 }
 
-add_action( 'init', 'wl_entity_type_register' );
+add_action('init', 'wl_entity_type_register');
 
 /**
  * Set the main type for the entity using the related taxonomy.
@@ -42,30 +42,30 @@ 
  * @param int $post_id The numeric post ID.
  * @param string $type_uri A type URI.
  */
-function wl_set_entity_main_type( $post_id, $type_uri ) {
+function wl_set_entity_main_type($post_id, $type_uri) {
 
 //	wl_write_log( "wl_set_entity_main_type [ post id :: $post_id ][ type uri :: $type_uri ]" );
 
 	// If the type URI is empty we remove the type.
-	if ( empty( $type_uri ) ) {
-		wp_set_object_terms( $post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+	if (empty($type_uri)) {
+		wp_set_object_terms($post_id, null, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 		return;
 	}
 
 	// Get all the terms bound to the wl_entity_type taxonomy.
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+	$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 		'hide_empty' => false,
 		'fields'     => 'id=>slug'
-	) );
+	));
 
 	// Check which term matches the specified URI.
-	foreach ( $terms as $term_id => $term_slug ) {
+	foreach ($terms as $term_id => $term_slug) {
 		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term_slug );
+		$type = Wordlift_Schema_Service::get_instance()->get_schema($term_slug);
 		// Set the related term ID.
-		if ( $type_uri === $type['uri'] || $type_uri === $type['css_class'] ) {
-			wp_set_object_terms( $post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME );
+		if ($type_uri === $type['uri'] || $type_uri === $type['css_class']) {
+			wp_set_object_terms($post_id, (int) $term_id, Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME);
 
 			return;
 		}
@@ -77,9 +77,9 @@ 
  */
 function wl_print_entity_type_inline_js() {
 
-	$terms = get_terms( Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
+	$terms = get_terms(Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME, array(
 		'hide_empty' => false
-	) );
+	));
 
 	echo <<<EOF
     <script type="text/javascript">
@@ -90,24 +90,24 @@ 
 
 	// Cycle in each WordLift term and get its metadata. The metadata will be printed as a global object in JavaScript
 	// to be used by the JavaScript client library.
-	foreach ( $terms as $term ) {
+	foreach ($terms as $term) {
 
 		$term_name = $term->name;
 
 		// Load the type data.
-		$type = Wordlift_Schema_Service::get_instance()->get_schema( $term->slug );
+		$type = Wordlift_Schema_Service::get_instance()->get_schema($term->slug);
 
 		// Skip types that are not defined.
-		if ( ! empty( $type['uri'] ) ) {
+		if ( ! empty($type['uri'])) {
 
 			// Prepare the JSON output then print it to the browser.
-			$json = json_encode( array(
+			$json = json_encode(array(
 				'label'     => $term_name,
 				'uri'       => $type['uri'],
 				'css'       => $type['css_class'],
 				'sameAs'    => $type['same_as'],
-				'templates' => ( isset( $type['templates'] ) ? $type['templates'] : array() ),
-			) );
+				'templates' => (isset($type['templates']) ? $type['templates'] : array()),
+			));
 
 			// Output the type data.
 			echo "t.push($json);\n";
@@ -128,6 +128,6 @@ 
 
 }
 
-add_action( 'admin_print_scripts', 'wl_print_entity_type_inline_js' );
+add_action('admin_print_scripts', 'wl_print_entity_type_inline_js');
 
-add_action( 'init', 'wl_entity_type_taxonomy_register', 0 );
+add_action('init', 'wl_entity_type_taxonomy_register', 0);

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

Indentation +705 added lines, -705 removed lines

@@ -7,748 +7,748 @@
  */
 class Wordlift_Entity_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * The UI service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	private $ui_service;
-
-	/**
-	 * The Schema service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Schema_Service $schema_service The Schema service.
-	 */
-	private $schema_service;
-
-	/**
-	 * The Notice service.
-	 *
-	 * @since 3.3.0
-	 * @access private
-	 * @var \Wordlift_Notice_Service $notice_service The Notice service.
-	 */
-	private $notice_service;
-
-	/**
-	 * The entity post type name.
-	 *
-	 * @since 3.1.0
-	 */
-	const TYPE_NAME = 'entity';
-
-	/**
-	 * Entity rating max.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_MAX = 7;
+    /**
+     * The Log service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * The UI service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_UI_Service $ui_service The UI service.
+     */
+    private $ui_service;
+
+    /**
+     * The Schema service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Schema_Service $schema_service The Schema service.
+     */
+    private $schema_service;
+
+    /**
+     * The Notice service.
+     *
+     * @since 3.3.0
+     * @access private
+     * @var \Wordlift_Notice_Service $notice_service The Notice service.
+     */
+    private $notice_service;
+
+    /**
+     * The entity post type name.
+     *
+     * @since 3.1.0
+     */
+    const TYPE_NAME = 'entity';
+
+    /**
+     * Entity rating max.
+     *
+     * @since 3.3.0
+     */
+    const RATING_MAX = 7;
 	
-	/**
-	 * Entity rating score meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
+    /**
+     * Entity rating score meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_RAW_SCORE_META_KEY = '_wl_entity_rating_raw_score';
 	
-	/**
-	 * Entity rating warnings meta key.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
-
-	/**
-	 * Entity warning has related post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
-
-	/**
-	 * Entity warning has content post identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
-
-	/**
-	 * Entity warning has related entities identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
-
-	/**
-	 * Entity warning is published identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
-
-	/**
-	 * Entity warning has thumbnail identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
-
-	/**
-	 * Entity warning has same as identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
-
-	/**
-	 * Entity warning has completed metadata identifier.
-	 *
-	 * @since 3.3.0
-	 */
-	const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
-
-	/**
-	 * The alternative label meta key.
-	 *
-	 * @since 3.2.0
-	 */
-	const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
-
-	/**
-	 * The alternative label input template.
-	 *
-	 * @since 3.2.0
-	 */
-	// TODO: this should be moved to a class that deals with HTML code.
-	const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
+    /**
+     * Entity rating warnings meta key.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNINGS_META_KEY = '_wl_entity_rating_warnings';
+
+    /**
+     * Entity warning has related post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_POSTS = 'There are no related posts for the current entity.';
+
+    /**
+     * Entity warning has content post identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_CONTENT_POST = 'This entity has not description.';
+
+    /**
+     * Entity warning has related entities identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_RELATED_ENTITIES = 'There are no related entities for the current entity.';
+
+    /**
+     * Entity warning is published identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_IS_PUBLISHED = 'This entity is not published. It will not appear within analysis results.';
+
+    /**
+     * Entity warning has thumbnail identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_THUMBNAIL = 'This entity has no featured image yet.';
+
+    /**
+     * Entity warning has same as identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_SAME_AS = 'There are no sameAs configured for this entity.';
+
+    /**
+     * Entity warning has completed metadata identifier.
+     *
+     * @since 3.3.0
+     */
+    const RATING_WARNING_HAS_COMPLETED_METADATA = 'Schema.org metadata for this entity are not completed.';
+
+    /**
+     * The alternative label meta key.
+     *
+     * @since 3.2.0
+     */
+    const ALTERNATIVE_LABEL_META_KEY = '_wl_alt_label';
+
+    /**
+     * The alternative label input template.
+     *
+     * @since 3.2.0
+     */
+    // TODO: this should be moved to a class that deals with HTML code.
+    const ALTERNATIVE_LABEL_INPUT_TEMPLATE = '<div class="wl-alternative-label">
                 <label class="screen-reader-text" id="wl-alternative-label-prompt-text" for="wl-alternative-label">Enter alternative label here</label>
                 <input name="wl_alternative_label[]" size="30" value="%s" id="wl-alternative-label" type="text">
                 <button class="button wl-delete-button">%s</button>
                 </div>';
 
-	/**
-	 * A singleton instance of the Entity service.
-	 *
-	 * @since 3.2.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Entity_Service instance.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param \Wordlift_UI_Service $ui_service The UI service.
-	 */
-	public function __construct( $ui_service, $schema_service, $notice_service ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
-
-		// Set the UI service.
-		$this->ui_service = $ui_service;
-
-		// Set the Schema service.
-		$this->schema_service = $schema_service;
-
-		// Set the Schema service.
-		$this->notice_service = $notice_service;
-
-		// Set the singleton instance.
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Entity service.
-	 *
-	 * @since 3.2.0
-	 * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get rating max 
-	 *
-	 * @since 3.3.0
-	 *
-	 * @return int Max rating according to performed checks.
-	 */
-	public static function get_rating_max() {
-		return self::RATING_MAX;
-	}
-
-	/**
-	 * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
-	 * its specific function).
-	 *
-	 * @since 3.1.0
-	 *
-	 * @return array An array of post IDs.
-	 */
-	public function get_all_related_to_last_50_published_posts() {
-
-		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
-			'numberposts' => 50,
-			'fields'      => 'ids', //only get post IDs
-			'post_type'   => 'post',
-			'post_status' => 'publish'
-		) );
-
-		if ( empty( $latest_posts_ids ) ) {
-			// There are no posts.
-			return array();
-		}
-
-		// Collect entities related to latest posts
-		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
-				'status' => 'publish'
-			) ) );
-		}
-
-		return $entity_ids;
-	}
-
-	/**
-	 * Determines whether a post is an entity or not.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param int $post_id A post id.
-	 *
-	 * @return bool Return true if the post is an entity otherwise false.
-	 */
-	public function is_entity( $post_id ) {
-
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
-	}
-
-	/**
-	 * Build an entity uri for a given title
-	 * The uri is composed using a given post_type and a title
-	 * If already exists an entity e2 with a given uri a numeric suffix is added
-	 * If a schema type is given entities with same label and same type are overridden 
-	 *
-	 * @since 3.5.0
-	 *
-	 * @param string $title A post title.
-	 * @param string $post_type A post type. Default value is 'entity'
-	 * @param string $schema_type A schema org type. 
-	 * @param integer $increment_digit A digit used to call recursively the same function.
-	 *
-	 * @return string Returns an uri.
-	 */
-	public function build_uri( $title, $post_type, $schema_type = NULL, $increment_digit = 0 ) {
+    /**
+     * A singleton instance of the Entity service.
+     *
+     * @since 3.2.0
+     * @access private
+     * @var \Wordlift_Entity_Service $instance A singleton instance of the Entity service.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Entity_Service instance.
+     *
+     * @since 3.2.0
+     *
+     * @param \Wordlift_UI_Service $ui_service The UI service.
+     */
+    public function __construct( $ui_service, $schema_service, $notice_service ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+
+        // Set the UI service.
+        $this->ui_service = $ui_service;
+
+        // Set the Schema service.
+        $this->schema_service = $schema_service;
+
+        // Set the Schema service.
+        $this->notice_service = $notice_service;
+
+        // Set the singleton instance.
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Entity service.
+     *
+     * @since 3.2.0
+     * @return \Wordlift_Entity_Service The singleton instance of the Entity service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get rating max 
+     *
+     * @since 3.3.0
+     *
+     * @return int Max rating according to performed checks.
+     */
+    public static function get_rating_max() {
+        return self::RATING_MAX;
+    }
+
+    /**
+     * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
+     * its specific function).
+     *
+     * @since 3.1.0
+     *
+     * @return array An array of post IDs.
+     */
+    public function get_all_related_to_last_50_published_posts() {
+
+        // Global timeline. Get entities from the latest posts.
+        $latest_posts_ids = get_posts( array(
+            'numberposts' => 50,
+            'fields'      => 'ids', //only get post IDs
+            'post_type'   => 'post',
+            'post_status' => 'publish'
+        ) );
+
+        if ( empty( $latest_posts_ids ) ) {
+            // There are no posts.
+            return array();
+        }
+
+        // Collect entities related to latest posts
+        $entity_ids = array();
+        foreach ( $latest_posts_ids as $id ) {
+            $entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+                'status' => 'publish'
+            ) ) );
+        }
+
+        return $entity_ids;
+    }
+
+    /**
+     * Determines whether a post is an entity or not.
+     *
+     * @since 3.1.0
+     *
+     * @param int $post_id A post id.
+     *
+     * @return bool Return true if the post is an entity otherwise false.
+     */
+    public function is_entity( $post_id ) {
+
+        return ( self::TYPE_NAME === get_post_type( $post_id ) );
+    }
+
+    /**
+     * Build an entity uri for a given title
+     * The uri is composed using a given post_type and a title
+     * If already exists an entity e2 with a given uri a numeric suffix is added
+     * If a schema type is given entities with same label and same type are overridden 
+     *
+     * @since 3.5.0
+     *
+     * @param string $title A post title.
+     * @param string $post_type A post type. Default value is 'entity'
+     * @param string $schema_type A schema org type. 
+     * @param integer $increment_digit A digit used to call recursively the same function.
+     *
+     * @return string Returns an uri.
+     */
+    public function build_uri( $title, $post_type, $schema_type = NULL, $increment_digit = 0 ) {
 		
-		// Get the entity slug suffix digit
-		$suffix_digit = $increment_digit + 1;
-		// Get a sanitized uri for a given title
-		$entity_slug = ( 0 == $increment_digit ) ? 
-			wl_sanitize_uri_path( $title ) :
-			wl_sanitize_uri_path( $title . '_'. $suffix_digit );
-
-		// Compose a candidated uri
-		$new_entity_uri = sprintf( '%s/%s/%s', 
-			wl_configuration_get_redlink_dataset_uri(), 
-			$post_type, 
-			$entity_slug 
-		); 
+        // Get the entity slug suffix digit
+        $suffix_digit = $increment_digit + 1;
+        // Get a sanitized uri for a given title
+        $entity_slug = ( 0 == $increment_digit ) ? 
+            wl_sanitize_uri_path( $title ) :
+            wl_sanitize_uri_path( $title . '_'. $suffix_digit );
+
+        // Compose a candidated uri
+        $new_entity_uri = sprintf( '%s/%s/%s', 
+            wl_configuration_get_redlink_dataset_uri(), 
+            $post_type, 
+            $entity_slug 
+        ); 
 		
-		$this->log_service->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+        $this->log_service->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
 		
-		global $wpdb;
-    	// Check if the candidated uri already is used
-    	// TODO Get post ids instead of count()
-		$stmt = $wpdb->prepare( 
-    		"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s LIMIT 1", 
-    		WL_ENTITY_URL_META_NAME,
-    		$new_entity_uri
-    	);
-
-    	// Perform the query
-		$post_id = $wpdb->get_var( $stmt ); 		
+        global $wpdb;
+        // Check if the candidated uri already is used
+        // TODO Get post ids instead of count()
+        $stmt = $wpdb->prepare( 
+            "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = %s AND meta_value = %s LIMIT 1", 
+            WL_ENTITY_URL_META_NAME,
+            $new_entity_uri
+        );
+
+        // Perform the query
+        $post_id = $wpdb->get_var( $stmt ); 		
 			
-		// If the post does not exist, then the new uri is returned 	
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log_service->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
-			return $new_entity_uri;
-		}
-		// If schema_type is equal to schema org type of post x, then the new uri is returned 
-		$schema_post_type = wl_entity_type_taxonomy_get_type( $post_id );
+        // If the post does not exist, then the new uri is returned 	
+        if ( ! is_numeric( $post_id ) ) {
+            $this->log_service->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+            return $new_entity_uri;
+        }
+        // If schema_type is equal to schema org type of post x, then the new uri is returned 
+        $schema_post_type = wl_entity_type_taxonomy_get_type( $post_id );
 			
-		if ( $schema_type === $schema_post_type[ 'css_class' ] ) {
-			$this->log_service->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
-			return $new_entity_uri;
-		}
-
-		// Otherwise the same function is called recorsively
-		return $this->build_uri( $title, $post_type, $schema_type, ++$increment_digit );
-	}
-
-	public function is_used( $post_id ) {
-
-		if ( FALSE === $this->is_entity( $post_id ) ) {
-			return null;
-		}
-		// Retrieve the post
-		$entity = get_post( $post_id ); 
-
-		global $wpdb;
-    	// Retrieve Wordlift relation instances table name
-    	$table_name = wl_core_get_relation_instances_table_name();
-
-		// Check is it's referenced / related to another post / entity
-    	$stmt = $wpdb->prepare( 
-    		"SELECT COUNT(*) FROM $table_name WHERE  object_id = %d", 
-    		$entity->ID
-    	);
+        if ( $schema_type === $schema_post_type[ 'css_class' ] ) {
+            $this->log_service->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+            return $new_entity_uri;
+        }
+
+        // Otherwise the same function is called recorsively
+        return $this->build_uri( $title, $post_type, $schema_type, ++$increment_digit );
+    }
+
+    public function is_used( $post_id ) {
+
+        if ( FALSE === $this->is_entity( $post_id ) ) {
+            return null;
+        }
+        // Retrieve the post
+        $entity = get_post( $post_id ); 
+
+        global $wpdb;
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
+
+        // Check is it's referenced / related to another post / entity
+        $stmt = $wpdb->prepare( 
+            "SELECT COUNT(*) FROM $table_name WHERE  object_id = %d", 
+            $entity->ID
+        );
 		
-		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt ); 
-		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {		
-			return TRUE;
-		}
-
-    	// Check if the entity uri is used as meta_value
-		$stmt = $wpdb->prepare( 
-    		"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s", 
-    		$entity->ID,
-    		wl_get_entity_uri( $entity->ID )
-    	);
-    	// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt ); 
+        // Perform the query
+        $relation_instances = (int) $wpdb->get_var( $stmt ); 
+        // If there is at least one relation instance for the current entity, then it's used
+        if ( 0 < $relation_instances ) {		
+            return TRUE;
+        }
+
+        // Check if the entity uri is used as meta_value
+        $stmt = $wpdb->prepare( 
+            "SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s", 
+            $entity->ID,
+            wl_get_entity_uri( $entity->ID )
+        );
+        // Perform the query
+        $meta_instances = (int) $wpdb->get_var( $stmt ); 
 		
-		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
-			return TRUE;
-		}
-
-		// If we are here, it means the current entity is not used at the moment
-		return FALSE;
-	}
-
-	/**
-	 * Determines whether a given uri is an internal uri or not.
-	 *
-	 * @since 3.3.2
-	 *
-	 * @param int $uri An uri.
-	 *
-	 * @return true if the uri internal to the current dataset otherwise false.
-	 */
-	public function is_internal_uri( $uri ) {
-
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
-	}
-
-	/**
-	 * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $uri The entity URI.
-	 *
-	 * @return WP_Post|null A WP_Post instance or null if not found.
-	 */
-	public function get_entity_post_by_uri( $uri ) {
-
-		$query_args = array(
-			'posts_per_page'	=> 1,
-			'post_status'		=> 'any',
-			'post_type'			=> self::TYPE_NAME,
-			'meta_query'		=> array(
-				array(
-					'key'     => WL_ENTITY_URL_META_NAME,
-					'value'   => $uri,
-					'compare' => '='
-				)
-			)
-		);
-
-		// Only if the current uri is not an internal uri 
-		// entity search is performed also looking at sameAs values
-		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( !$this->is_internal_uri( $uri ) ) {
+        // If there is at least one meta that refers the current entity uri, then current entity is used
+        if ( 0 < $meta_instances ) {
+            return TRUE;
+        }
+
+        // If we are here, it means the current entity is not used at the moment
+        return FALSE;
+    }
+
+    /**
+     * Determines whether a given uri is an internal uri or not.
+     *
+     * @since 3.3.2
+     *
+     * @param int $uri An uri.
+     *
+     * @return true if the uri internal to the current dataset otherwise false.
+     */
+    public function is_internal_uri( $uri ) {
+
+        return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+    }
+
+    /**
+     * Find entity posts by the entity URI. Entity as searched by their entity URI or same as.
+     *
+     * @since 3.2.0
+     *
+     * @param string $uri The entity URI.
+     *
+     * @return WP_Post|null A WP_Post instance or null if not found.
+     */
+    public function get_entity_post_by_uri( $uri ) {
+
+        $query_args = array(
+            'posts_per_page'	=> 1,
+            'post_status'		=> 'any',
+            'post_type'			=> self::TYPE_NAME,
+            'meta_query'		=> array(
+                array(
+                    'key'     => WL_ENTITY_URL_META_NAME,
+                    'value'   => $uri,
+                    'compare' => '='
+                )
+            )
+        );
+
+        // Only if the current uri is not an internal uri 
+        // entity search is performed also looking at sameAs values
+        // This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
+        if ( !$this->is_internal_uri( $uri ) ) {
 		
-			$query_args[ 'meta_query' ][ 'relation' ] = 'OR';
-			$query_args[ 'meta_query' ][] = array(
-				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
-				'value'   => $uri,
-				'compare' => '='
-			);
-		} 
-
-		$query = new WP_Query( $query_args );
-
-		// Get the matching entity posts.
-		$posts = $query->get_posts();
-
-		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
-			return null;
-		}
-
-		// Return the found post.
-		return $posts[0];
-	}
-
-	/**
-	 * Fires once a post has been saved.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id Post ID.
-	 * @param WP_Post $post Post object.
-	 * @param bool $update Whether this is an existing post being updated or not.
-	 */
-	public function save_post( $post_id, $post, $update ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-
-		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
-
-		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
-
-	}
-
-	/**
-	 * Set the alternative labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id The post id.
-	 * @param array $alt_labels An array of labels.
-	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+            $query_args[ 'meta_query' ][ 'relation' ] = 'OR';
+            $query_args[ 'meta_query' ][] = array(
+                'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
+                'value'   => $uri,
+                'compare' => '='
+            );
+        } 
+
+        $query = new WP_Query( $query_args );
+
+        // Get the matching entity posts.
+        $posts = $query->get_posts();
+
+        // Return null if no post is found.
+        if ( 0 === count( $posts ) ) {
+            return null;
+        }
+
+        // Return the found post.
+        return $posts[0];
+    }
+
+    /**
+     * Fires once a post has been saved.
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id Post ID.
+     * @param WP_Post $post Post object.
+     * @param bool $update Whether this is an existing post being updated or not.
+     */
+    public function save_post( $post_id, $post, $update ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+
+        // Get the alt labels from the request (or empty array).
+        $alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
+
+        // Set the alternative labels.
+        $this->set_alternative_labels( $post_id, $alt_labels );
+
+    }
+
+    /**
+     * Set the alternative labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id The post id.
+     * @param array $alt_labels An array of labels.
+     */
+    public function set_alternative_labels( $post_id, $alt_labels ) {
 		
-		// Force $alt_labels to be an array
-		if( !is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
-		}
+        // Force $alt_labels to be an array
+        if( !is_array( $alt_labels ) ) {
+            $alt_labels = array( $alt_labels );
+        }
 
-		$this->log_service->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+        $this->log_service->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
 
-		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+        // Delete all the existing alternate labels.
+        delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
 		
-		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
-			}
-		}
-
-	}
-
-	/**
-	 * Retrieve the alternate labels.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param int $post_id Post id.
-	 *
-	 * @return mixed An array  of alternative labels.
-	 */
-	public function get_alternative_labels( $post_id ) {
-
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
-	}
-
-	/**
-	 * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public function edit_form_before_permalink( $post ) {
-
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-
-		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
-
-		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
-
-			echo $this->get_alternative_label_input( $alt_label );
-
-		};
-
-		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
-
-	}
-
-	/**
-	 * Add admin notices for the current entity depending on the current rating.
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param WP_Post $post Post object.
-	 */
-	public function in_admin_header() {
-
-		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
-			return;
-		}
+        // Set the alternative labels.
+        foreach ( $alt_labels as $alt_label ) {
+            if ( ! empty( $alt_label ) ) {
+                add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+            }
+        }
+
+    }
+
+    /**
+     * Retrieve the alternate labels.
+     *
+     * @since 3.2.0
+     *
+     * @param int $post_id Post id.
+     *
+     * @return mixed An array  of alternative labels.
+     */
+    public function get_alternative_labels( $post_id ) {
+
+        return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+    }
+
+    /**
+     * Fires before the permalink field in the edit form (this event is available in WP from 4.1.0).
+     *
+     * @since 3.2.0
+     *
+     * @param WP_Post $post Post object.
+     */
+    public function edit_form_before_permalink( $post ) {
+
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+
+        // Print the input template.
+        $this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+
+        // Print all the currently set alternative labels.
+        foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+
+            echo $this->get_alternative_label_input( $alt_label );
+
+        };
+
+        // Print the button.
+        $this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+
+    }
+
+    /**
+     * Add admin notices for the current entity depending on the current rating.
+     *
+     * @since 3.3.0
+     *
+     * @param WP_Post $post Post object.
+     */
+    public function in_admin_header() {
+
+        // Return safely if get_current_screen() is not defined (yet)
+        if ( FALSE === function_exists( 'get_current_screen' ) ) {
+            return;
+        }
 		
-		$screen = get_current_screen();
-		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
-			return $clauses;
-		}
-
-		// If you're not in the entity post edit page, return.
-		if ( self::TYPE_NAME !== $screen->id ) {
-			return;
-		}
-		// Retrieve the current global post
-		global $post;
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
-			return;
-		}
-		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
-		// If there is at least 1 warning
-		if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
-			// TODO - Pass Wordlift_Notice_Service trough the service constructor 
-			$this->notice_service->add_suggestion( $rating[ 'warnings' ] );
-		}
+        $screen = get_current_screen();
+        // If there is any valid screen nothing to do
+        if ( NULL === $screen ) {
+            return $clauses;
+        }
+
+        // If you're not in the entity post edit page, return.
+        if ( self::TYPE_NAME !== $screen->id ) {
+            return;
+        }
+        // Retrieve the current global post
+        global $post;
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post->ID ) ) {
+            return;
+        }
+        // Retrieve an updated rating for the current entity
+        $rating = $this->get_rating_for( $post->ID, true );
+        // If there is at least 1 warning
+        if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
+            // TODO - Pass Wordlift_Notice_Service trough the service constructor 
+            $this->notice_service->add_suggestion( $rating[ 'warnings' ] );
+        }
 		
-	}
+    }
 	
-	/**
-	 * Set rating for a given entity
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return int An array representing the rating obj.
-	 */
-	public function set_rating_for( $post_id ) {
-
-		// Calculate rating for the given post
-		$rating = $this->calculate_rating_for( $post_id );
-		// Store the rating on db as post meta
-		// Please notice that RATING_RAW_SCORE_META_KEY 
-		// is saved on a different meta to allow score sorting
-		// Both meta are managed as unique
-		// https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
+    /**
+     * Set rating for a given entity
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return int An array representing the rating obj.
+     */
+    public function set_rating_for( $post_id ) {
+
+        // Calculate rating for the given post
+        $rating = $this->calculate_rating_for( $post_id );
+        // Store the rating on db as post meta
+        // Please notice that RATING_RAW_SCORE_META_KEY 
+        // is saved on a different meta to allow score sorting
+        // Both meta are managed as unique
+        // https://codex.wordpress.org/Function_Reference/update_post_meta
+        update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
+        update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
 		
-		$this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
+        $this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
 		
-		// Finally returns the rating 
-		return $rating;
-	}
-	/**
-	 * Get or calculate rating for a given entity
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 * @param $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
-	 *
-	 * @return int An array representing the rating obj.
-	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+        // Finally returns the rating 
+        return $rating;
+    }
+    /**
+     * Get or calculate rating for a given entity
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     * @param $force_reload $warnings_needed If true, detailed warnings collection is provided with the rating obj.
+     *
+     * @return int An array representing the rating obj.
+     */
+    public function get_rating_for( $post_id, $force_reload = false ) {
 		
-		// If forced reload is required or rating is missing ..
-		if ( $force_reload ) {
-			$this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
-			return $this->set_rating_for( $post_id );
-		}
+        // If forced reload is required or rating is missing ..
+        if ( $force_reload ) {
+            $this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
+            return $this->set_rating_for( $post_id );
+        }
 		
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
+        $current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
 			
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-			return $this->set_rating_for( $post_id );
-		}
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
+        if ( ! is_numeric( $current_raw_score ) ) {
+            $this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
+            return $this->set_rating_for( $post_id );
+        }
+        $current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
 		
-		// Finally return score and warnings
-		return array( 
-			'raw_score'				=> $current_raw_score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
-			'warnings'				=> $current_warnings, 
-		);
-
-	}
-	/**
-	 * Calculate rating for a given entity
-	 * Rating depends from following criteria
-	 *
-	 * 1. Is the current entity related to at least 1 post?
-	 * 2. Is the current entity content post not empty?
-	 * 3. Is the current entity related to at least 1 entity?
-	 * 4. Is the entity published? 
-	 * 5. There is a a thumbnail associated to the entity?
-	 * 6. Has the entity a sameas defined?
-	 * 7. Are all schema.org required metadata compiled?
-	 *
-	 * Each positive check means +1 in terms of rating score
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $post_id The entity post id.
-	 *
-	 * @return int An array representing the rating obj.
-	 */
-	public function calculate_rating_for( $post_id ) {
+        // Finally return score and warnings
+        return array( 
+            'raw_score'				=> $current_raw_score,
+            'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
+            'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
+            'warnings'				=> $current_warnings, 
+        );
+
+    }
+    /**
+     * Calculate rating for a given entity
+     * Rating depends from following criteria
+     *
+     * 1. Is the current entity related to at least 1 post?
+     * 2. Is the current entity content post not empty?
+     * 3. Is the current entity related to at least 1 entity?
+     * 4. Is the entity published? 
+     * 5. There is a a thumbnail associated to the entity?
+     * 6. Has the entity a sameas defined?
+     * 7. Are all schema.org required metadata compiled?
+     *
+     * Each positive check means +1 in terms of rating score
+     *
+     * @since 3.3.0
+     *
+     * @param int $post_id The entity post id.
+     *
+     * @return int An array representing the rating obj.
+     */
+    public function calculate_rating_for( $post_id ) {
 		
-		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
-			return;
-		}
-		// Retrieve the post object
-		$post = get_post( $post_id );
-		// Rating value
-		$score = 0;
-		// Store warning messages
-		$warnings = array();
-
-		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score++ : 
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+        // If it's not an entity, return.
+        if ( ! $this->is_entity( $post_id ) ) {
+            return;
+        }
+        // Retrieve the post object
+        $post = get_post( $post_id );
+        // Rating value
+        $score = 0;
+        // Store warning messages
+        $warnings = array();
+
+        // Is the current entity related to at least 1 post?
+        ( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
+            $score++ : 
+            array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
 		
-		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+        // Is the post content not empty?
+        ( ! empty( $post->post_content ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
 		
-		// Is the current entity related to at least 1 entity?
-		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+        // Is the current entity related to at least 1 entity?
+        // Was the current entity already disambiguated?
+        ( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
 		
-		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+        // Is the entity published?
+        ( 'publish' === get_post_status( $post->ID ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
 		
-		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+        // Has a thumbnail?
+        ( has_post_thumbnail( $post->ID ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
 		
-		// Get all post meta keys for the current post		
-		global $wpdb;
-		$query = $wpdb->prepare( 
-			"SELECT DISTINCT(meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID 
-		);
+        // Get all post meta keys for the current post		
+        global $wpdb;
+        $query = $wpdb->prepare( 
+            "SELECT DISTINCT(meta_key) FROM $wpdb->postmeta  WHERE post_id = %d", $post->ID 
+        );
 		
-		// Check intersection between available meta keys 
-		// and expected ones arrays to detect missing values
-		$available_meta_keys = $wpdb->get_col( $query );
-
-		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+        // Check intersection between available meta keys 
+        // and expected ones arrays to detect missing values
+        $available_meta_keys = $wpdb->get_col( $query );
+
+        // If each expected key is contained in available keys array ...
+        ( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
 		
-		$schema = wl_entity_type_taxonomy_get_type( $post_id );
+        $schema = wl_entity_type_taxonomy_get_type( $post_id );
 
-		$expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
-			array() : 
-			array_keys( $schema[ 'custom_fields' ] );
+        $expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
+            array() : 
+            array_keys( $schema[ 'custom_fields' ] );
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
-		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+        $intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+        // If each expected key is contained in available keys array ...
+        ( count( $intersection ) === count( $expected_meta_keys ) ) ?
+            $score++ :
+            array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
 		
-		// Finally return score and warnings
-		return array( 
-			'raw_score'				=> $score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
-			'warnings'				=> $warnings, 
-		);
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
-		// RATING_MAX : $score = 3 : x 
-		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
-		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating; 
-
-	}
-
-	/**
-	 * Get as rating as input and convert in a traffic-light rating
-	 *
-	 * @since 3.3.0
-	 *
-	 * @param int $score The rating score for a given entity.
-	 *
-	 * @return string The input HTML code.
-	 */
-	public function convert_raw_score_to_percentage( $score ) {
-		// RATING_MAX : $score = 100 : x 
-		return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
-	}
-
-	/**
-	 * Get the alternative label input HTML code.
-	 *
-	 * @since 3.2.0
-	 *
-	 * @param string $value The input value.
-	 *
-	 * @return string The input HTML code.
-	 */
-	private function get_alternative_label_input( $value = '' ) {
-
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
-	}
+        // Finally return score and warnings
+        return array( 
+            'raw_score'				=> $score,
+            'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
+            'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
+            'warnings'				=> $warnings, 
+        );
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @since 3.3.0
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     */
+    private function convert_raw_score_to_traffic_light( $score ) {
+        // RATING_MAX : $score = 3 : x 
+        // See http://php.net/manual/en/function.round.php
+        $rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+        // If rating is 0, return 1, otherwise return rating
+        return ( 0 == $rating ) ? 1 : $rating; 
+
+    }
+
+    /**
+     * Get as rating as input and convert in a traffic-light rating
+     *
+     * @since 3.3.0
+     *
+     * @param int $score The rating score for a given entity.
+     *
+     * @return string The input HTML code.
+     */
+    public function convert_raw_score_to_percentage( $score ) {
+        // RATING_MAX : $score = 100 : x 
+        return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+    }
+
+    /**
+     * Get the alternative label input HTML code.
+     *
+     * @since 3.2.0
+     *
+     * @param string $value The input value.
+     *
+     * @return string The input HTML code.
+     */
+    private function get_alternative_label_input( $value = '' ) {
+
+        return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+    }
 }

Spacing +112 added lines, -121 removed lines

@@ -155,9 +155,9 @@ 
 	 *
 	 * @param \Wordlift_UI_Service $ui_service The UI service.
 	 */
-	public function __construct( $ui_service, $schema_service, $notice_service ) {
+	public function __construct($ui_service, $schema_service, $notice_service) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_Entity_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_Entity_Service');
 
 		// Set the UI service.
 		$this->ui_service = $ui_service;
@@ -206,24 +206,24 @@ 
 	public function get_all_related_to_last_50_published_posts() {
 
 		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
+		$latest_posts_ids = get_posts(array(
 			'numberposts' => 50,
 			'fields'      => 'ids', //only get post IDs
 			'post_type'   => 'post',
 			'post_status' => 'publish'
-		) );
+		));
 
-		if ( empty( $latest_posts_ids ) ) {
+		if (empty($latest_posts_ids)) {
 			// There are no posts.
 			return array();
 		}
 
 		// Collect entities related to latest posts
 		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+		foreach ($latest_posts_ids as $id) {
+			$entity_ids = array_merge($entity_ids, wl_core_get_related_entity_ids($id, array(
 				'status' => 'publish'
-			) ) );
+			)));
 		}
 
 		return $entity_ids;
@@ -238,9 +238,9 @@ 
 	 *
 	 * @return bool Return true if the post is an entity otherwise false.
 	 */
-	public function is_entity( $post_id ) {
+	public function is_entity($post_id) {
 
-		return ( self::TYPE_NAME === get_post_type( $post_id ) );
+		return (self::TYPE_NAME === get_post_type($post_id));
 	}
 
 	/**
@@ -258,23 +258,22 @@ 
 	 *
 	 * @return string Returns an uri.
 	 */
-	public function build_uri( $title, $post_type, $schema_type = NULL, $increment_digit = 0 ) {
+	public function build_uri($title, $post_type, $schema_type = NULL, $increment_digit = 0) {
 		
 		// Get the entity slug suffix digit
 		$suffix_digit = $increment_digit + 1;
 		// Get a sanitized uri for a given title
-		$entity_slug = ( 0 == $increment_digit ) ? 
-			wl_sanitize_uri_path( $title ) :
-			wl_sanitize_uri_path( $title . '_'. $suffix_digit );
+		$entity_slug = (0 == $increment_digit) ? 
+			wl_sanitize_uri_path($title) : wl_sanitize_uri_path($title.'_'.$suffix_digit);
 
 		// Compose a candidated uri
-		$new_entity_uri = sprintf( '%s/%s/%s', 
+		$new_entity_uri = sprintf('%s/%s/%s', 
 			wl_configuration_get_redlink_dataset_uri(), 
 			$post_type, 
 			$entity_slug 
 		); 
 		
-		$this->log_service->trace( "Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]" );
+		$this->log_service->trace("Going to check if uri is used [ new_entity_uri :: $new_entity_uri ] [ increment_digit :: $increment_digit ]");
 		
 		global $wpdb;
     	// Check if the candidated uri already is used
@@ -286,32 +285,32 @@ 
     	);
 
     	// Perform the query
-		$post_id = $wpdb->get_var( $stmt ); 		
+		$post_id = $wpdb->get_var($stmt); 		
 			
 		// If the post does not exist, then the new uri is returned 	
-		if ( ! is_numeric( $post_id ) ) {
-			$this->log_service->trace( "Going to return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ( ! is_numeric($post_id)) {
+			$this->log_service->trace("Going to return uri [ new_entity_uri :: $new_entity_uri ]");
 			return $new_entity_uri;
 		}
 		// If schema_type is equal to schema org type of post x, then the new uri is returned 
-		$schema_post_type = wl_entity_type_taxonomy_get_type( $post_id );
+		$schema_post_type = wl_entity_type_taxonomy_get_type($post_id);
 			
-		if ( $schema_type === $schema_post_type[ 'css_class' ] ) {
-			$this->log_service->trace( "An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]" );
+		if ($schema_type === $schema_post_type['css_class']) {
+			$this->log_service->trace("An entity with the same title and type already exists! Return uri [ new_entity_uri :: $new_entity_uri ]");
 			return $new_entity_uri;
 		}
 
 		// Otherwise the same function is called recorsively
-		return $this->build_uri( $title, $post_type, $schema_type, ++$increment_digit );
+		return $this->build_uri($title, $post_type, $schema_type, ++$increment_digit);
 	}
 
-	public function is_used( $post_id ) {
+	public function is_used($post_id) {
 
-		if ( FALSE === $this->is_entity( $post_id ) ) {
+		if (FALSE === $this->is_entity($post_id)) {
 			return null;
 		}
 		// Retrieve the post
-		$entity = get_post( $post_id ); 
+		$entity = get_post($post_id); 
 
 		global $wpdb;
     	// Retrieve Wordlift relation instances table name
@@ -324,9 +323,9 @@ 
     	);
 		
 		// Perform the query
-		$relation_instances = (int) $wpdb->get_var( $stmt ); 
+		$relation_instances = (int) $wpdb->get_var($stmt); 
 		// If there is at least one relation instance for the current entity, then it's used
-		if ( 0 < $relation_instances ) {		
+		if (0 < $relation_instances) {		
 			return TRUE;
 		}
 
@@ -334,13 +333,13 @@ 
 		$stmt = $wpdb->prepare( 
     		"SELECT COUNT(*) FROM $wpdb->postmeta WHERE post_id != %d AND meta_value = %s", 
     		$entity->ID,
-    		wl_get_entity_uri( $entity->ID )
+    		wl_get_entity_uri($entity->ID)
     	);
     	// Perform the query
-		$meta_instances = (int) $wpdb->get_var( $stmt ); 
+		$meta_instances = (int) $wpdb->get_var($stmt); 
 		
 		// If there is at least one meta that refers the current entity uri, then current entity is used
-		if ( 0 < $meta_instances ) {
+		if (0 < $meta_instances) {
 			return TRUE;
 		}
 
@@ -357,9 +356,9 @@ 
 	 *
 	 * @return true if the uri internal to the current dataset otherwise false.
 	 */
-	public function is_internal_uri( $uri ) {
+	public function is_internal_uri($uri) {
 
-		return ( 0 === strrpos( $uri, wl_configuration_get_redlink_dataset_uri() ) );
+		return (0 === strrpos($uri, wl_configuration_get_redlink_dataset_uri()));
 	}
 
 	/**
@@ -371,7 +370,7 @@ 
 	 *
 	 * @return WP_Post|null A WP_Post instance or null if not found.
 	 */
-	public function get_entity_post_by_uri( $uri ) {
+	public function get_entity_post_by_uri($uri) {
 
 		$query_args = array(
 			'posts_per_page'	=> 1,
@@ -389,23 +388,23 @@ 
 		// Only if the current uri is not an internal uri 
 		// entity search is performed also looking at sameAs values
 		// This solve issues like https://github.com/insideout10/wordlift-plugin/issues/237
-		if ( !$this->is_internal_uri( $uri ) ) {
+		if ( ! $this->is_internal_uri($uri)) {
 		
-			$query_args[ 'meta_query' ][ 'relation' ] = 'OR';
-			$query_args[ 'meta_query' ][] = array(
+			$query_args['meta_query']['relation'] = 'OR';
+			$query_args['meta_query'][] = array(
 				'key'     => Wordlift_Schema_Service::FIELD_SAME_AS,
 				'value'   => $uri,
 				'compare' => '='
 			);
 		} 
 
-		$query = new WP_Query( $query_args );
+		$query = new WP_Query($query_args);
 
 		// Get the matching entity posts.
 		$posts = $query->get_posts();
 
 		// Return null if no post is found.
-		if ( 0 === count( $posts ) ) {
+		if (0 === count($posts)) {
 			return null;
 		}
 
@@ -422,18 +421,18 @@ 
 	 * @param WP_Post $post Post object.
 	 * @param bool $update Whether this is an existing post being updated or not.
 	 */
-	public function save_post( $post_id, $post, $update ) {
+	public function save_post($post_id, $post, $update) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
+		if ( ! $this->is_entity($post_id)) {
 			return;
 		}
 
 		// Get the alt labels from the request (or empty array).
-		$alt_labels = isset( $_REQUEST['wl_alternative_label'] ) ? $_REQUEST['wl_alternative_label'] : array();
+		$alt_labels = isset($_REQUEST['wl_alternative_label']) ? $_REQUEST['wl_alternative_label'] : array();
 
 		// Set the alternative labels.
-		$this->set_alternative_labels( $post_id, $alt_labels );
+		$this->set_alternative_labels($post_id, $alt_labels);
 
 	}
 
@@ -445,22 +444,22 @@ 
 	 * @param int $post_id The post id.
 	 * @param array $alt_labels An array of labels.
 	 */
-	public function set_alternative_labels( $post_id, $alt_labels ) {
+	public function set_alternative_labels($post_id, $alt_labels) {
 		
 		// Force $alt_labels to be an array
-		if( !is_array( $alt_labels ) ) {
-			$alt_labels = array( $alt_labels );
+		if ( ! is_array($alt_labels)) {
+			$alt_labels = array($alt_labels);
 		}
 
-		$this->log_service->debug( "Setting alternative labels [ post id :: $post_id ][ alt labels :: " . implode( ',', $alt_labels ) . " ]" );
+		$this->log_service->debug("Setting alternative labels [ post id :: $post_id ][ alt labels :: ".implode(',', $alt_labels)." ]");
 
 		// Delete all the existing alternate labels.
-		delete_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		delete_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 		
 		// Set the alternative labels.
-		foreach ( $alt_labels as $alt_label ) {
-			if ( ! empty( $alt_label ) ) {
-				add_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label );
+		foreach ($alt_labels as $alt_label) {
+			if ( ! empty($alt_label)) {
+				add_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY, $alt_label);
 			}
 		}
 
@@ -475,9 +474,9 @@ 
 	 *
 	 * @return mixed An array  of alternative labels.
 	 */
-	public function get_alternative_labels( $post_id ) {
+	public function get_alternative_labels($post_id) {
 
-		return get_post_meta( $post_id, self::ALTERNATIVE_LABEL_META_KEY );
+		return get_post_meta($post_id, self::ALTERNATIVE_LABEL_META_KEY);
 	}
 
 	/**
@@ -487,25 +486,25 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function edit_form_before_permalink( $post ) {
+	public function edit_form_before_permalink($post) {
 
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 
 		// Print the input template.
-		$this->ui_service->print_template( 'wl-tmpl-alternative-label-input', $this->get_alternative_label_input() );
+		$this->ui_service->print_template('wl-tmpl-alternative-label-input', $this->get_alternative_label_input());
 
 		// Print all the currently set alternative labels.
-		foreach ( $this->get_alternative_labels( $post->ID ) as $alt_label ) {
+		foreach ($this->get_alternative_labels($post->ID) as $alt_label) {
 
-			echo $this->get_alternative_label_input( $alt_label );
+			echo $this->get_alternative_label_input($alt_label);
 
 		};
 
 		// Print the button.
-		$this->ui_service->print_button( 'wl-add-alternative-labels-button', __( 'Add more titles', 'wordlift' ) );
+		$this->ui_service->print_button('wl-add-alternative-labels-button', __('Add more titles', 'wordlift'));
 
 	}
 
@@ -519,32 +518,32 @@ 
 	public function in_admin_header() {
 
 		// Return safely if get_current_screen() is not defined (yet)
-		if ( FALSE === function_exists( 'get_current_screen' ) ) {
+		if (FALSE === function_exists('get_current_screen')) {
 			return;
 		}
 		
 		$screen = get_current_screen();
 		// If there is any valid screen nothing to do
-		if ( NULL === $screen ) {
+		if (NULL === $screen) {
 			return $clauses;
 		}
 
 		// If you're not in the entity post edit page, return.
-		if ( self::TYPE_NAME !== $screen->id ) {
+		if (self::TYPE_NAME !== $screen->id) {
 			return;
 		}
 		// Retrieve the current global post
 		global $post;
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post->ID ) ) {
+		if ( ! $this->is_entity($post->ID)) {
 			return;
 		}
 		// Retrieve an updated rating for the current entity
-		$rating = $this->get_rating_for( $post->ID, true );
+		$rating = $this->get_rating_for($post->ID, true);
 		// If there is at least 1 warning
-		if ( isset( $rating[ 'warnings' ] ) && 0 < count( $rating[ 'warnings' ] ) ) {
+		if (isset($rating['warnings']) && 0 < count($rating['warnings'])) {
 			// TODO - Pass Wordlift_Notice_Service trough the service constructor 
-			$this->notice_service->add_suggestion( $rating[ 'warnings' ] );
+			$this->notice_service->add_suggestion($rating['warnings']);
 		}
 		
 	}
@@ -558,19 +557,19 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function set_rating_for( $post_id ) {
+	public function set_rating_for($post_id) {
 
 		// Calculate rating for the given post
-		$rating = $this->calculate_rating_for( $post_id );
+		$rating = $this->calculate_rating_for($post_id);
 		// Store the rating on db as post meta
 		// Please notice that RATING_RAW_SCORE_META_KEY 
 		// is saved on a different meta to allow score sorting
 		// Both meta are managed as unique
 		// https://codex.wordpress.org/Function_Reference/update_post_meta
-		update_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, $rating[ 'raw_score' ] );
-		update_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, $rating[ 'warnings' ] );
+		update_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, $rating['raw_score']);
+		update_post_meta($post_id, self::RATING_WARNINGS_META_KEY, $rating['warnings']);
 		
-		$this->log_service->trace( sprintf( "Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating[ 'raw_score' ]  ) );
+		$this->log_service->trace(sprintf("Rating set for [ post_id :: $post_id ] [ rating :: %s ]", $rating['raw_score']));
 		
 		// Finally returns the rating 
 		return $rating;
@@ -585,27 +584,27 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function get_rating_for( $post_id, $force_reload = false ) {
+	public function get_rating_for($post_id, $force_reload = false) {
 		
 		// If forced reload is required or rating is missing ..
-		if ( $force_reload ) {
-			$this->log_service->trace( "Force rating reload [ post_id :: $post_id ]" );
-			return $this->set_rating_for( $post_id );
+		if ($force_reload) {
+			$this->log_service->trace("Force rating reload [ post_id :: $post_id ]");
+			return $this->set_rating_for($post_id);
 		}
 		
-		$current_raw_score = get_post_meta( $post_id, self::RATING_RAW_SCORE_META_KEY, true );  
+		$current_raw_score = get_post_meta($post_id, self::RATING_RAW_SCORE_META_KEY, true);  
 			
-		if ( ! is_numeric( $current_raw_score ) ) {
-			$this->log_service->trace( "Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]" );
-			return $this->set_rating_for( $post_id );
+		if ( ! is_numeric($current_raw_score)) {
+			$this->log_service->trace("Rating missing for [ post_id :: $post_id ] [ current_raw_score :: $current_raw_score ]");
+			return $this->set_rating_for($post_id);
 		}
-		$current_warnings = get_post_meta( $post_id, self::RATING_WARNINGS_META_KEY, true );  
+		$current_warnings = get_post_meta($post_id, self::RATING_WARNINGS_META_KEY, true);  
 		
 		// Finally return score and warnings
 		return array( 
 			'raw_score'				=> $current_raw_score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $current_raw_score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $current_raw_score ),
+			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light($current_raw_score),
+			'percentage_score'		=> $this->convert_raw_score_to_percentage($current_raw_score),
 			'warnings'				=> $current_warnings, 
 		);
 
@@ -630,44 +629,39 @@ 
 	 *
 	 * @return int An array representing the rating obj.
 	 */
-	public function calculate_rating_for( $post_id ) {
+	public function calculate_rating_for($post_id) {
 		
 		// If it's not an entity, return.
-		if ( ! $this->is_entity( $post_id ) ) {
+		if ( ! $this->is_entity($post_id)) {
 			return;
 		}
 		// Retrieve the post object
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 		// Rating value
 		$score = 0;
 		// Store warning messages
 		$warnings = array();
 
 		// Is the current entity related to at least 1 post?
-		( 0 < count( wl_core_get_related_post_ids( $post->ID ) ) ) ?
-			$score++ : 
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift' ) );
+		(0 < count(wl_core_get_related_post_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_POSTS, 'wordlift'));
 		
 		// Is the post content not empty?
-		( ! empty( $post->post_content ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift' ) );
+		( ! empty($post->post_content)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_CONTENT_POST, 'wordlift'));
 		
 		// Is the current entity related to at least 1 entity?
 		// Was the current entity already disambiguated?
-		( 0 < count( wl_core_get_related_entity_ids( $post->ID ) ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift' ) );
+		(0 < count(wl_core_get_related_entity_ids($post->ID))) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_RELATED_ENTITIES, 'wordlift'));
 		
 		// Is the entity published?
-		( 'publish' === get_post_status( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_IS_PUBLISHED, 'wordlift' ) );
+		('publish' === get_post_status($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_IS_PUBLISHED, 'wordlift'));
 		
 		// Has a thumbnail?
-		( has_post_thumbnail( $post->ID ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift' ) );
+		(has_post_thumbnail($post->ID)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_THUMBNAIL, 'wordlift'));
 		
 		// Get all post meta keys for the current post		
 		global $wpdb;
@@ -677,30 +671,27 @@ 
 		
 		// Check intersection between available meta keys 
 		// and expected ones arrays to detect missing values
-		$available_meta_keys = $wpdb->get_col( $query );
+		$available_meta_keys = $wpdb->get_col($query);
 
 		// If each expected key is contained in available keys array ...
-		( in_array( Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_SAME_AS, 'wordlift' ) );
+		(in_array(Wordlift_Schema_Service::FIELD_SAME_AS, $available_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_SAME_AS, 'wordlift'));
 		
-		$schema = wl_entity_type_taxonomy_get_type( $post_id );
+		$schema = wl_entity_type_taxonomy_get_type($post_id);
 
-		$expected_meta_keys = ( null === $schema[ 'custom_fields' ] ) ? 
-			array() : 
-			array_keys( $schema[ 'custom_fields' ] );
+		$expected_meta_keys = (null === $schema['custom_fields']) ? 
+			array() : array_keys($schema['custom_fields']);
 
-		$intersection = array_intersect( $expected_meta_keys, $available_meta_keys );
+		$intersection = array_intersect($expected_meta_keys, $available_meta_keys);
 		// If each expected key is contained in available keys array ...
-		( count( $intersection ) === count( $expected_meta_keys ) ) ?
-			$score++ :
-			array_push( $warnings, __( self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift' ) );
+		(count($intersection) === count($expected_meta_keys)) ?
+			$score++ : array_push($warnings, __(self::RATING_WARNING_HAS_COMPLETED_METADATA, 'wordlift'));
 		
 		// Finally return score and warnings
 		return array( 
 			'raw_score'				=> $score,
-			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light( $score ),
-			'percentage_score'		=> $this->convert_raw_score_to_percentage( $score ),
+			'traffic_light_score'	=> $this->convert_raw_score_to_traffic_light($score),
+			'percentage_score'		=> $this->convert_raw_score_to_percentage($score),
 			'warnings'				=> $warnings, 
 		);
 
@@ -715,12 +706,12 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function convert_raw_score_to_traffic_light( $score ) {
+	private function convert_raw_score_to_traffic_light($score) {
 		// RATING_MAX : $score = 3 : x 
 		// See http://php.net/manual/en/function.round.php
-		$rating = round( ( $score * 3 ) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+		$rating = round(($score * 3) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP);
 		// If rating is 0, return 1, otherwise return rating
-		return ( 0 == $rating ) ? 1 : $rating; 
+		return (0 == $rating) ? 1 : $rating; 
 
 	}
 
@@ -733,9 +724,9 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	public function convert_raw_score_to_percentage( $score ) {
+	public function convert_raw_score_to_percentage($score) {
 		// RATING_MAX : $score = 100 : x 
-		return round( ( $score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP );
+		return round(($score * 100) / self::get_rating_max(), 0, PHP_ROUND_HALF_UP);
 	}
 
 	/**
@@ -747,8 +738,8 @@ 
 	 *
 	 * @return string The input HTML code.
 	 */
-	private function get_alternative_label_input( $value = '' ) {
+	private function get_alternative_label_input($value = '') {
 
-		return sprintf( self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr( $value ), __( 'Delete', 'wordlift' ) );
+		return sprintf(self::ALTERNATIVE_LABEL_INPUT_TEMPLATE, esc_attr($value), __('Delete', 'wordlift'));
 	}
 }

src/shortcodes/wordlift_shortcode_faceted_search.php

Indentation +123 added lines, -123 removed lines

@@ -5,7 +5,7 @@ 
  */
 function wl_shortcode_faceted_search( $atts ) {
 
-	// Extract attributes and set default values.
+    // Extract attributes and set default values.
     $shortcode_atts = shortcode_atts( array(
         'title'			=>	__( 'Related articles', 'wordlift' ),
         'show_facets'	=> true
@@ -13,42 +13,42 @@ 
 
     // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
     $shortcode_atts[ 'show_facets' ] = filter_var( 
-    	$shortcode_atts[ 'show_facets' ], FILTER_VALIDATE_BOOLEAN 
+        $shortcode_atts[ 'show_facets' ], 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_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		$current_post->ID : 
-		wl_core_get_related_entity_ids( $current_post->ID );
-
-	if ( 0 === count( $entity_ids ) ) {
-		return '';
-	}
-
-	$div_id = 'wordlift-faceted-entity-search-widget';
-
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.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,
-			'div_id'				=> $div_id,
-			'defaultThumbnailPath'	=> WL_DEFAULT_THUMBNAIL_PATH,
-			'attrs'					=> $shortcode_atts
-		)
-	);
-
-	return '<div id="' . $div_id . '" style="width:100%"></div>';
+    // 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_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
+        $current_post->ID : 
+        wl_core_get_related_entity_ids( $current_post->ID );
+
+    if ( 0 === count( $entity_ids ) ) {
+        return '';
+    }
+
+    $div_id = 'wordlift-faceted-entity-search-widget';
+
+    wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.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,
+            'div_id'				=> $div_id,
+            'defaultThumbnailPath'	=> WL_DEFAULT_THUMBNAIL_PATH,
+            'attrs'					=> $shortcode_atts
+        )
+    );
+
+    return '<div id="' . $div_id . '" style="width:100%"></div>';
 }
 
 add_shortcode( 'wl_faceted_search', 'wl_shortcode_faceted_search' );
@@ -59,122 +59,122 @@ 
  */
 function wl_shortcode_faceted_search_ajax( $http_raw_data = null ) {
 	
-	// Post ID must be defined
-	if ( ! isset( $_GET[ 'post_id' ] ) ) {
-		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' ];
-	$current_post = get_post( $current_post_id );	
+    // Post ID must be defined
+    if ( ! isset( $_GET[ 'post_id' ] ) ) {
+        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' ];
+    $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_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		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;  
-
-	// Set up data structures            
-	$referencing_posts = wl_core_get_posts( array(
-		'get'				=> 'posts',
-		'post__not_in'      =>  array( $current_post_id ), 
-		'related_to__in'	=> $entity_ids,
-		'post_type'			=> 'post',
-		'as'				=> 'subject',
-		'post_status'		=> 'publish',
-	) );
-
-	$referencing_post_ids = array_map( function( $p ) { return $p->ID; }, $referencing_posts );
-
-	$results              = array();
-
-	if ( 'posts' === $required_type ) {
+    // 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_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
+        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;  
+
+    // Set up data structures            
+    $referencing_posts = wl_core_get_posts( array(
+        'get'				=> 'posts',
+        'post__not_in'      =>  array( $current_post_id ), 
+        'related_to__in'	=> $entity_ids,
+        'post_type'			=> 'post',
+        'as'				=> 'subject',
+        'post_status'		=> 'publish',
+    ) );
+
+    $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 ]" );
+        // 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 : 
-			wl_core_get_posts( array(
-				'get'            => 'posts',
-				'post__in'       => $referencing_post_ids,
-				'related_to__in' => wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
-				'post_type'      => 'post',
-				'as'             => 'subject',
-			) );
+        $filtered_posts = ( empty( $filtering_entity_uris ) ) ?
+            $referencing_posts : 
+            wl_core_get_posts( array(
+                'get'            => 'posts',
+                'post__in'       => $referencing_post_ids,
+                'related_to__in' => wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+                'post_type'      => 'post',
+                'as'             => 'subject',
+            ) );
 
-		foreach ( $filtered_posts as $post_obj ) {
+        foreach ( $filtered_posts as $post_obj ) {
 
-			$thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-			$post_obj->thumbnail = ( $thumbnail ) ?
-			$thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
-			$post_obj->permalink = get_post_permalink( $post_obj->ID );
+            $thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
+            $post_obj->thumbnail = ( $thumbnail ) ?
+            $thumbnail : WL_DEFAULT_THUMBNAIL_PATH;
+            $post_obj->permalink = get_post_permalink( $post_obj->ID );
 
-			$results[] = $post_obj;
+            $results[] = $post_obj;
 
-		}
+        }
 
-	} else {
+    } else {
 
-		global $wpdb;
+        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();
+        // Retrieve Wordlift relation instances table name
+        $table_name = wl_core_get_relation_instances_table_name();
 
-		$subject_ids = implode( ',', $referencing_post_ids );
+        $subject_ids = implode( ',', $referencing_post_ids );
 		
-		// TODO - if an entity is related with different predicates each predicate impacts on counter
-		$query = <<<EOF
+        // TODO - if an entity is related with different predicates each predicate impacts on counter
+        $query = <<<EOF
             SELECT object_id as ID, count( object_id ) as counter 
             FROM $table_name 
             WHERE subject_id IN ($subject_ids) and object_id != ($current_post_id)
             GROUP BY object_id;
 EOF;
-		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 );
+        $entities = $wpdb->get_results( $query, OBJECT );
 
-		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 );
-			$created_at 	   = $entity->post_date;
+            $entity 		   = get_post( $obj->ID );
+            $created_at 	   = $entity->post_date;
 			
-			$entity            = wl_serialize_entity( $entity );
+            $entity            = wl_serialize_entity( $entity );
 
-			$entity[ 'counter' ] = $obj->counter;
-			$entity[ 'createdAt' ] = $created_at;
+            $entity[ 'counter' ] = $obj->counter;
+            $entity[ 'createdAt' ] = $created_at;
 			
-			$results[]         = $entity;
+            $results[]         = $entity;
 
-		}
+        }
 
-	}
+    }
 
-	wl_core_send_json( $results );
+    wl_core_send_json( $results );
 
 }
 

Spacing +58 added lines, -61 removed lines

@@ -3,17 +3,17 @@ 
 /*
  * Function in charge of diplaying the [wl-faceted-search]
  */
-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
-    ), $atts );
+    ), $atts);
 
     // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-    $shortcode_atts[ 'show_facets' ] = filter_var( 
-    	$shortcode_atts[ 'show_facets' ], FILTER_VALIDATE_BOOLEAN 
+    $shortcode_atts['show_facets'] = filter_var( 
+    	$shortcode_atts['show_facets'], FILTER_VALIDATE_BOOLEAN 
     );
 
 	// If the current post is not an entity and has no related entities
@@ -21,24 +21,23 @@ 
 	// TODO Add an alert visibile only for connected admin users
 	$current_post = get_post();
 
-	$entity_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		$current_post->ID : 
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids = (Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type) ?
+		$current_post->ID : wl_core_get_related_entity_ids($current_post->ID);
 
-	if ( 0 === count( $entity_ids ) ) {
+	if (0 === count($entity_ids)) {
 		return '';
 	}
 
 	$div_id = 'wordlift-faceted-entity-search-widget';
 
-	wp_enqueue_style( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-faceted-entity-search-widget.min.css' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'wordlift-faceted-search', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-faceted-entity-search-widget.min.js' );
+	wp_enqueue_style('wordlift-faceted-search', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-faceted-entity-search-widget.min.css');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.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,
@@ -48,87 +47,85 @@ 
 		)
 	);
 
-	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' ] ) ) {
-		wp_die( 'No post_id given' );
+	if ( ! isset($_GET['post_id'])) {
+		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' ];
-	$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' );
+	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_ids = ( Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type ) ?
-		array( $current_post->ID ) :
-		wl_core_get_related_entity_ids( $current_post->ID );
+	$entity_ids = (Wordlift_Entity_Service::TYPE_NAME === $current_post->post_type) ?
+		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;  
+	$required_type = (isset($_GET['type'])) ? $_GET['type'] : null;  
 
 	// Set up data structures            
-	$referencing_posts = wl_core_get_posts( array(
+	$referencing_posts = wl_core_get_posts(array(
 		'get'				=> 'posts',
-		'post__not_in'      =>  array( $current_post_id ), 
+		'post__not_in'      =>  array($current_post_id), 
 		'related_to__in'	=> $entity_ids,
 		'post_type'			=> 'post',
 		'as'				=> 'subject',
 		'post_status'		=> 'publish',
-	) );
+	));
 
-	$referencing_post_ids = array_map( function( $p ) { return $p->ID; }, $referencing_posts );
+	$referencing_post_ids = array_map(function($p) { return $p->ID; }, $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 : 
-			wl_core_get_posts( array(
+		$filtered_posts = (empty($filtering_entity_uris)) ?
+			$referencing_posts : wl_core_get_posts(array(
 				'get'            => 'posts',
 				'post__in'       => $referencing_post_ids,
-				'related_to__in' => wl_get_entity_post_ids_by_uris( $filtering_entity_uris ),
+				'related_to__in' => wl_get_entity_post_ids_by_uris($filtering_entity_uris),
 				'post_type'      => 'post',
 				'as'             => 'subject',
-			) );
+			));
 
-		foreach ( $filtered_posts as $post_obj ) {
+		foreach ($filtered_posts as $post_obj) {
 
-			$thumbnail           = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-			$post_obj->thumbnail = ( $thumbnail ) ?
+			$thumbnail           = wp_get_attachment_url(get_post_thumbnail_id($post_obj->ID, 'thumbnail'));
+			$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;
 
@@ -138,12 +135,12 @@ 
 
 		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();
 
-		$subject_ids = implode( ',', $referencing_post_ids );
+		$subject_ids = implode(',', $referencing_post_ids);
 		
 		// TODO - if an entity is related with different predicates each predicate impacts on counter
 		$query = <<<EOF
@@ -152,32 +149,32 @@ 
             WHERE subject_id IN ($subject_ids) and object_id != ($current_post_id)
             GROUP BY object_id;
 EOF;
-		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 );
+		$entities = $wpdb->get_results($query, OBJECT);
 
-		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 );
-			$created_at 	   = $entity->post_date;
+			$entity = get_post($obj->ID);
+			$created_at = $entity->post_date;
 			
-			$entity            = wl_serialize_entity( $entity );
+			$entity = wl_serialize_entity($entity);
 
-			$entity[ 'counter' ] = $obj->counter;
-			$entity[ 'createdAt' ] = $created_at;
+			$entity['counter'] = $obj->counter;
+			$entity['createdAt'] = $created_at;
 			
-			$results[]         = $entity;
+			$results[] = $entity;
 
 		}
 
 	}
 
-	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/wordlift.php

Indentation +232 added lines, -232 removed lines

@@ -26,7 +26,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 // Include WordLift constants.
@@ -47,18 +47,18 @@ 
  */
 function wl_write_log( $log ) {
 
-	$handler = apply_filters( 'wl_write_log_handler', null );
+    $handler = apply_filters( 'wl_write_log_handler', null );
 
-	$callers         = debug_backtrace();
-	$caller_function = $callers[1]['function'];
+    $callers         = debug_backtrace();
+    $caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+    if ( is_null( $handler ) ) {
+        wl_write_log_handler( $log, $caller_function );
 
-		return;
-	}
+        return;
+    }
 
-	call_user_func( $handler, $log, $caller_function );
+    call_user_func( $handler, $log, $caller_function );
 }
 
 /**
@@ -71,20 +71,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 );
+        }
 
-	}
+    }
 
 }
 
@@ -99,7 +99,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 );
 }
 
 /**
@@ -111,10 +111,10 @@ 
  */
 function wl_queue_sparql_update_query( $query ) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    file_put_contents( $filename, $query . "\n", FILE_APPEND );
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
 }
 
 /**
@@ -124,28 +124,28 @@ 
  */
 function wl_execute_saved_sparql_update_query( $request_id ) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+    $filename = WL_TEMP_DIR . $request_id . '.sparql';
 
-	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+    // If the file doesn't exist, exit.
+    if ( ! file_exists( $filename ) ) {
+        wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
 
-		return;
-	}
+        return;
+    }
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
 
-	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+    // Get the query saved in the file.
+    $query = file_get_contents( $filename );
 
-	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+    // Execute the SPARQL query.
+    rl_execute_sparql_update_query( $query, false );
 
-	// Reindex the triple store.
-	wordlift_reindex_triple_store();
+    // Reindex the triple store.
+    wordlift_reindex_triple_store();
 
-	// Delete the temporary file.
-	unlink( $filename );
+    // Delete the temporary file.
+    unlink( $filename );
 }
 
 add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
@@ -155,10 +155,10 @@ 
  */
 function wordlift_buttonhooks() {
 
-	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
-	}
+    // Only add hooks when the current user has permissions AND is in Rich Text editor mode
+    if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+        add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+    }
 }
 
 /**
@@ -170,10 +170,10 @@ 
  */
 function wordlift_register_tinymce_javascript( $plugin_array ) {
 
-	// add the wordlift plugin.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+    // add the wordlift plugin.
+    $plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
 
-	return $plugin_array;
+    return $plugin_array;
 }
 
 /**
@@ -181,21 +181,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 );
+        }
+    }
 }
 
 // init process for button control
@@ -209,25 +209,25 @@ 
  */
 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( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
 
-	// 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');
+    }
 }
 
 add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+    wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
 }
 
 add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
@@ -242,18 +242,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 );
@@ -267,15 +267,15 @@ 
  */
 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] : ''
+    );
 }
 
 /**
@@ -287,13 +287,13 @@ 
  */
 function wl_get_post_modified_time( $post ) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+    $date_modified = get_post_modified_time( 'c', true, $post );
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
-	}
+    if ( '-' === substr( $date_modified, 0, 1 ) ) {
+        return get_the_time( 'c', $post );
+    }
 
-	return $date_modified;
+    return $date_modified;
 }
 
 /**
@@ -305,34 +305,34 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
-		'post_parent'    => $post_id,
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image'
-	) );
+    $images = get_children( array(
+        'post_parent'    => $post_id,
+        'post_type'      => 'attachment',
+        'post_mime_type' => 'image'
+    ) );
 
-	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
-		return array();
-	}
+    // Return an empty array if no image is found.
+    if ( empty( $images ) ) {
+        return array();
+    }
 
-	// Prepare the return array.
-	$image_urls = array();
+    // Prepare the return array.
+    $image_urls = array();
 
-	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
-		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
-		}
-	}
+    // Collect the URLs.
+    foreach ( $images as $attachment_id => $attachment ) {
+        $image_url = wp_get_attachment_url( $attachment_id );
+        // Ensure the URL isn't collected already.
+        if ( ! in_array( $image_url, $image_urls ) ) {
+            array_push( $image_urls, $image_url );
+        }
+    }
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
 
-	return $image_urls;
+    return $image_urls;
 }
 
 /**
@@ -345,19 +345,19 @@ 
  */
 function wl_get_sparql_images( $uri, $post_id ) {
 
-	$sparql = '';
+    $sparql = '';
 
-	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+    // Get the escaped URI.
+    $uri_e = esc_html( $uri );
 
-	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
-		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
-	}
+    // Add SPARQL stmts to write the schema:image.
+    $image_urls = wl_get_image_urls( $post_id );
+    foreach ( $image_urls as $image_url ) {
+        $image_url_esc = wl_sparql_escape_uri( $image_url );
+        $sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
+    }
 
-	return $sparql;
+    return $sparql;
 }
 
 /**
@@ -370,24 +370,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;
 }
 
 /**
@@ -398,8 +398,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 );
 }
 
 
@@ -417,43 +417,43 @@ 
  */
 function wl_flush_rewrite_rules_hard( $hard ) {
 
-	// Get all published posts.
-	$posts = get_posts( array(
-		'posts_per_page' => - 1,
-		'post_type'      => 'any',
-		'post_status'    => 'publish'
-	) );
+    // Get all published posts.
+    $posts = get_posts( array(
+        'posts_per_page' => - 1,
+        'post_type'      => 'any',
+        'post_status'    => 'publish'
+    ) );
 
-	// Holds the delete part of the query.
-	$delete_query = rl_sparql_prefixes();
-	// Holds the insert part of the query.
-	$insert_query = 'INSERT DATA { ';
+    // Holds the delete part of the query.
+    $delete_query = rl_sparql_prefixes();
+    // Holds the insert part of the query.
+    $insert_query = 'INSERT DATA { ';
 
-	// Cycle in each post to build the query.
-	foreach ( $posts as $post ) {
+    // Cycle in each post to build the query.
+    foreach ( $posts as $post ) {
 
-		// Ignore revisions.
-		if ( wp_is_post_revision( $post->ID ) ) {
-			continue;
-		}
+        // Ignore revisions.
+        if ( wp_is_post_revision( $post->ID ) ) {
+            continue;
+        }
 
-		// Get the entity URI.
-		$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+        // Get the entity URI.
+        $uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
 
-		// Get the post URL.
-		$url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+        // Get the post URL.
+        $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
 
-		// Prepare the DELETE and INSERT commands.
-		$delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
-		$insert_query .= " <$uri> schema:url <$url> . \n";
+        // Prepare the DELETE and INSERT commands.
+        $delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
+        $insert_query .= " <$uri> schema:url <$url> . \n";
 
-		// wl_write_log( "[ uri :: $uri ][ url :: $url ]" );
-	}
+        // wl_write_log( "[ uri :: $uri ][ url :: $url ]" );
+    }
 
-	$insert_query .= ' };';
+    $insert_query .= ' };';
 
-	// Execute the query.
-	rl_execute_sparql_update_query( $delete_query . $insert_query );
+    // Execute the query.
+    rl_execute_sparql_update_query( $delete_query . $insert_query );
 }
 
 add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
@@ -470,15 +470,15 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	// wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
+    // wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
 
-	// According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
-	// ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-	// "$" | ","
-	// Plus the ' ' (space).
-	// TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
+    // According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
+    // ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+    // "$" | ","
+    // Plus the ' ' (space).
+    // TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
 
-	return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
+    return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
 }
 
 /**
@@ -490,11 +490,11 @@ 
  */
 function wl_force_to_array( $value ) {
 	
-	if ( ! is_array( $value ) ) {
-		return array( $value );
-	}
+    if ( ! is_array( $value ) ) {
+        return array( $value );
+    }
 	
-	return $value;
+    return $value;
 }
 
 /**
@@ -502,26 +502,26 @@ 
  */
 function wl_shutdown() {
 
-	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    // Get the filename to the temporary SPARQL file.
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
 
-	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+    // If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
+    if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
 
-		// The request ID.
-		$args = array( WL_REQUEST_ID );
+        // The request ID.
+        $args = array( WL_REQUEST_ID );
 
-		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+        // Schedule the execution of the SPARQL query with the request ID.
+        wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
 
-		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+        // Check that the request is scheduled.
+        $timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
 
-		// Spawn the cron.
-		spawn_cron();
+        // Spawn the cron.
+        spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
-	}
+        wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+    }
 }
 
 add_action( 'shutdown', 'wl_shutdown' );
@@ -535,45 +535,45 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	// wl_write_log( "wl_replace_item_id_with_uri" );
+    // wl_write_log( "wl_replace_item_id_with_uri" );
 
-	// 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 );
@@ -651,8 +651,8 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_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();
 }
 
 /**
@@ -660,8 +660,8 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
 }
 
 register_activation_hook( __FILE__, 'activate_wordlift' );
@@ -684,8 +684,8 @@ 
  */
 function run_wordlift() {
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
 }
 

Spacing +154 added lines, -154 removed lines

@@ -25,16 +25,16 @@ 
  */
 
 // 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/configuration/wordlift_configuration.php' );
+require_once('modules/core/wordlift_core.php');
+require_once('modules/configuration/wordlift_configuration.php');
 
 /**
  * Log to the debug.log file.
@@ -45,20 +45,20 @@ 
  *
  * @param string|mixed $log The log data.
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	$handler = apply_filters( 'wl_write_log_handler', null );
+	$handler = apply_filters('wl_write_log_handler', null);
 
 	$callers         = debug_backtrace();
 	$caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+	if (is_null($handler)) {
+		wl_write_log_handler($log, $caller_function);
 
 		return;
 	}
 
-	call_user_func( $handler, $log, $caller_function );
+	call_user_func($handler, $log, $caller_function);
 }
 
 /**
@@ -69,19 +69,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);
 		}
 
 	}
@@ -97,9 +97,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);
 }
 
 /**
@@ -109,12 +109,12 @@ 
  *
  * @param string $query A SPARQL query.
  */
-function wl_queue_sparql_update_query( $query ) {
+function wl_queue_sparql_update_query($query) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
+	file_put_contents($filename, $query."\n", FILE_APPEND);
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_queue_sparql_update_query [ filename :: $filename ]");
 }
 
 /**
@@ -122,33 +122,33 @@ 
  *
  * @param int $request_id The request ID.
  */
-function wl_execute_saved_sparql_update_query( $request_id ) {
+function wl_execute_saved_sparql_update_query($request_id) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+	$filename = WL_TEMP_DIR.$request_id.'.sparql';
 
 	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+	if ( ! file_exists($filename)) {
+		wl_write_log("wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]");
 
 		return;
 	}
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_execute_saved_sparql_update_query [ filename :: $filename ]");
 
 	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+	$query = file_get_contents($filename);
 
 	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+	rl_execute_sparql_update_query($query, false);
 
 	// Reindex the triple store.
 	wordlift_reindex_triple_store();
 
 	// Delete the temporary file.
-	unlink( $filename );
+	unlink($filename);
 }
 
-add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
+add_action('wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1);
 
 /**
  * Add buttons hook for the TinyMCE editor. This method is called by the WP init hook.
@@ -156,8 +156,8 @@ 
 function wordlift_buttonhooks() {
 
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
+		add_filter('mce_external_plugins', 'wordlift_register_tinymce_javascript');
 	}
 }
 
@@ -168,10 +168,10 @@ 
  *
  * @return array The modified plugins array.
  */
-function wordlift_register_tinymce_javascript( $plugin_array ) {
+function wordlift_register_tinymce_javascript($plugin_array) {
 
 	// add the wordlift plugin.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+	$plugin_array['wordlift'] = plugin_dir_url(__FILE__).'js/wordlift-reloaded.js';
 
 	return $plugin_array;
 }
@@ -183,7 +183,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -191,17 +191,17 @@ 
 		'itemid'    => array()
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // init process for button control
-add_action( 'init', 'wordlift_buttonhooks' );
+add_action('init', 'wordlift_buttonhooks');
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 
 /**
@@ -210,27 +210,27 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
 
 	// Disable auto-save for custom entity posts only
-	if( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ){
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
 		wp_dequeue_script('autosave');
 	}
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui', plugin_dir_url(__FILE__).'css/wordlift-ui.min.css');
 }
 
-add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
+add_action('wp_enqueue_scripts', 'wl_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -240,23 +240,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.
@@ -265,16 +265,16 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
 	// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : ''
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : ''
 	);
 }
 
@@ -285,12 +285,12 @@ 
  *
  * @return string A datetime.
  */
-function wl_get_post_modified_time( $post ) {
+function wl_get_post_modified_time($post) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+	$date_modified = get_post_modified_time('c', true, $post);
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
+	if ('-' === substr($date_modified, 0, 1)) {
+		return get_the_time('c', $post);
 	}
 
 	return $date_modified;
@@ -303,18 +303,18 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
+	$images = get_children(array(
 		'post_parent'    => $post_id,
 		'post_type'      => 'attachment',
 		'post_mime_type' => 'image'
-	) );
+	));
 
 	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
+	if (empty($images)) {
 		return array();
 	}
 
@@ -322,11 +322,11 @@ 
 	$image_urls = array();
 
 	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
+	foreach ($images as $attachment_id => $attachment) {
+		$image_url = wp_get_attachment_url($attachment_id);
 		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
+		if ( ! in_array($image_url, $image_urls)) {
+			array_push($image_urls, $image_url);
 		}
 	}
 
@@ -343,17 +343,17 @@ 
  *
  * @return string The SPARQL fragment.
  */
-function wl_get_sparql_images( $uri, $post_id ) {
+function wl_get_sparql_images($uri, $post_id) {
 
 	$sparql = '';
 
 	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+	$uri_e = esc_html($uri);
 
 	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
+	$image_urls = wl_get_image_urls($post_id);
+	foreach ($image_urls as $image_url) {
+		$image_url_esc = wl_sparql_escape_uri($image_url);
 		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
 	}
 
@@ -368,21 +368,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];
 	}
 
@@ -396,10 +396,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);
 }
 
 
@@ -415,14 +415,14 @@ 
  *
  * @param bool $hard True if the rewrite involves configuration updates in Apache/IIS.
  */
-function wl_flush_rewrite_rules_hard( $hard ) {
+function wl_flush_rewrite_rules_hard($hard) {
 
 	// Get all published posts.
-	$posts = get_posts( array(
-		'posts_per_page' => - 1,
+	$posts = get_posts(array(
+		'posts_per_page' => -1,
 		'post_type'      => 'any',
 		'post_status'    => 'publish'
-	) );
+	));
 
 	// Holds the delete part of the query.
 	$delete_query = rl_sparql_prefixes();
@@ -430,18 +430,18 @@ 
 	$insert_query = 'INSERT DATA { ';
 
 	// Cycle in each post to build the query.
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 
 		// Ignore revisions.
-		if ( wp_is_post_revision( $post->ID ) ) {
+		if (wp_is_post_revision($post->ID)) {
 			continue;
 		}
 
 		// Get the entity URI.
-		$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+		$uri = wl_sparql_escape_uri(wl_get_entity_uri($post->ID));
 
 		// Get the post URL.
-		$url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+		$url = wl_sparql_escape_uri(get_permalink($post->ID));
 
 		// Prepare the DELETE and INSERT commands.
 		$delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
@@ -453,10 +453,10 @@ 
 	$insert_query .= ' };';
 
 	// Execute the query.
-	rl_execute_sparql_update_query( $delete_query . $insert_query );
+	rl_execute_sparql_update_query($delete_query.$insert_query);
 }
 
-add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
+add_filter('flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1);
 
 /**
  * Sanitizes an URI path by replacing the non allowed characters with an underscore.
@@ -468,7 +468,7 @@ 
  *
  * @return The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
 	// wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
 
@@ -478,7 +478,7 @@ 
 	// Plus the ' ' (space).
 	// TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
 
-	return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
+	return sanitize_title(preg_replace('/[;\/?:@&=+$,\s]/', $char, stripslashes($path)));
 }
 
 /**
@@ -488,10 +488,10 @@ 
  * 
  * @return array Array containing $value (if $value was not an array) 
  */
-function wl_force_to_array( $value ) {
+function wl_force_to_array($value) {
 	
-	if ( ! is_array( $value ) ) {
-		return array( $value );
+	if ( ! is_array($value)) {
+		return array($value);
 	}
 	
 	return $value;
@@ -503,28 +503,28 @@ 
 function wl_shutdown() {
 
 	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
 
 	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+	if (WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists($filename)) {
 
 		// The request ID.
-		$args = array( WL_REQUEST_ID );
+		$args = array(WL_REQUEST_ID);
 
 		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+		wp_schedule_single_event(time(), 'wl_execute_saved_sparql_update_query', $args);
 
 		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+		$timestamp = wp_next_scheduled('wl_execute_saved_sparql_update_query', $args);
 
 		// Spawn the cron.
 		spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+		wl_write_log("wl_shutdown [ request id :: ".WL_REQUEST_ID." ][ timestamp :: $timestamp ]");
 	}
 }
 
-add_action( 'shutdown', 'wl_shutdown' );
+add_action('shutdown', 'wl_shutdown');
 
 /**
  * Replaces the *itemid* attributes URIs with the WordLift URIs.
@@ -533,117 +533,117 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
 	// wl_write_log( "wl_replace_item_id_with_uri" );
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()->get_entity_post_by_uri( $item_id );
+			$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 ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
-require_once( 'wordlift_entity_type_taxonomy.php' );
+require_once('wordlift_entity_type.php');
+require_once('wordlift_entity_type_taxonomy.php');
 
 // filters the post content when saving posts.
-require_once( 'wordlift_content_filter.php' );
+require_once('wordlift_content_filter.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');
 
 // 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/caching/wordlift_caching.php' );
-require_once( 'modules/redirector/wordlift_redirector.php' );
-require_once( 'modules/freebase_image_proxy/wordlift_freebase_image_proxy.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
+require_once('modules/caching/wordlift_caching.php');
+require_once('modules/redirector/wordlift_redirector.php');
+require_once('modules/freebase_image_proxy/wordlift_freebase_image_proxy.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');
 
 // disable In-Depth Articles
 //require_once('wordlift_indepth_articles.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/wordlift_widget_chord.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/wordlift_widget_chord.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_sparql.php' );
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_sparql.php');
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 // Provide syncing features.
-require_once( 'admin/wordlift_admin_sync.php' );
+require_once('admin/wordlift_admin_sync.php');
 //}
 
 // load languages.
 // TODO: the following call gives for granted that the plugin is in the wordlift directory,
 //       we're currently doing this because wordlift is symbolic linked.
-load_plugin_textdomain( 'wordlift', false, '/wordlift/languages' );
+load_plugin_textdomain('wordlift', false, '/wordlift/languages');
 
 
 /**
@@ -651,7 +651,7 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-activator.php';
 	Wordlift_Activator::activate();
 }
 
@@ -660,18 +660,18 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+	require_once plugin_dir_path(__FILE__).'includes/class-wordlift-deactivator.php';
 	Wordlift_Deactivator::deactivate();
 }
 
-register_activation_hook( __FILE__, 'activate_wordlift' );
-register_deactivation_hook( __FILE__, 'deactivate_wordlift' );
+register_activation_hook(__FILE__, 'activate_wordlift');
+register_deactivation_hook(__FILE__, 'deactivate_wordlift');
 
 /**
  * The core plugin class that is used to define internationalization,
  * admin-specific hooks, and public-facing site hooks.
  */
-require plugin_dir_path( __FILE__ ) . 'includes/class-wordlift.php';
+require plugin_dir_path(__FILE__).'includes/class-wordlift.php';
 
 /**
  * Begins execution of the plugin.