insideout10 / wordlift-plugin

src/includes/class-wordlift-query-builder.php

Indentation +273 added lines, -273 removed lines

@@ -7,278 +7,278 @@
  */
 class Wordlift_Query_Builder {
 
-	/**
-	 * The INSERT statement template.
-	 *
-	 * @since 3.1.7
-	 */
-	const INSERT = 'INSERT DATA { %s };';
-
-	/**
-	 * The DELETE statement template (it repeats the statements in the WHERE clause.
-	 *
-	 * @since 3.1.7
-	 */
-	const DELETE = 'DELETE { %s } WHERE { %1$s };';
-
-	/**
-	 * Tell the statement function to guess the object type (URI, value or parameter).
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_AUTO = - 1;
-
-	/**
-	 * Tell the statement function that the object is a URI.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_URI = 0;
-
-	/**
-	 * Tell the statement function that the object is a value.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_VALUE = 1;
-
-	/**
-	 * Tell the statement function that the object is a parameter.
-	 *
-	 * @since 3.1.7
-	 */
-	const OBJECT_PARAMETER = 2;
-
-	/**
-	 * The RDFS type.
-	 *
-	 * @since 3.1.7
-	 */
-	const RDFS_TYPE_URI = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
-
-	/**
-	 * The schema.org/Person type.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_PERSON_URI = 'http://schema.org/Person';
-
-	/**
-	 * The schema.org given name predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_GIVEN_NAME_URI = 'http://schema.org/givenName';
-
-	/**
-	 * The schema.org family name predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_FAMILY_NAME_URI = 'http://schema.org/familyName';
-
-	/**
-	 * The schema.org url predicate.
-	 *
-	 * @since 3.1.7
-	 */
-	const SCHEMA_URL_URI = 'http://schema.org/url';
-
-	/**
-	 * The RDF label.
-	 *
-	 * @since 3.1.7
-	 */
-	const RDFS_LABEL_URI = 'http://www.w3.org/2000/01/rdf-schema#label';
-
-	/**
-	 * Hold the template (INSERT or DELETE).
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var string $template The query template.
-	 */
-	private $template;
-
-	/**
-	 * An array of statements (in the form of subject, predicate, object).
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var array $statements An array of statements.
-	 */
-	private $statements = array();
-
-	/**
-	 * Create a new instance of the Query builder (compatible with PHP 5.3).
-	 *
-	 * @since 3.1.7
-	 * @return Wordlift_Query_Builder A new instance of the Query builder.
-	 */
-	public static function new_instance() {
-
-		return new Wordlift_Query_Builder();
-	}
-
-	/**
-	 * Set the query to INSERT.
-	 *
-	 * @since 3.1.7
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function insert() {
-
-		$this->template = self::INSERT;
-
-		return $this;
-	}
-
-	/**
-	 * Set the query to DELETE.
-	 *
-	 * @since 3.1.7
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function delete() {
-
-		$this->template = self::DELETE;
-
-		return $this;
-	}
-
-	/**
-	 * Add a statement.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $subject The subject of the statement (must be a URI).
-	 * @param string $predicate The predicate (must be a URI).
-	 * @param string $object The object, can be a URI or a value.
-	 * @param int $object_type The object type, either a {@link OBJECT_URI} or a value {@link OBJECT_VALUE}. If set to {@link OBJECT_AUTO}, the Query builder will try to guess.
-	 * @param string|null $data_type The data type (or null).
-	 * @param string|null $language The language code (or null).
-	 *
-	 * @return $this \Wordlift_Query_Builder The Query builder.
-	 */
-	public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
-
-		// If no value has been provided, we don't set any statement.
-		if ( empty( $object ) ) {
-			return $this;
-		}
-
-		// Get the object type if set, otherwise try to guess it.
-		$object_value_type = ( self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type( $predicate, $object ) );
-
-		// Prepare the statement template.
-		$template = '<%1$s> <%2$s> ' . (
-			self::OBJECT_URI === $object_value_type ? '<%3$s>' : (
-			self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
-				// self::OBJECT_VALUE === $object_value_type
-				'"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
-
-		// Escape the subject, predicate and object.
-		$escaped_subject   = $this->escape_uri( $subject );
-		$escaped_predicate = $this->escape_uri( $predicate );
-		$escaped_object    = ( self::OBJECT_URI === $object_value_type ? $this->escape_uri( $object ) : $this->escape_value( $object ) );
-
-		// Prepare the statement and add it to the list of statements.
-		$this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
-
-		return $this;
-	}
-
-	/**
-	 * Build the query.
-	 *
-	 * @since 3.1.7
-	 * @return string The query string.
-	 */
-	public function build() {
-
-		return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
-	}
-
-	/**
-	 * Guess the statement object type.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $predicate The predicate.
-	 * @param string $object The object.
-	 *
-	 * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
-	 */
-	private function guess_object_type( $predicate, $object ) {
-
-		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $object, '?' ) ) {
-			return self::OBJECT_PARAMETER;
-		}
-
-		// Guess based on the predicate.
-		switch ( $predicate ) {
-
-			case self::RDFS_TYPE_URI:
-			case self::SCHEMA_URL_URI:
-				return self::OBJECT_URI;
-
-		}
-
-		return self::OBJECT_VALUE;
-	}
-
-	/**
-	 * Escape a URI.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $uri The URI to escape.
-	 *
-	 * @return string The escaped URI.
-	 */
-	private function escape_uri( $uri ) {
-
-		// Should we validate the IRI?
-		// http://www.w3.org/TR/sparql11-query/#QSynIRI
-
-		$escaped_uri = str_replace( '<', '\<', $uri );
-		$escaped_uri = str_replace( '>', '\>', $escaped_uri );
-
-		return $escaped_uri;
-	}
-
-	/**
-	 * Escape a value.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param string $value The value to escape.
-	 *
-	 * @return string The escaped value.
-	 */
-	private function escape_value( $value ) {
-
-		// see http://www.w3.org/TR/rdf-sparql-query/
-		//    '\t'	U+0009 (tab)
-		//    '\n'	U+000A (line feed)
-		//    '\r'	U+000D (carriage return)
-		//    '\b'	U+0008 (backspace)
-		//    '\f'	U+000C (form feed)
-		//    '\"'	U+0022 (quotation mark, double quote mark)
-		//    "\'"	U+0027 (apostrophe-quote, single quote mark)
-		//    '\\'	U+005C (backslash)
-
-		$escaped_value = str_replace( '\\', '\\\\', $value );
-		$escaped_value = str_replace( '\'', '\\\'', $escaped_value );
-		$escaped_value = str_replace( '"', '\\"', $escaped_value );
-		$escaped_value = str_replace( "\f", '\\f', $escaped_value );
-		$escaped_value = str_replace( "\b", '\\b', $escaped_value );
-		$escaped_value = str_replace( "\r", '\\r', $escaped_value );
-		$escaped_value = str_replace( "\n", '\\n', $escaped_value );
-		$escaped_value = str_replace( "\t", '\\t', $escaped_value );
-
-		return $escaped_value;
-	}
+    /**
+     * The INSERT statement template.
+     *
+     * @since 3.1.7
+     */
+    const INSERT = 'INSERT DATA { %s };';
+
+    /**
+     * The DELETE statement template (it repeats the statements in the WHERE clause.
+     *
+     * @since 3.1.7
+     */
+    const DELETE = 'DELETE { %s } WHERE { %1$s };';
+
+    /**
+     * Tell the statement function to guess the object type (URI, value or parameter).
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_AUTO = - 1;
+
+    /**
+     * Tell the statement function that the object is a URI.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_URI = 0;
+
+    /**
+     * Tell the statement function that the object is a value.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_VALUE = 1;
+
+    /**
+     * Tell the statement function that the object is a parameter.
+     *
+     * @since 3.1.7
+     */
+    const OBJECT_PARAMETER = 2;
+
+    /**
+     * The RDFS type.
+     *
+     * @since 3.1.7
+     */
+    const RDFS_TYPE_URI = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type';
+
+    /**
+     * The schema.org/Person type.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_PERSON_URI = 'http://schema.org/Person';
+
+    /**
+     * The schema.org given name predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_GIVEN_NAME_URI = 'http://schema.org/givenName';
+
+    /**
+     * The schema.org family name predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_FAMILY_NAME_URI = 'http://schema.org/familyName';
+
+    /**
+     * The schema.org url predicate.
+     *
+     * @since 3.1.7
+     */
+    const SCHEMA_URL_URI = 'http://schema.org/url';
+
+    /**
+     * The RDF label.
+     *
+     * @since 3.1.7
+     */
+    const RDFS_LABEL_URI = 'http://www.w3.org/2000/01/rdf-schema#label';
+
+    /**
+     * Hold the template (INSERT or DELETE).
+     *
+     * @since 3.1.7
+     * @access private
+     * @var string $template The query template.
+     */
+    private $template;
+
+    /**
+     * An array of statements (in the form of subject, predicate, object).
+     *
+     * @since 3.1.7
+     * @access private
+     * @var array $statements An array of statements.
+     */
+    private $statements = array();
+
+    /**
+     * Create a new instance of the Query builder (compatible with PHP 5.3).
+     *
+     * @since 3.1.7
+     * @return Wordlift_Query_Builder A new instance of the Query builder.
+     */
+    public static function new_instance() {
+
+        return new Wordlift_Query_Builder();
+    }
+
+    /**
+     * Set the query to INSERT.
+     *
+     * @since 3.1.7
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function insert() {
+
+        $this->template = self::INSERT;
+
+        return $this;
+    }
+
+    /**
+     * Set the query to DELETE.
+     *
+     * @since 3.1.7
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function delete() {
+
+        $this->template = self::DELETE;
+
+        return $this;
+    }
+
+    /**
+     * Add a statement.
+     *
+     * @since 3.1.7
+     *
+     * @param string $subject The subject of the statement (must be a URI).
+     * @param string $predicate The predicate (must be a URI).
+     * @param string $object The object, can be a URI or a value.
+     * @param int $object_type The object type, either a {@link OBJECT_URI} or a value {@link OBJECT_VALUE}. If set to {@link OBJECT_AUTO}, the Query builder will try to guess.
+     * @param string|null $data_type The data type (or null).
+     * @param string|null $language The language code (or null).
+     *
+     * @return $this \Wordlift_Query_Builder The Query builder.
+     */
+    public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
+
+        // If no value has been provided, we don't set any statement.
+        if ( empty( $object ) ) {
+            return $this;
+        }
+
+        // Get the object type if set, otherwise try to guess it.
+        $object_value_type = ( self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type( $predicate, $object ) );
+
+        // Prepare the statement template.
+        $template = '<%1$s> <%2$s> ' . (
+            self::OBJECT_URI === $object_value_type ? '<%3$s>' : (
+            self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
+                // self::OBJECT_VALUE === $object_value_type
+                '"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
+
+        // Escape the subject, predicate and object.
+        $escaped_subject   = $this->escape_uri( $subject );
+        $escaped_predicate = $this->escape_uri( $predicate );
+        $escaped_object    = ( self::OBJECT_URI === $object_value_type ? $this->escape_uri( $object ) : $this->escape_value( $object ) );
+
+        // Prepare the statement and add it to the list of statements.
+        $this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
+
+        return $this;
+    }
+
+    /**
+     * Build the query.
+     *
+     * @since 3.1.7
+     * @return string The query string.
+     */
+    public function build() {
+
+        return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
+    }
+
+    /**
+     * Guess the statement object type.
+     *
+     * @since 3.1.7
+     *
+     * @param string $predicate The predicate.
+     * @param string $object The object.
+     *
+     * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
+     */
+    private function guess_object_type( $predicate, $object ) {
+
+        // If the object starts with a question mark, it's a parameter.
+        if ( 0 === strpos( $object, '?' ) ) {
+            return self::OBJECT_PARAMETER;
+        }
+
+        // Guess based on the predicate.
+        switch ( $predicate ) {
+
+            case self::RDFS_TYPE_URI:
+            case self::SCHEMA_URL_URI:
+                return self::OBJECT_URI;
+
+        }
+
+        return self::OBJECT_VALUE;
+    }
+
+    /**
+     * Escape a URI.
+     *
+     * @since 3.1.7
+     *
+     * @param string $uri The URI to escape.
+     *
+     * @return string The escaped URI.
+     */
+    private function escape_uri( $uri ) {
+
+        // Should we validate the IRI?
+        // http://www.w3.org/TR/sparql11-query/#QSynIRI
+
+        $escaped_uri = str_replace( '<', '\<', $uri );
+        $escaped_uri = str_replace( '>', '\>', $escaped_uri );
+
+        return $escaped_uri;
+    }
+
+    /**
+     * Escape a value.
+     *
+     * @since 3.1.7
+     *
+     * @param string $value The value to escape.
+     *
+     * @return string The escaped value.
+     */
+    private function escape_value( $value ) {
+
+        // see http://www.w3.org/TR/rdf-sparql-query/
+        //    '\t'	U+0009 (tab)
+        //    '\n'	U+000A (line feed)
+        //    '\r'	U+000D (carriage return)
+        //    '\b'	U+0008 (backspace)
+        //    '\f'	U+000C (form feed)
+        //    '\"'	U+0022 (quotation mark, double quote mark)
+        //    "\'"	U+0027 (apostrophe-quote, single quote mark)
+        //    '\\'	U+005C (backslash)
+
+        $escaped_value = str_replace( '\\', '\\\\', $value );
+        $escaped_value = str_replace( '\'', '\\\'', $escaped_value );
+        $escaped_value = str_replace( '"', '\\"', $escaped_value );
+        $escaped_value = str_replace( "\f", '\\f', $escaped_value );
+        $escaped_value = str_replace( "\b", '\\b', $escaped_value );
+        $escaped_value = str_replace( "\r", '\\r', $escaped_value );
+        $escaped_value = str_replace( "\n", '\\n', $escaped_value );
+        $escaped_value = str_replace( "\t", '\\t', $escaped_value );
+
+        return $escaped_value;
+    }
 
 }

Spacing +26 added lines, -27 removed lines

@@ -160,30 +160,29 @@ 
 	 *
 	 * @return $this \Wordlift_Query_Builder The Query builder.
 	 */
-	public function statement( $subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null ) {
+	public function statement($subject, $predicate, $object, $object_type = self::OBJECT_AUTO, $data_type = null, $language = null) {
 
 		// If no value has been provided, we don't set any statement.
-		if ( empty( $object ) ) {
+		if (empty($object)) {
 			return $this;
 		}
 
 		// Get the object type if set, otherwise try to guess it.
-		$object_value_type = ( self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type( $predicate, $object ) );
+		$object_value_type = (self::OBJECT_AUTO !== $object_type ?: $this->guess_object_type($predicate, $object));
 
 		// Prepare the statement template.
-		$template = '<%1$s> <%2$s> ' . (
+		$template = '<%1$s> <%2$s> '.(
 			self::OBJECT_URI === $object_value_type ? '<%3$s>' : (
-			self::OBJECT_PARAMETER === $object_value_type ? '%3$s' :
-				// self::OBJECT_VALUE === $object_value_type
-				'"%3$s"' . ( isset( $data_type ) ? '^^%4$s' : '' ) . ( isset( $language ) ? '@%5$s' : '' ) ) );
+			self::OBJECT_PARAMETER === $object_value_type ? '%3$s' : // self::OBJECT_VALUE === $object_value_type
+				'"%3$s"'.(isset($data_type) ? '^^%4$s' : '').(isset($language) ? '@%5$s' : '') ) );
 
 		// Escape the subject, predicate and object.
-		$escaped_subject   = $this->escape_uri( $subject );
-		$escaped_predicate = $this->escape_uri( $predicate );
-		$escaped_object    = ( self::OBJECT_URI === $object_value_type ? $this->escape_uri( $object ) : $this->escape_value( $object ) );
+		$escaped_subject   = $this->escape_uri($subject);
+		$escaped_predicate = $this->escape_uri($predicate);
+		$escaped_object    = (self::OBJECT_URI === $object_value_type ? $this->escape_uri($object) : $this->escape_value($object));
 
 		// Prepare the statement and add it to the list of statements.
-		$this->statements[] = sprintf( $template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language );
+		$this->statements[] = sprintf($template, $escaped_subject, $escaped_predicate, $escaped_object, $data_type, $language);
 
 		return $this;
 	}
@@ -196,7 +195,7 @@ 
 	 */
 	public function build() {
 
-		return sprintf( $this->template, implode( ' . ', $this->statements ) ) . "\n";
+		return sprintf($this->template, implode(' . ', $this->statements))."\n";
 	}
 
 	/**
@@ -209,15 +208,15 @@ 
 	 *
 	 * @return int {@link Wordlift_Query_Builder::OBJECT_URI} if the Query builder thinks the object must be an URI, {@link Wordlift_Query_Builder::OBJECT_VALUE} otherwise.
 	 */
-	private function guess_object_type( $predicate, $object ) {
+	private function guess_object_type($predicate, $object) {
 
 		// If the object starts with a question mark, it's a parameter.
-		if ( 0 === strpos( $object, '?' ) ) {
+		if (0 === strpos($object, '?')) {
 			return self::OBJECT_PARAMETER;
 		}
 
 		// Guess based on the predicate.
-		switch ( $predicate ) {
+		switch ($predicate) {
 
 			case self::RDFS_TYPE_URI:
 			case self::SCHEMA_URL_URI:
@@ -237,13 +236,13 @@ 
 	 *
 	 * @return string The escaped URI.
 	 */
-	private function escape_uri( $uri ) {
+	private function escape_uri($uri) {
 
 		// Should we validate the IRI?
 		// http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-		$escaped_uri = str_replace( '<', '\<', $uri );
-		$escaped_uri = str_replace( '>', '\>', $escaped_uri );
+		$escaped_uri = str_replace('<', '\<', $uri);
+		$escaped_uri = str_replace('>', '\>', $escaped_uri);
 
 		return $escaped_uri;
 	}
@@ -257,7 +256,7 @@ 
 	 *
 	 * @return string The escaped value.
 	 */
-	private function escape_value( $value ) {
+	private function escape_value($value) {
 
 		// see http://www.w3.org/TR/rdf-sparql-query/
 		//    '\t'	U+0009 (tab)
@@ -269,14 +268,14 @@ 
 		//    "\'"	U+0027 (apostrophe-quote, single quote mark)
 		//    '\\'	U+005C (backslash)
 
-		$escaped_value = str_replace( '\\', '\\\\', $value );
-		$escaped_value = str_replace( '\'', '\\\'', $escaped_value );
-		$escaped_value = str_replace( '"', '\\"', $escaped_value );
-		$escaped_value = str_replace( "\f", '\\f', $escaped_value );
-		$escaped_value = str_replace( "\b", '\\b', $escaped_value );
-		$escaped_value = str_replace( "\r", '\\r', $escaped_value );
-		$escaped_value = str_replace( "\n", '\\n', $escaped_value );
-		$escaped_value = str_replace( "\t", '\\t', $escaped_value );
+		$escaped_value = str_replace('\\', '\\\\', $value);
+		$escaped_value = str_replace('\'', '\\\'', $escaped_value);
+		$escaped_value = str_replace('"', '\\"', $escaped_value);
+		$escaped_value = str_replace("\f", '\\f', $escaped_value);
+		$escaped_value = str_replace("\b", '\\b', $escaped_value);
+		$escaped_value = str_replace("\r", '\\r', $escaped_value);
+		$escaped_value = str_replace("\n", '\\n', $escaped_value);
+		$escaped_value = str_replace("\t", '\\t', $escaped_value);
 
 		return $escaped_value;
 	}

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

Indentation +240 added lines, -240 removed lines

@@ -10,245 +10,245 @@
  */
 class Wordlift_User_Service {
 
-	/**
-	 * The meta key where the user's URI is stored.
-	 *
-	 * @since 3.1.7
-	 */
-	const URI_META_KEY = '_wl_uri';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * The singleton instance of the User service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of the User service.
-	 *
-	 * @since 3.1.7
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the User service.
-	 *
-	 * @since 3.1.7
-	 * @return \Wordlift_User_Service The singleton instance of the User service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	public function get_uri( $user_id ) {
-
-		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
-			return $user_uri;
-		}
-
-		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
-
-		return $user_uri;
-	}
-
-	/**
-	 * Receives wp_insert_post events.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @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 wp_insert_post( $post_id, $post, $update ) {
-
-		// If the post is not published, return.
-		if ( 'publish' !== get_post_status( $post_id ) ) {
-			return;
-		}
-
-		// We expect a numeric author id.
-		if ( ! is_numeric( $post->post_author ) ) {
-			return;
-		}
-
-		// Get the delete query,or return in case of failure.
-		if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
-			return;
-		}
-
-		// Get the insert query,or return in case of failure.
-		if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
-			return;
-		}
-
-		// Send the query to the triple store.
-		rl_execute_sparql_update_query( $delete . $insert );
-
-	}
-
-	/**
-	 * Get the user's URI stored in the user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The user's URI or false if not found.
-	 */
-	private function _get_uri( $user_id ) {
-
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
-
-		if ( empty( $user_uri ) ) {
-			return false;
-		}
-
-		return $user_uri;
-	}
-
-	/**
-	 * Build an URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user's id.
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	private function _build_uri( $user_id ) {
-
-		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
-			return false;
-		}
-
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
-	}
-
-	/**
-	 * Store the URI in user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user's id.
-	 * @param string $user_uri The user's uri.
-	 *
-	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
-	 */
-	private function _set_uri( $user_id, $user_uri ) {
-
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
-	}
-
-	/**
-	 * Get the delete query.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The delete query or false in case of failure.
-	 */
-	private function get_delete_query( $user_id ) {
-
-		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Build the delete query.
-		$query = Wordlift_Query_Builder::new_instance()->delete()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
-		                               ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
-		                                 ->build();
-
-		return $query;
-	}
-
-	/**
-	 * Get the insert query.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The insert query or false in case of failure.
-	 */
-	private function get_insert_query( $user_id ) {
-
-		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Try to get the user data, in case of failure return false.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// Build the insert query.
-		$query = Wordlift_Query_Builder::new_instance()
-		                               ->insert()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
-		                               ->build();
-
-		return $query;
-	}
+    /**
+     * The meta key where the user's URI is stored.
+     *
+     * @since 3.1.7
+     */
+    const URI_META_KEY = '_wl_uri';
+
+    /**
+     * The Log service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * The singleton instance of the User service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of the User service.
+     *
+     * @since 3.1.7
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the User service.
+     *
+     * @since 3.1.7
+     * @return \Wordlift_User_Service The singleton instance of the User service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    public function get_uri( $user_id ) {
+
+        // Try to get the URI stored in the user's meta and return it if available.
+        if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+            return $user_uri;
+        }
+
+        // Try to build an URI, return false in case of failure.
+        if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Store the URI for future requests (we need a "permanent" URI).
+        $this->_set_uri( $user_id, $user_uri );
+
+        return $user_uri;
+    }
+
+    /**
+     * Receives wp_insert_post events.
+     *
+     * @since 3.1.7
+     *
+     * @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 wp_insert_post( $post_id, $post, $update ) {
+
+        // If the post is not published, return.
+        if ( 'publish' !== get_post_status( $post_id ) ) {
+            return;
+        }
+
+        // We expect a numeric author id.
+        if ( ! is_numeric( $post->post_author ) ) {
+            return;
+        }
+
+        // Get the delete query,or return in case of failure.
+        if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
+            return;
+        }
+
+        // Get the insert query,or return in case of failure.
+        if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
+            return;
+        }
+
+        // Send the query to the triple store.
+        rl_execute_sparql_update_query( $delete . $insert );
+
+    }
+
+    /**
+     * Get the user's URI stored in the user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The user's URI or false if not found.
+     */
+    private function _get_uri( $user_id ) {
+
+        $user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+
+        if ( empty( $user_uri ) ) {
+            return false;
+        }
+
+        return $user_uri;
+    }
+
+    /**
+     * Build an URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user's id.
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    private function _build_uri( $user_id ) {
+
+        // Get the user, return false in case of failure.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // If the nicename is not set, return a failure.
+        if ( empty( $user->user_nicename ) ) {
+            return false;
+        }
+
+        return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+    }
+
+    /**
+     * Store the URI in user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user's id.
+     * @param string $user_uri The user's uri.
+     *
+     * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
+     */
+    private function _set_uri( $user_id, $user_uri ) {
+
+        return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+    }
+
+    /**
+     * Get the delete query.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The delete query or false in case of failure.
+     */
+    private function get_delete_query( $user_id ) {
+
+        // Get the URI, return if there's none.
+        if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Build the delete query.
+        $query = Wordlift_Query_Builder::new_instance()->delete()
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+                                        ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+                                            ->build();
+
+        return $query;
+    }
+
+    /**
+     * Get the insert query.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The insert query or false in case of failure.
+     */
+    private function get_insert_query( $user_id ) {
+
+        // Get the URI, return if there's none.
+        if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Try to get the user data, in case of failure return false.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // Build the insert query.
+        $query = Wordlift_Query_Builder::new_instance()
+                                        ->insert()
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
+                                        ->build();
+
+        return $query;
+    }
 
 }

Spacing +35 added lines, -35 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_User_Service');
 
 		self::$instance = $this;
 
@@ -68,20 +68,20 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	public function get_uri( $user_id ) {
+	public function get_uri($user_id) {
 
 		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+		if (false !== ($user_uri = $this->_get_uri($user_id))) {
 			return $user_uri;
 		}
 
 		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->_build_uri($user_id))) {
 			return false;
 		}
 
 		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
+		$this->_set_uri($user_id, $user_uri);
 
 		return $user_uri;
 	}
@@ -95,30 +95,30 @@ 
 	 * @param WP_Post $post Post object.
 	 * @param bool $update Whether this is an existing post being updated or not.
 	 */
-	public function wp_insert_post( $post_id, $post, $update ) {
+	public function wp_insert_post($post_id, $post, $update) {
 
 		// If the post is not published, return.
-		if ( 'publish' !== get_post_status( $post_id ) ) {
+		if ('publish' !== get_post_status($post_id)) {
 			return;
 		}
 
 		// We expect a numeric author id.
-		if ( ! is_numeric( $post->post_author ) ) {
+		if ( ! is_numeric($post->post_author)) {
 			return;
 		}
 
 		// Get the delete query,or return in case of failure.
-		if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
+		if (false === ($delete = $this->get_delete_query($post->post_author))) {
 			return;
 		}
 
 		// Get the insert query,or return in case of failure.
-		if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
+		if (false === ($insert = $this->get_insert_query($post->post_author))) {
 			return;
 		}
 
 		// Send the query to the triple store.
-		rl_execute_sparql_update_query( $delete . $insert );
+		rl_execute_sparql_update_query($delete.$insert);
 
 	}
 
@@ -131,11 +131,11 @@ 
 	 *
 	 * @return false|string The user's URI or false if not found.
 	 */
-	private function _get_uri( $user_id ) {
+	private function _get_uri($user_id) {
 
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+		$user_uri = get_user_meta($user_id, self::URI_META_KEY, true);
 
-		if ( empty( $user_uri ) ) {
+		if (empty($user_uri)) {
 			return false;
 		}
 
@@ -151,19 +151,19 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	private function _build_uri( $user_id ) {
+	private function _build_uri($user_id) {
 
 		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
+		if (empty($user->user_nicename)) {
 			return false;
 		}
 
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+		return wl_configuration_get_redlink_dataset_uri()."/user/$user->user_nicename";
 	}
 
 	/**
@@ -176,9 +176,9 @@ 
 	 *
 	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	private function _set_uri( $user_id, $user_uri ) {
+	private function _set_uri($user_id, $user_uri) {
 
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+		return update_user_meta($user_id, self::URI_META_KEY, $user_uri);
 	}
 
 	/**
@@ -190,28 +190,28 @@ 
 	 *
 	 * @return false|string The delete query or false in case of failure.
 	 */
-	private function get_delete_query( $user_id ) {
+	private function get_delete_query($user_id) {
 
 		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->get_uri($user_id))) {
 			return false;
 		}
 
 		// Build the delete query.
 		$query = Wordlift_Query_Builder::new_instance()->delete()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o')
 		                               ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o')
 		                                 ->build();
 
 		return $query;
@@ -226,26 +226,26 @@ 
 	 *
 	 * @return false|string The insert query or false in case of failure.
 	 */
-	private function get_insert_query( $user_id ) {
+	private function get_insert_query($user_id) {
 
 		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->get_uri($user_id))) {
 			return false;
 		}
 
 		// Try to get the user data, in case of failure return false.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// Build the insert query.
 		$query = Wordlift_Query_Builder::new_instance()
 		                               ->insert()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI)
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty($user->user_url) ? $user->user_url : get_author_posts_url($user_id)))
 		                               ->build();
 
 		return $query;

src/includes/class-wordlift.php

Indentation +318 added lines, -318 removed lines

@@ -29,323 +29,323 @@
  */
 class Wordlift {
 
-	/**
-	 * The loader that's responsible for maintaining and registering all hooks that power
-	 * the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
-	 */
-	protected $loader;
-
-	/**
-	 * The unique identifier of this plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $plugin_name The string used to uniquely identify this plugin.
-	 */
-	protected $plugin_name;
-
-	/**
-	 * The current version of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   protected
-	 * @var      string $version The current version of the plugin.
-	 */
-	protected $version;
-
-	/**
-	 * The Thumbnail service.
-	 *
-	 * @since 3.1.5
-	 * @access private
-	 * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
-	 */
-	private $thumbnail_service;
-
-	/**
-	 * The Entity service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Service $entity_service The Entity service.
-	 */
-	private $entity_service;
-
-	/**
-	 * The User service.
-	 *
-	 * @since 3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The User service.
-	 */
-	private $user_service;
-
-	/**
-	 * The Timeline service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
-	 */
-	private $timeline_service;
-
-	/**
-	 * The Entity Types Taxonomy Walker.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
-	 */
-	private $entity_types_taxonomy_walker;
-
-	/**
-	 * Define the core functionality of the plugin.
-	 *
-	 * Set the plugin name and the plugin version that can be used throughout the plugin.
-	 * Load the dependencies, define the locale, and set the hooks for the admin area and
-	 * the public-facing side of the site.
-	 *
-	 * @since    1.0.0
-	 */
-	public function __construct() {
-
-		$this->plugin_name = 'wordlift';
-		$this->version     = '3.1.7';
-
-		$this->load_dependencies();
-		$this->set_locale();
-		$this->define_admin_hooks();
-		$this->define_public_hooks();
-
-	}
-
-	/**
-	 * Load the required dependencies for this plugin.
-	 *
-	 * Include the following files that make up the plugin:
-	 *
-	 * - Wordlift_Loader. Orchestrates the hooks of the plugin.
-	 * - Wordlift_i18n. Defines internationalization functionality.
-	 * - Wordlift_Admin. Defines all hooks for the admin area.
-	 * - Wordlift_Public. Defines all hooks for the public side of the site.
-	 *
-	 * Create an instance of the loader which will be used to register the hooks
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function load_dependencies() {
-
-		/**
-		 * The class responsible for orchestrating the actions and filters of the
-		 * core plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
-
-		/**
-		 * The class responsible for defining internationalization functionality
-		 * of the plugin.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
-
-		/**
-		 * The Log service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
-
-		/**
-		 * The Query builder.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
-
-		/**
-		 * The Schema service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
-
-		/**
-		 * The Thumbnail service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
-
-		/**
-		 * The Entity Types Taxonomy service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
-
-		/**
-		 * The Entity service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
-
-		/**
-		 * The User service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
-
-		/**
-		 * The Timeline service.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the admin area.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
-
-		/**
-		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
-
-		/**
-		 * The class responsible for defining all actions that occur in the public-facing
-		 * side of the site.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
-
-		/**
-		 * The Timeline shortcode.
-		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
-
-		$this->loader = new Wordlift_Loader();
-
-		// Instantiate a global logger.
-		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
-
-		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
-		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
-
-		// Create an instance of the Schema service.
-		new Wordlift_Schema_Service();
-
-		$this->entity_service = new Wordlift_Entity_Service();
-
-		// Create an instance of the User service.
-		$this->user_service = new Wordlift_User_Service();
-
-		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
-
-		// Create an instance of the Timeline shortcode.
-		new Wordlift_Timeline_Shortcode();
-
-		$this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
-
-	}
-
-	/**
-	 * Define the locale for this plugin for internationalization.
-	 *
-	 * Uses the Wordlift_i18n class in order to set the domain and to register the hook
-	 * with WordPress.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function set_locale() {
-
-		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
-
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the admin area functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_admin_hooks() {
-
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
-
-		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
-
-		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
-
-		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
-
-	}
-
-	/**
-	 * Register all of the hooks related to the public-facing functionality
-	 * of the plugin.
-	 *
-	 * @since    1.0.0
-	 * @access   private
-	 */
-	private function define_public_hooks() {
-
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
-
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
-
-		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
-
-	}
-
-	/**
-	 * Run the loader to execute all of the hooks with WordPress.
-	 *
-	 * @since    1.0.0
-	 */
-	public function run() {
-		$this->loader->run();
-	}
-
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The name of the plugin.
-	 */
-	public function get_plugin_name() {
-		return $this->plugin_name;
-	}
-
-	/**
-	 * The reference to the class that orchestrates the hooks with the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
-	 */
-	public function get_loader() {
-		return $this->loader;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     1.0.0
-	 * @return    string    The version number of the plugin.
-	 */
-	public function get_version() {
-		return $this->version;
-	}
+    /**
+     * The loader that's responsible for maintaining and registering all hooks that power
+     * the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      Wordlift_Loader $loader Maintains and registers all hooks for the plugin.
+     */
+    protected $loader;
+
+    /**
+     * The unique identifier of this plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $plugin_name The string used to uniquely identify this plugin.
+     */
+    protected $plugin_name;
+
+    /**
+     * The current version of the plugin.
+     *
+     * @since    1.0.0
+     * @access   protected
+     * @var      string $version The current version of the plugin.
+     */
+    protected $version;
+
+    /**
+     * The Thumbnail service.
+     *
+     * @since 3.1.5
+     * @access private
+     * @var \Wordlift_Thumbnail_Service $thumbnail_service The Thumbnail service.
+     */
+    private $thumbnail_service;
+
+    /**
+     * The Entity service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Service $entity_service The Entity service.
+     */
+    private $entity_service;
+
+    /**
+     * The User service.
+     *
+     * @since 3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The User service.
+     */
+    private $user_service;
+
+    /**
+     * The Timeline service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $timeline_service The Timeline service.
+     */
+    private $timeline_service;
+
+    /**
+     * The Entity Types Taxonomy Walker.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Entity_Types_Taxonomy_Walker $entity_types_taxonomy_walker The Entity Types Taxonomy Walker
+     */
+    private $entity_types_taxonomy_walker;
+
+    /**
+     * Define the core functionality of the plugin.
+     *
+     * Set the plugin name and the plugin version that can be used throughout the plugin.
+     * Load the dependencies, define the locale, and set the hooks for the admin area and
+     * the public-facing side of the site.
+     *
+     * @since    1.0.0
+     */
+    public function __construct() {
+
+        $this->plugin_name = 'wordlift';
+        $this->version     = '3.1.7';
+
+        $this->load_dependencies();
+        $this->set_locale();
+        $this->define_admin_hooks();
+        $this->define_public_hooks();
+
+    }
+
+    /**
+     * Load the required dependencies for this plugin.
+     *
+     * Include the following files that make up the plugin:
+     *
+     * - Wordlift_Loader. Orchestrates the hooks of the plugin.
+     * - Wordlift_i18n. Defines internationalization functionality.
+     * - Wordlift_Admin. Defines all hooks for the admin area.
+     * - Wordlift_Public. Defines all hooks for the public side of the site.
+     *
+     * Create an instance of the loader which will be used to register the hooks
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function load_dependencies() {
+
+        /**
+         * The class responsible for orchestrating the actions and filters of the
+         * core plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+
+        /**
+         * The class responsible for defining internationalization functionality
+         * of the plugin.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+
+        /**
+         * The Log service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+
+        /**
+         * The Query builder.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+
+        /**
+         * The Schema service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+
+        /**
+         * The Thumbnail service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+
+        /**
+         * The Entity Types Taxonomy service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+
+        /**
+         * The Entity service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+
+        /**
+         * The User service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+
+        /**
+         * The Timeline service.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the admin area.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+
+        /**
+         * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+
+        /**
+         * The class responsible for defining all actions that occur in the public-facing
+         * side of the site.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+
+        /**
+         * The Timeline shortcode.
+         */
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+
+        $this->loader = new Wordlift_Loader();
+
+        // Instantiate a global logger.
+        global $wl_logger;
+        $wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+
+        // Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
+        $this->thumbnail_service = new Wordlift_Thumbnail_Service();
+
+        // Create an instance of the Schema service.
+        new Wordlift_Schema_Service();
+
+        $this->entity_service = new Wordlift_Entity_Service();
+
+        // Create an instance of the User service.
+        $this->user_service = new Wordlift_User_Service();
+
+        // Create a new instance of the Timeline service and Timeline shortcode.
+        $this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+
+        // Create an instance of the Timeline shortcode.
+        new Wordlift_Timeline_Shortcode();
+
+        $this->entity_types_taxonomy_walker = new Wordlift_Entity_Types_Taxonomy_Walker();
+
+    }
+
+    /**
+     * Define the locale for this plugin for internationalization.
+     *
+     * Uses the Wordlift_i18n class in order to set the domain and to register the hook
+     * with WordPress.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function set_locale() {
+
+        $plugin_i18n = new Wordlift_i18n();
+        $plugin_i18n->set_domain( $this->get_plugin_name() );
+
+        $this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the admin area functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_admin_hooks() {
+
+        $plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
+        $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+
+        // Hook the deleted_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+
+        // Hook the added_post_meta action to the Thumbnail service.
+        $this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+
+        // Hook posts inserts (or updates) to the user service.
+        $this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+        $this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+
+    }
+
+    /**
+     * Register all of the hooks related to the public-facing functionality
+     * of the plugin.
+     *
+     * @since    1.0.0
+     * @access   private
+     */
+    private function define_public_hooks() {
+
+        $plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+
+        // Hook the AJAX wl_timeline action to the Timeline service.
+        $this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+
+    }
+
+    /**
+     * Run the loader to execute all of the hooks with WordPress.
+     *
+     * @since    1.0.0
+     */
+    public function run() {
+        $this->loader->run();
+    }
+
+    /**
+     * The name of the plugin used to uniquely identify it within the context of
+     * WordPress and to define internationalization functionality.
+     *
+     * @since     1.0.0
+     * @return    string    The name of the plugin.
+     */
+    public function get_plugin_name() {
+        return $this->plugin_name;
+    }
+
+    /**
+     * The reference to the class that orchestrates the hooks with the plugin.
+     *
+     * @since     1.0.0
+     * @return    Wordlift_Loader    Orchestrates the hooks of the plugin.
+     */
+    public function get_loader() {
+        return $this->loader;
+    }
+
+    /**
+     * Retrieve the version number of the plugin.
+     *
+     * @since     1.0.0
+     * @return    string    The version number of the plugin.
+     */
+    public function get_version() {
+        return $this->version;
+    }
 
 }

Spacing +30 added lines, -30 removed lines

@@ -145,80 +145,80 @@ 
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-loader.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-loader.php';
 
 		/**
 		 * The class responsible for defining internationalization functionality
 		 * of the plugin.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-i18n.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-i18n.php';
 
 		/**
 		 * The Log service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-log-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-log-service.php';
 
 		/**
 		 * The Query builder.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-query-builder.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-query-builder.php';
 
 		/**
 		 * The Schema service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-schema-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-schema-service.php';
 
 		/**
 		 * The Thumbnail service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-thumbnail-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-thumbnail-service.php';
 
 		/**
 		 * The Entity Types Taxonomy service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-types-taxonomy-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-types-taxonomy-service.php';
 
 		/**
 		 * The Entity service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-entity-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-entity-service.php';
 
 		/**
 		 * The User service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-user-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-user-service.php';
 
 		/**
 		 * The Timeline service.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-wordlift-timeline-service.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'includes/class-wordlift-timeline-service.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the admin area.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-admin.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-admin.php';
 
 		/**
 		 * The Entity Types Taxonomy Walker (transforms checkboxes into radios).
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/class-wordlift-entity-types-taxonomy-walker.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'admin/class-wordlift-entity-types-taxonomy-walker.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-public.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-public.php';
 
 		/**
 		 * The Timeline shortcode.
 		 */
-		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'public/class-wordlift-timeline-shortcode.php';
+		require_once plugin_dir_path(dirname(__FILE__)).'public/class-wordlift-timeline-shortcode.php';
 
 		$this->loader = new Wordlift_Loader();
 
 		// Instantiate a global logger.
 		global $wl_logger;
-		$wl_logger = Wordlift_Log_Service::get_logger( 'WordLift' );
+		$wl_logger = Wordlift_Log_Service::get_logger('WordLift');
 
 		// Create an instance of the Thumbnail service. Later it'll be hooked to post meta events.
 		$this->thumbnail_service = new Wordlift_Thumbnail_Service();
@@ -232,7 +232,7 @@ 
 		$this->user_service = new Wordlift_User_Service();
 
 		// Create a new instance of the Timeline service and Timeline shortcode.
-		$this->timeline_service = new Wordlift_Timeline_Service( $this->entity_service );
+		$this->timeline_service = new Wordlift_Timeline_Service($this->entity_service);
 
 		// Create an instance of the Timeline shortcode.
 		new Wordlift_Timeline_Shortcode();
@@ -253,9 +253,9 @@ 
 	private function set_locale() {
 
 		$plugin_i18n = new Wordlift_i18n();
-		$plugin_i18n->set_domain( $this->get_plugin_name() );
+		$plugin_i18n->set_domain($this->get_plugin_name());
 
-		$this->loader->add_action( 'plugins_loaded', $plugin_i18n, 'load_plugin_textdomain' );
+		$this->loader->add_action('plugins_loaded', $plugin_i18n, 'load_plugin_textdomain');
 
 	}
 
@@ -268,24 +268,24 @@ 
 	 */
 	private function define_admin_hooks() {
 
-		$plugin_admin = new Wordlift_Admin( $this->get_plugin_name(), $this->get_version() );
+		$plugin_admin = new Wordlift_Admin($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
-		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_styles');
+		$this->loader->add_action('admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts');
 
 		// Hook the deleted_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4 );
+		$this->loader->add_action('deleted_post_meta', $this->thumbnail_service, 'deleted_post_meta', 10, 4);
 
 		// Hook the added_post_meta action to the Thumbnail service.
-		$this->loader->add_action( 'added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4 );
+		$this->loader->add_action('added_post_meta', $this->thumbnail_service, 'added_post_meta', 10, 4);
 
 		// Hook posts inserts (or updates) to the user service.
-		$this->loader->add_action( 'wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3 );
+		$this->loader->add_action('wp_insert_post', $this->user_service, 'wp_insert_post', 10, 3);
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
-		$this->loader->add_filter( 'wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args' );
+		$this->loader->add_filter('wp_terms_checklist_args', $this->entity_types_taxonomy_walker, 'terms_checklist_args');
 
 	}
 
@@ -298,13 +298,13 @@ 
 	 */
 	private function define_public_hooks() {
 
-		$plugin_public = new Wordlift_Public( $this->get_plugin_name(), $this->get_version() );
+		$plugin_public = new Wordlift_Public($this->get_plugin_name(), $this->get_version());
 
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
-		$this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_scripts' );
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_styles');
+		$this->loader->add_action('wp_enqueue_scripts', $plugin_public, 'enqueue_scripts');
 
 		// Hook the AJAX wl_timeline action to the Timeline service.
-		$this->loader->add_action( 'wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline' );
+		$this->loader->add_action('wp_ajax_nopriv_wl_timeline', $this->timeline_service, 'ajax_timeline');
 
 	}
 

src/wordlift.php

Spacing +156 added lines, -156 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,23 +210,23 @@ 
 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', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', plugin_dir_url(__FILE__).'bower_components/angular/angular.min.js');
 
 }
 
-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.
@@ -236,23 +236,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.
@@ -261,16 +261,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] : ''
 	);
 }
 
@@ -281,12 +281,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;
@@ -299,18 +299,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();
 	}
 
@@ -318,11 +318,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);
 		}
 	}
 
@@ -339,17 +339,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";
 	}
 
@@ -364,21 +364,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];
 	}
 
@@ -392,10 +392,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);
 }
 
 
@@ -411,14 +411,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();
@@ -426,18 +426,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";
@@ -449,10 +449,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.
@@ -464,7 +464,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 ]" );
 
@@ -474,7 +474,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)));
 }
 
 /**
@@ -483,28 +483,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.
@@ -513,129 +513,129 @@ 
  *
  * @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 = wl_get_entity_post_by_uri( $item_id );
+			$post = wl_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/profiling/wordlift_profiling.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/profiling/wordlift_profiling.php');
+require_once('modules/redirector/wordlift_redirector.php');
+require_once('modules/freebase_image_proxy/wordlift_freebase_image_proxy.php');
 
 // Shortcodes
 
 // Entity view shortcode just with php >= 5.4
-if ( version_compare( phpversion(), '5.4.0', '>=' ) ) {
-	require_once( 'modules/entity_view/wordlift_entity_view.php' );
+if (version_compare(phpversion(), '5.4.0', '>=')) {
+	require_once('modules/entity_view/wordlift_entity_view.php');
 }
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/wordlift_shortcode_blog_map.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/wordlift_shortcode_blog_map.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');
 
-require_once( 'modules/sparql/wordlift_sparql.php' );
+require_once('modules/sparql/wordlift_sparql.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 WordLift admin bar.
-require_once( 'admin/wordlift_admin_bar.php' );
+require_once('admin/wordlift_admin_bar.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');
 
 
 /**
@@ -643,7 +643,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();
 }
 
@@ -652,18 +652,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.

src/wordlift_redlink.php

Indentation +39 added lines, -39 removed lines

@@ -18,55 +18,55 @@
  */
 function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
 
-	// Queue the update query.
-	if ( $queue ) {
+    // Queue the update query.
+    if ( $queue ) {
 
-		if ( WP_DEBUG ) {
-			global $wl_logger;
-			$wl_logger->trace( "Buffering a query [ query :: $query ]" );
-		}
+        if ( WP_DEBUG ) {
+            global $wl_logger;
+            $wl_logger->trace( "Buffering a query [ query :: $query ]" );
+        }
 
-		wl_queue_sparql_update_query( $query );
+        wl_queue_sparql_update_query( $query );
 
-		return true;
-	}
+        return true;
+    }
 
-	// Get the update end-point.
-	$url = wl_configuration_get_query_update_url();
+    // Get the update end-point.
+    $url = wl_configuration_get_query_update_url();
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'  => 'POST',
-		'headers' => array(
-			'Accept'       => 'application/json',
-			'Content-type' => 'application/sparql-update; charset=utf-8'
-		),
-		'body'    => $query
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'  => 'POST',
+        'headers' => array(
+            'Accept'       => 'application/json',
+            'Content-type' => 'application/sparql-update; charset=utf-8'
+        ),
+        'body'    => $query
+    ) );
 
-	// Send the request.
-	$response = wp_remote_post( $url, $args );
+    // Send the request.
+    $response = wp_remote_post( $url, $args );
 
-	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+    // If an error has been raised, return the error.
+    if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+        $body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
 
-		wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+        wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
+        wl_write_log( "\n" . var_export( $args, true ) );
+        wl_write_log( "[ response :: " );
+        wl_write_log( "\n" . var_export( $response, true ) );
+        wl_write_log( "][ body :: " );
+        wl_write_log( "\n" . $body );
+        wl_write_log( "]" );
 
-		return false;
-	}
+        return false;
+    }
 
-	if ( WP_DEBUG ) {
-		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
-	}
+    if ( WP_DEBUG ) {
+        global $wl_logger;
+        $wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+    }
 
-	return true;
+    return true;
 }

Spacing +19 added lines, -19 removed lines

@@ -16,17 +16,17 @@ 
  *
  * @return bool True if successful otherwise false.
  */
-function rl_execute_sparql_update_query( $query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING ) {
+function rl_execute_sparql_update_query($query, $queue = WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING) {
 
 	// Queue the update query.
-	if ( $queue ) {
+	if ($queue) {
 
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			global $wl_logger;
-			$wl_logger->trace( "Buffering a query [ query :: $query ]" );
+			$wl_logger->trace("Buffering a query [ query :: $query ]");
 		}
 
-		wl_queue_sparql_update_query( $query );
+		wl_queue_sparql_update_query($query);
 
 		return true;
 	}
@@ -35,37 +35,37 @@ 
 	$url = wl_configuration_get_query_update_url();
 
 	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 		'method'  => 'POST',
 		'headers' => array(
 			'Accept'       => 'application/json',
 			'Content-type' => 'application/sparql-update; charset=utf-8'
 		),
 		'body'    => $query
-	) );
+	));
 
 	// Send the request.
-	$response = wp_remote_post( $url, $args );
+	$response = wp_remote_post($url, $args);
 
 	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== (int) $response['response']['code'] ) {
+	if (is_wp_error($response) || 200 !== (int) $response['response']['code']) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+		$body = (is_wp_error($response) ? $response->get_error_message() : $response['body']);
 
-		wl_write_log( "rl_execute_sparql_update_query : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+		wl_write_log("rl_execute_sparql_update_query : error [ url :: $url ][ args :: ");
+		wl_write_log("\n".var_export($args, true));
+		wl_write_log("[ response :: ");
+		wl_write_log("\n".var_export($response, true));
+		wl_write_log("][ body :: ");
+		wl_write_log("\n".$body);
+		wl_write_log("]");
 
 		return false;
 	}
 
-	if ( WP_DEBUG ) {
+	if (WP_DEBUG) {
 		global $wl_logger;
-		$wl_logger->trace( "Query executed successfully [ query :: $query ]" );
+		$wl_logger->trace("Query executed successfully [ query :: $query ]");
 	}
 
 	return true;

src/wordlift_to_redlink_data_push_callbacks.php

Indentation +229 added lines, -229 removed lines

@@ -8,67 +8,67 @@ 
 function wl_push_post_to_redlink( $post ) {
 
 
-	// Only handle published posts.
-	if ( 'post' !== $post->post_type or 'publish' !== $post->post_status ) {
-		wl_write_log( "wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]" );
+    // Only handle published posts.
+    if ( 'post' !== $post->post_type or 'publish' !== $post->post_status ) {
+        wl_write_log( "wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the post URI.
-	$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+    // Get the post URI.
+    $uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
 
-	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+    // If the URI ends with a trailing slash, then we have a problem.
+    if ( '/' === substr( $uri, - 1, 1 ) ) {
 
-		wl_write_log( "wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]" );
+        wl_write_log( "wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// wl_write_log( "wl_push_post_to_redlink [ post id :: $post->ID ][ uri :: $uri ]" );
+    // wl_write_log( "wl_push_post_to_redlink [ post id :: $post->ID ][ uri :: $uri ]" );
 
-	// Get the site language in order to define the literals language.
-	$site_language = wl_configuration_get_site_language();
+    // Get the site language in order to define the literals language.
+    $site_language = wl_configuration_get_site_language();
 
-	// save the author and get the author URI.
-	$author_uri = wl_sparql_escape_uri( Wordlift_User_Service::get_instance()->get_uri( $post->post_author ) );
+    // save the author and get the author URI.
+    $author_uri = wl_sparql_escape_uri( Wordlift_User_Service::get_instance()->get_uri( $post->post_author ) );
 
-	// Get other post properties.
-	$date_published      = wl_get_sparql_time( get_the_time( 'c', $post ) );
-	$date_modified       = wl_get_sparql_time( wl_get_post_modified_time( $post ) );
-	$title               = wordlift_esc_sparql( $post->post_title );
-	$permalink           = wl_sparql_escape_uri( get_permalink( $post->ID ) );
-	$user_comments_count = $post->comment_count;
+    // Get other post properties.
+    $date_published      = wl_get_sparql_time( get_the_time( 'c', $post ) );
+    $date_modified       = wl_get_sparql_time( wl_get_post_modified_time( $post ) );
+    $title               = wordlift_esc_sparql( $post->post_title );
+    $permalink           = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+    $user_comments_count = $post->comment_count;
 
-	wl_write_log( "wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]" );
+    wl_write_log( "wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]" );
 
-	// create the SPARQL query.
-	$sparql = '';
-	if ( ! empty( $title ) ) {
-		$sparql .= "<$uri> rdfs:label '$title'@$site_language . \n";
-	}
+    // create the SPARQL query.
+    $sparql = '';
+    if ( ! empty( $title ) ) {
+        $sparql .= "<$uri> rdfs:label '$title'@$site_language . \n";
+    }
 
-	$sparql .= "<$uri> a <http://schema.org/BlogPosting> . \n";
-	$sparql .= "<$uri> schema:url <$permalink> . \n";
-	$sparql .= "<$uri> schema:datePublished $date_published . \n";
-	$sparql .= "<$uri> schema:dateModified $date_modified . \n";
-	if ( ! empty( $author_uri ) ) {
-		$sparql .= "<$uri> schema:author <$author_uri> . \n";
-	}
-	$sparql .= "<$uri> schema:interactionCount 'UserComments:$user_comments_count' . \n";
+    $sparql .= "<$uri> a <http://schema.org/BlogPosting> . \n";
+    $sparql .= "<$uri> schema:url <$permalink> . \n";
+    $sparql .= "<$uri> schema:datePublished $date_published . \n";
+    $sparql .= "<$uri> schema:dateModified $date_modified . \n";
+    if ( ! empty( $author_uri ) ) {
+        $sparql .= "<$uri> schema:author <$author_uri> . \n";
+    }
+    $sparql .= "<$uri> schema:interactionCount 'UserComments:$user_comments_count' . \n";
 
 
-	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $post->ID );
+    // Add SPARQL stmts to write the schema:image.
+    $sparql .= wl_get_sparql_images( $uri, $post->ID );
 
-	// Get the SPARQL fragment with the dcterms:references statement.
-	$sparql .= wl_get_sparql_post_references( $post->ID );
+    // Get the SPARQL fragment with the dcterms:references statement.
+    $sparql .= wl_get_sparql_post_references( $post->ID );
 
-	// create the query:
-	//  - remove existing references to entities.
-	//  - set the new post information (including references).
-	$query = rl_sparql_prefixes() . <<<EOF
+    // create the query:
+    //  - remove existing references to entities.
+    //  - set the new post information (including references).
+    $query = rl_sparql_prefixes() . <<<EOF
             DELETE { <$uri> dct:references ?o . }
             WHERE  { <$uri> dct:references ?o . };
             DELETE { <$uri> schema:url ?o . }
@@ -90,8 +90,8 @@ 
             INSERT DATA { $sparql };
 EOF;
 
-	// execute the query.
-	rl_execute_sparql_update_query( $query );
+    // execute the query.
+    rl_execute_sparql_update_query( $query );
 }
 
 /**
@@ -101,143 +101,143 @@ 
  */
 function wl_push_entity_post_to_redlink( $entity_post ) {
 
-	// Only handle published entities.
-	if ( 'entity' !== $entity_post->post_type or 'publish' !== $entity_post->post_status ) {
+    // Only handle published entities.
+    if ( 'entity' !== $entity_post->post_type or 'publish' !== $entity_post->post_status ) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]" );
+        wl_write_log( "wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// get the entity URI and the SPARQL escaped version.
-	$uri   = wl_get_entity_uri( $entity_post->ID );
-	$uri_e = wl_sparql_escape_uri( $uri );
+    // get the entity URI and the SPARQL escaped version.
+    $uri   = wl_get_entity_uri( $entity_post->ID );
+    $uri_e = wl_sparql_escape_uri( $uri );
 
-	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+    // If the URI ends with a trailing slash, then we have a problem.
+    if ( '/' === substr( $uri, - 1, 1 ) ) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]" );
+        wl_write_log( "wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]" );
 
-		return;
-	}
+        return;
+    }
 
-	// Get the site language in order to define the literals language.
-	$site_language = wl_configuration_get_site_language();
+    // Get the site language in order to define the literals language.
+    $site_language = wl_configuration_get_site_language();
 
-	// get the title and content as label and description.
-	$label     = wordlift_esc_sparql( $entity_post->post_title );
-	$descr     = wordlift_esc_sparql( wp_strip_all_tags( strip_shortcodes( $entity_post->post_content ) ) );
-	$permalink = wl_sparql_escape_uri( get_permalink( $entity_post->ID ) );
+    // get the title and content as label and description.
+    $label     = wordlift_esc_sparql( $entity_post->post_title );
+    $descr     = wordlift_esc_sparql( wp_strip_all_tags( strip_shortcodes( $entity_post->post_content ) ) );
+    $permalink = wl_sparql_escape_uri( get_permalink( $entity_post->ID ) );
 
-	// wl_write_log( "wl_push_entity_post_to_redlink [ entity post id :: $entity_post->ID ][ uri :: $uri ][ label :: $label ]" );
+    // wl_write_log( "wl_push_entity_post_to_redlink [ entity post id :: $entity_post->ID ][ uri :: $uri ][ label :: $label ]" );
 
-	// create a new empty statement.
-	$delete_stmt = '';
-	$sparql      = '';
+    // create a new empty statement.
+    $delete_stmt = '';
+    $sparql      = '';
 
-	// delete on RL all statements regarding properties set from WL (necessary when changing entity type)
-	$all_custom_fields        = wl_entity_taxonomy_get_custom_fields();
-	$predicates_to_be_deleted = array();
-	foreach ( $all_custom_fields as $type => $fields ) {
-		foreach ( $fields as $cf ) {
-			$predicate = $cf['predicate'];
-			if ( ! in_array( $predicate, $predicates_to_be_deleted ) ) {
-				$predicates_to_be_deleted[] = $predicate;
-				$delete_stmt .= "DELETE { <$uri_e> <$predicate> ?o } WHERE  { <$uri_e> <$predicate> ?o };\n";
-			}
-		}
-	}
+    // delete on RL all statements regarding properties set from WL (necessary when changing entity type)
+    $all_custom_fields        = wl_entity_taxonomy_get_custom_fields();
+    $predicates_to_be_deleted = array();
+    foreach ( $all_custom_fields as $type => $fields ) {
+        foreach ( $fields as $cf ) {
+            $predicate = $cf['predicate'];
+            if ( ! in_array( $predicate, $predicates_to_be_deleted ) ) {
+                $predicates_to_be_deleted[] = $predicate;
+                $delete_stmt .= "DELETE { <$uri_e> <$predicate> ?o } WHERE  { <$uri_e> <$predicate> ?o };\n";
+            }
+        }
+    }
 
-	// set the same as.
-	$same_as = wl_schema_get_value( $entity_post->ID, 'sameAs' );
-	foreach ( $same_as as $same_as_uri ) {
-		$same_as_uri_esc = wl_sparql_escape_uri( $same_as_uri );
-		$sparql .= "<$uri_e> owl:sameAs <$same_as_uri_esc> . \n";
-	}
+    // set the same as.
+    $same_as = wl_schema_get_value( $entity_post->ID, 'sameAs' );
+    foreach ( $same_as as $same_as_uri ) {
+        $same_as_uri_esc = wl_sparql_escape_uri( $same_as_uri );
+        $sparql .= "<$uri_e> owl:sameAs <$same_as_uri_esc> . \n";
+    }
 
-	// set the label
-	$sparql .= "<$uri_e> rdfs:label \"$label\"@$site_language . \n";
-	// set the URL
-	$sparql .= "<$uri_e> schema:url <$permalink> . \n";
+    // set the label
+    $sparql .= "<$uri_e> rdfs:label \"$label\"@$site_language . \n";
+    // set the URL
+    $sparql .= "<$uri_e> schema:url <$permalink> . \n";
 
-	// set the description.
-	if ( ! empty( $descr ) ) {
-		$sparql .= "<$uri_e> schema:description \"$descr\"@$site_language . \n";
-	}
+    // set the description.
+    if ( ! empty( $descr ) ) {
+        $sparql .= "<$uri_e> schema:description \"$descr\"@$site_language . \n";
+    }
 
-	$main_type = wl_entity_type_taxonomy_get_type( $entity_post->ID );
+    $main_type = wl_entity_type_taxonomy_get_type( $entity_post->ID );
 
-	if ( null != $main_type ) {
-		$main_type_uri = wl_sparql_escape_uri( $main_type['uri'] );
-		$sparql .= " <$uri_e> a <$main_type_uri> . \n";
+    if ( null != $main_type ) {
+        $main_type_uri = wl_sparql_escape_uri( $main_type['uri'] );
+        $sparql .= " <$uri_e> a <$main_type_uri> . \n";
 
-		// The type define custom fields that hold additional data about the entity.
-		// For example Events may have start/end dates, Places may have coordinates.
-		// The value in the export fields must be rewritten as triple predicates, this
-		// is what we're going to do here.
+        // The type define custom fields that hold additional data about the entity.
+        // For example Events may have start/end dates, Places may have coordinates.
+        // The value in the export fields must be rewritten as triple predicates, this
+        // is what we're going to do here.
 
 //		wl_write_log( 'wl_push_entity_post_to_redlink : checking if entity has export fields [ type :: ' . var_export( $main_type, true ) . ' ]' );
 
-		if ( isset( $main_type['custom_fields'] ) ) {
-			foreach ( $main_type['custom_fields'] as $field => $settings ) {
-
-				// wl_write_log( "wl_push_entity_post_to_redlink : entity has export fields" );
-
-				$predicate = wordlift_esc_sparql( $settings['predicate'] );
-				if ( ! isset( $settings['export_type'] ) || empty( $settings['export_type'] ) ) {
-					$type = null;
-				} else {
-					$type = $settings['export_type'];
-				}
-
-				foreach ( get_post_meta( $entity_post->ID, $field ) as $value ) {
-					$sparql .= " <$uri_e> <$predicate> ";
-
-					if ( ! is_null( $type ) && ( substr( $type, 0, 4 ) == 'http' ) ) {
-						// Type is defined by a raw uri (es. http://schema.org/PostalAddress)
-
-						// Extract uri if the value is numeric
-						if ( is_numeric( $value ) ) {
-							$value = wl_get_entity_uri( $value );
-						}
-
-						$sparql .= '<' . wl_sparql_escape_uri( $value ) . '>';
-					} else {
-						// Type is defined in another way (es. xsd:double)
-						$sparql .= '"' . wordlift_esc_sparql( $value ) . '"^^' . wordlift_esc_sparql( $type );
-					}
-
-					$sparql .= " . \n";
-				}
-			}
-		}
-	}
-
-	// Get the entity types.
-	$type_uris = wl_get_entity_rdf_types( $entity_post->ID );
-
-	// Support type are only schema.org ones: it could be null
-	foreach ( $type_uris as $type_uri ) {
-		$type_uri = wl_sparql_escape_uri( $type_uri );
-		$sparql .= "<$uri_e> a <$type_uri> . \n";
-	}
-
-	// get related entities.
-	$related_entities_ids = wl_core_get_related_entity_ids( $entity_post->ID );
-
-	if ( is_array( $related_entities_ids ) ) {
-		foreach ( $related_entities_ids as $entity_post_id ) {
-			$related_entity_uri = wl_sparql_escape_uri( wl_get_entity_uri( $entity_post_id ) );
-			// create a two-way relationship.
-			$sparql .= " <$uri_e> dct:relation <$related_entity_uri> . \n";
-			$sparql .= " <$related_entity_uri> dct:relation <$uri_e> . \n";
-		}
-	}
-
-	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $entity_post->ID );
-
-	$query = rl_sparql_prefixes() . <<<EOF
+        if ( isset( $main_type['custom_fields'] ) ) {
+            foreach ( $main_type['custom_fields'] as $field => $settings ) {
+
+                // wl_write_log( "wl_push_entity_post_to_redlink : entity has export fields" );
+
+                $predicate = wordlift_esc_sparql( $settings['predicate'] );
+                if ( ! isset( $settings['export_type'] ) || empty( $settings['export_type'] ) ) {
+                    $type = null;
+                } else {
+                    $type = $settings['export_type'];
+                }
+
+                foreach ( get_post_meta( $entity_post->ID, $field ) as $value ) {
+                    $sparql .= " <$uri_e> <$predicate> ";
+
+                    if ( ! is_null( $type ) && ( substr( $type, 0, 4 ) == 'http' ) ) {
+                        // Type is defined by a raw uri (es. http://schema.org/PostalAddress)
+
+                        // Extract uri if the value is numeric
+                        if ( is_numeric( $value ) ) {
+                            $value = wl_get_entity_uri( $value );
+                        }
+
+                        $sparql .= '<' . wl_sparql_escape_uri( $value ) . '>';
+                    } else {
+                        // Type is defined in another way (es. xsd:double)
+                        $sparql .= '"' . wordlift_esc_sparql( $value ) . '"^^' . wordlift_esc_sparql( $type );
+                    }
+
+                    $sparql .= " . \n";
+                }
+            }
+        }
+    }
+
+    // Get the entity types.
+    $type_uris = wl_get_entity_rdf_types( $entity_post->ID );
+
+    // Support type are only schema.org ones: it could be null
+    foreach ( $type_uris as $type_uri ) {
+        $type_uri = wl_sparql_escape_uri( $type_uri );
+        $sparql .= "<$uri_e> a <$type_uri> . \n";
+    }
+
+    // get related entities.
+    $related_entities_ids = wl_core_get_related_entity_ids( $entity_post->ID );
+
+    if ( is_array( $related_entities_ids ) ) {
+        foreach ( $related_entities_ids as $entity_post_id ) {
+            $related_entity_uri = wl_sparql_escape_uri( wl_get_entity_uri( $entity_post_id ) );
+            // create a two-way relationship.
+            $sparql .= " <$uri_e> dct:relation <$related_entity_uri> . \n";
+            $sparql .= " <$related_entity_uri> dct:relation <$uri_e> . \n";
+        }
+    }
+
+    // Add SPARQL stmts to write the schema:image.
+    $sparql .= wl_get_sparql_images( $uri, $entity_post->ID );
+
+    $query = rl_sparql_prefixes() . <<<EOF
     $delete_stmt
     DELETE { <$uri_e> rdfs:label ?o } WHERE  { <$uri_e> rdfs:label ?o };
     DELETE { <$uri_e> owl:sameAs ?o . } WHERE  { <$uri_e> owl:sameAs ?o . };
@@ -249,7 +249,7 @@ 
     INSERT DATA { $sparql };
 EOF;
 
-	rl_execute_sparql_update_query( $query );
+    rl_execute_sparql_update_query( $query );
 }
 
 /**
@@ -261,20 +261,20 @@ 
  */
 function wl_get_sparql_post_references( $post_id ) {
 
-	// Get the post URI.
-	$post_uri = wordlift_esc_sparql( wl_get_entity_uri( $post_id ) );
+    // Get the post URI.
+    $post_uri = wordlift_esc_sparql( wl_get_entity_uri( $post_id ) );
 
-	// Get the related entities IDs.
-	$related = wl_core_get_related_entity_ids( $post_id );
+    // Get the related entities IDs.
+    $related = wl_core_get_related_entity_ids( $post_id );
 
-	// Build the SPARQL fragment.
-	$sparql = '';
-	foreach ( $related as $id ) {
-		$uri = wordlift_esc_sparql( wl_get_entity_uri( $id ) );
-		$sparql .= "<$post_uri> dct:references <$uri> . ";
-	}
+    // Build the SPARQL fragment.
+    $sparql = '';
+    foreach ( $related as $id ) {
+        $uri = wordlift_esc_sparql( wl_get_entity_uri( $id ) );
+        $sparql .= "<$post_uri> dct:references <$uri> . ";
+    }
 
-	return $sparql;
+    return $sparql;
 }
 
 /**
@@ -284,12 +284,12 @@ 
  */
 function rl_sparql_prefixes() {
 
-	$prefixes = '';
-	foreach ( wl_prefixes() as $prefix => $uri ) {
-		$prefixes .= "PREFIX $prefix: <$uri>\n";
-	}
+    $prefixes = '';
+    foreach ( wl_prefixes() as $prefix => $uri ) {
+        $prefixes .= "PREFIX $prefix: <$uri>\n";
+    }
 
-	return $prefixes;
+    return $prefixes;
 }
 
 /**
@@ -300,26 +300,26 @@ 
  * @return string The escaped string.
  */
 function wordlift_esc_sparql( $string ) {
-	// see http://www.w3.org/TR/rdf-sparql-query/
-	//    '\t'	U+0009 (tab)
-	//    '\n'	U+000A (line feed)
-	//    '\r'	U+000D (carriage return)
-	//    '\b'	U+0008 (backspace)
-	//    '\f'	U+000C (form feed)
-	//    '\"'	U+0022 (quotation mark, double quote mark)
-	//    "\'"	U+0027 (apostrophe-quote, single quote mark)
-	//    '\\'	U+005C (backslash)
-
-	$string = str_replace( '\\', '\\\\', $string );
-	$string = str_replace( '\'', '\\\'', $string );
-	$string = str_replace( '"', '\\"', $string );
-	$string = str_replace( "\f", '\\f', $string );
-	$string = str_replace( "\b", '\\b', $string );
-	$string = str_replace( "\r", '\\r', $string );
-	$string = str_replace( "\n", '\\n', $string );
-	$string = str_replace( "\t", '\\t', $string );
-
-	return $string;
+    // see http://www.w3.org/TR/rdf-sparql-query/
+    //    '\t'	U+0009 (tab)
+    //    '\n'	U+000A (line feed)
+    //    '\r'	U+000D (carriage return)
+    //    '\b'	U+0008 (backspace)
+    //    '\f'	U+000C (form feed)
+    //    '\"'	U+0022 (quotation mark, double quote mark)
+    //    "\'"	U+0027 (apostrophe-quote, single quote mark)
+    //    '\\'	U+005C (backslash)
+
+    $string = str_replace( '\\', '\\\\', $string );
+    $string = str_replace( '\'', '\\\'', $string );
+    $string = str_replace( '"', '\\"', $string );
+    $string = str_replace( "\f", '\\f', $string );
+    $string = str_replace( "\b", '\\b', $string );
+    $string = str_replace( "\r", '\\r', $string );
+    $string = str_replace( "\n", '\\n', $string );
+    $string = str_replace( "\t", '\\t', $string );
+
+    return $string;
 }
 
 /**
@@ -333,13 +333,13 @@ 
  */
 function wl_sparql_escape_uri( $string ) {
 
-	// Should we validate the IRI?
-	// http://www.w3.org/TR/sparql11-query/#QSynIRI
+    // Should we validate the IRI?
+    // http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-	$string = str_replace( '<', '\<', $string );
-	$string = str_replace( '>', '\>', $string );
+    $string = str_replace( '<', '\<', $string );
+    $string = str_replace( '>', '\>', $string );
 
-	return $string;
+    return $string;
 
 }
 
@@ -348,35 +348,35 @@ 
  */
 function wordlift_reindex_triple_store() {
 
-	// Get the reindex URL.
-	$url = wl_configuration_get_dataset_index_url();
+    // Get the reindex URL.
+    $url = wl_configuration_get_dataset_index_url();
 
-	// Post the request.
-	// wl_write_log( "wordlift_reindex_triple_store" );
+    // Post the request.
+    // wl_write_log( "wordlift_reindex_triple_store" );
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'  => 'POST',
-		'headers' => array()
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'  => 'POST',
+        'headers' => array()
+    ) );
 
-	$response = wp_remote_request( $url, $args );
+    $response = wp_remote_request( $url, $args );
 
-	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== $response['response']['code'] ) {
+    // If an error has been raised, return the error.
+    if ( is_wp_error( $response ) || 200 !== $response['response']['code'] ) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+        $body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
 
-		wl_write_log( "wordlift_reindex_triple_store : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+        wl_write_log( "wordlift_reindex_triple_store : error [ url :: $url ][ args :: " );
+        wl_write_log( "\n" . var_export( $args, true ) );
+        wl_write_log( "[ response :: " );
+        wl_write_log( "\n" . var_export( $response, true ) );
+        wl_write_log( "][ body :: " );
+        wl_write_log( "\n" . $body );
+        wl_write_log( "]" );
 
-		return false;
-	}
+        return false;
+    }
 
-	return true;
+    return true;
 }
\ No newline at end of file

Spacing +88 added lines, -88 removed lines

@@ -5,23 +5,23 @@ 
  *
  * @param object $post A post instance.
  */
-function wl_push_post_to_redlink( $post ) {
+function wl_push_post_to_redlink($post) {
 
 
 	// Only handle published posts.
-	if ( 'post' !== $post->post_type or 'publish' !== $post->post_status ) {
-		wl_write_log( "wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]" );
+	if ('post' !== $post->post_type or 'publish' !== $post->post_status) {
+		wl_write_log("wl_push_post_to_redlink : not a post or not published [ post type :: $post->post_type ][ post status :: $post->post_status ]");
 
 		return;
 	}
 
 	// Get the post URI.
-	$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+	$uri = wl_sparql_escape_uri(wl_get_entity_uri($post->ID));
 
 	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+	if ('/' === substr($uri, - 1, 1)) {
 
-		wl_write_log( "wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]" );
+		wl_write_log("wl_push_post_to_redlink : the URI is invalid [ post ID :: $post->ID ][ URI :: $uri ]");
 
 		return;
 	}
@@ -32,20 +32,20 @@ 
 	$site_language = wl_configuration_get_site_language();
 
 	// save the author and get the author URI.
-	$author_uri = wl_sparql_escape_uri( Wordlift_User_Service::get_instance()->get_uri( $post->post_author ) );
+	$author_uri = wl_sparql_escape_uri(Wordlift_User_Service::get_instance()->get_uri($post->post_author));
 
 	// Get other post properties.
-	$date_published      = wl_get_sparql_time( get_the_time( 'c', $post ) );
-	$date_modified       = wl_get_sparql_time( wl_get_post_modified_time( $post ) );
-	$title               = wordlift_esc_sparql( $post->post_title );
-	$permalink           = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+	$date_published      = wl_get_sparql_time(get_the_time('c', $post));
+	$date_modified       = wl_get_sparql_time(wl_get_post_modified_time($post));
+	$title               = wordlift_esc_sparql($post->post_title);
+	$permalink           = wl_sparql_escape_uri(get_permalink($post->ID));
 	$user_comments_count = $post->comment_count;
 
-	wl_write_log( "wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]" );
+	wl_write_log("wl_push_post_to_redlink [ post_id :: $post->ID ][ type :: $post->post_type ][ slug :: $post->post_name ][ title :: $post->post_title ][ date modified :: $date_modified ][ date published :: $date_published ]");
 
 	// create the SPARQL query.
 	$sparql = '';
-	if ( ! empty( $title ) ) {
+	if ( ! empty($title)) {
 		$sparql .= "<$uri> rdfs:label '$title'@$site_language . \n";
 	}
 
@@ -53,22 +53,22 @@ 
 	$sparql .= "<$uri> schema:url <$permalink> . \n";
 	$sparql .= "<$uri> schema:datePublished $date_published . \n";
 	$sparql .= "<$uri> schema:dateModified $date_modified . \n";
-	if ( ! empty( $author_uri ) ) {
+	if ( ! empty($author_uri)) {
 		$sparql .= "<$uri> schema:author <$author_uri> . \n";
 	}
 	$sparql .= "<$uri> schema:interactionCount 'UserComments:$user_comments_count' . \n";
 
 
 	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $post->ID );
+	$sparql .= wl_get_sparql_images($uri, $post->ID);
 
 	// Get the SPARQL fragment with the dcterms:references statement.
-	$sparql .= wl_get_sparql_post_references( $post->ID );
+	$sparql .= wl_get_sparql_post_references($post->ID);
 
 	// create the query:
 	//  - remove existing references to entities.
 	//  - set the new post information (including references).
-	$query = rl_sparql_prefixes() . <<<EOF
+	$query = rl_sparql_prefixes().<<<EOF
             DELETE { <$uri> dct:references ?o . }
             WHERE  { <$uri> dct:references ?o . };
             DELETE { <$uri> schema:url ?o . }
@@ -91,7 +91,7 @@ 
 EOF;
 
 	// execute the query.
-	rl_execute_sparql_update_query( $query );
+	rl_execute_sparql_update_query($query);
 }
 
 /**
@@ -99,24 +99,24 @@ 
  *
  * @param object $entity_post An entity post instance.
  */
-function wl_push_entity_post_to_redlink( $entity_post ) {
+function wl_push_entity_post_to_redlink($entity_post) {
 
 	// Only handle published entities.
-	if ( 'entity' !== $entity_post->post_type or 'publish' !== $entity_post->post_status ) {
+	if ('entity' !== $entity_post->post_type or 'publish' !== $entity_post->post_status) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]" );
+		wl_write_log("wl_push_entity_post_to_redlink : not an entity or not published [ post type :: $entity_post->post_type ][ post status :: $entity_post->post_status ]");
 
 		return;
 	}
 
 	// get the entity URI and the SPARQL escaped version.
-	$uri   = wl_get_entity_uri( $entity_post->ID );
-	$uri_e = wl_sparql_escape_uri( $uri );
+	$uri   = wl_get_entity_uri($entity_post->ID);
+	$uri_e = wl_sparql_escape_uri($uri);
 
 	// If the URI ends with a trailing slash, then we have a problem.
-	if ( '/' === substr( $uri, - 1, 1 ) ) {
+	if ('/' === substr($uri, - 1, 1)) {
 
-		wl_write_log( "wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]" );
+		wl_write_log("wl_push_entity_post_to_redlink : the URI is invalid [ post ID :: $entity_post->ID ][ URI :: $uri ]");
 
 		return;
 	}
@@ -125,9 +125,9 @@ 
 	$site_language = wl_configuration_get_site_language();
 
 	// get the title and content as label and description.
-	$label     = wordlift_esc_sparql( $entity_post->post_title );
-	$descr     = wordlift_esc_sparql( wp_strip_all_tags( strip_shortcodes( $entity_post->post_content ) ) );
-	$permalink = wl_sparql_escape_uri( get_permalink( $entity_post->ID ) );
+	$label     = wordlift_esc_sparql($entity_post->post_title);
+	$descr     = wordlift_esc_sparql(wp_strip_all_tags(strip_shortcodes($entity_post->post_content)));
+	$permalink = wl_sparql_escape_uri(get_permalink($entity_post->ID));
 
 	// wl_write_log( "wl_push_entity_post_to_redlink [ entity post id :: $entity_post->ID ][ uri :: $uri ][ label :: $label ]" );
 
@@ -138,10 +138,10 @@ 
 	// delete on RL all statements regarding properties set from WL (necessary when changing entity type)
 	$all_custom_fields        = wl_entity_taxonomy_get_custom_fields();
 	$predicates_to_be_deleted = array();
-	foreach ( $all_custom_fields as $type => $fields ) {
-		foreach ( $fields as $cf ) {
+	foreach ($all_custom_fields as $type => $fields) {
+		foreach ($fields as $cf) {
 			$predicate = $cf['predicate'];
-			if ( ! in_array( $predicate, $predicates_to_be_deleted ) ) {
+			if ( ! in_array($predicate, $predicates_to_be_deleted)) {
 				$predicates_to_be_deleted[] = $predicate;
 				$delete_stmt .= "DELETE { <$uri_e> <$predicate> ?o } WHERE  { <$uri_e> <$predicate> ?o };\n";
 			}
@@ -149,9 +149,9 @@ 
 	}
 
 	// set the same as.
-	$same_as = wl_schema_get_value( $entity_post->ID, 'sameAs' );
-	foreach ( $same_as as $same_as_uri ) {
-		$same_as_uri_esc = wl_sparql_escape_uri( $same_as_uri );
+	$same_as = wl_schema_get_value($entity_post->ID, 'sameAs');
+	foreach ($same_as as $same_as_uri) {
+		$same_as_uri_esc = wl_sparql_escape_uri($same_as_uri);
 		$sparql .= "<$uri_e> owl:sameAs <$same_as_uri_esc> . \n";
 	}
 
@@ -161,14 +161,14 @@ 
 	$sparql .= "<$uri_e> schema:url <$permalink> . \n";
 
 	// set the description.
-	if ( ! empty( $descr ) ) {
+	if ( ! empty($descr)) {
 		$sparql .= "<$uri_e> schema:description \"$descr\"@$site_language . \n";
 	}
 
-	$main_type = wl_entity_type_taxonomy_get_type( $entity_post->ID );
+	$main_type = wl_entity_type_taxonomy_get_type($entity_post->ID);
 
-	if ( null != $main_type ) {
-		$main_type_uri = wl_sparql_escape_uri( $main_type['uri'] );
+	if (null != $main_type) {
+		$main_type_uri = wl_sparql_escape_uri($main_type['uri']);
 		$sparql .= " <$uri_e> a <$main_type_uri> . \n";
 
 		// The type define custom fields that hold additional data about the entity.
@@ -178,33 +178,33 @@ 
 
 //		wl_write_log( 'wl_push_entity_post_to_redlink : checking if entity has export fields [ type :: ' . var_export( $main_type, true ) . ' ]' );
 
-		if ( isset( $main_type['custom_fields'] ) ) {
-			foreach ( $main_type['custom_fields'] as $field => $settings ) {
+		if (isset($main_type['custom_fields'])) {
+			foreach ($main_type['custom_fields'] as $field => $settings) {
 
 				// wl_write_log( "wl_push_entity_post_to_redlink : entity has export fields" );
 
-				$predicate = wordlift_esc_sparql( $settings['predicate'] );
-				if ( ! isset( $settings['export_type'] ) || empty( $settings['export_type'] ) ) {
+				$predicate = wordlift_esc_sparql($settings['predicate']);
+				if ( ! isset($settings['export_type']) || empty($settings['export_type'])) {
 					$type = null;
 				} else {
 					$type = $settings['export_type'];
 				}
 
-				foreach ( get_post_meta( $entity_post->ID, $field ) as $value ) {
+				foreach (get_post_meta($entity_post->ID, $field) as $value) {
 					$sparql .= " <$uri_e> <$predicate> ";
 
-					if ( ! is_null( $type ) && ( substr( $type, 0, 4 ) == 'http' ) ) {
+					if ( ! is_null($type) && (substr($type, 0, 4) == 'http')) {
 						// Type is defined by a raw uri (es. http://schema.org/PostalAddress)
 
 						// Extract uri if the value is numeric
-						if ( is_numeric( $value ) ) {
-							$value = wl_get_entity_uri( $value );
+						if (is_numeric($value)) {
+							$value = wl_get_entity_uri($value);
 						}
 
-						$sparql .= '<' . wl_sparql_escape_uri( $value ) . '>';
+						$sparql .= '<'.wl_sparql_escape_uri($value).'>';
 					} else {
 						// Type is defined in another way (es. xsd:double)
-						$sparql .= '"' . wordlift_esc_sparql( $value ) . '"^^' . wordlift_esc_sparql( $type );
+						$sparql .= '"'.wordlift_esc_sparql($value).'"^^'.wordlift_esc_sparql($type);
 					}
 
 					$sparql .= " . \n";
@@ -214,20 +214,20 @@ 
 	}
 
 	// Get the entity types.
-	$type_uris = wl_get_entity_rdf_types( $entity_post->ID );
+	$type_uris = wl_get_entity_rdf_types($entity_post->ID);
 
 	// Support type are only schema.org ones: it could be null
-	foreach ( $type_uris as $type_uri ) {
-		$type_uri = wl_sparql_escape_uri( $type_uri );
+	foreach ($type_uris as $type_uri) {
+		$type_uri = wl_sparql_escape_uri($type_uri);
 		$sparql .= "<$uri_e> a <$type_uri> . \n";
 	}
 
 	// get related entities.
-	$related_entities_ids = wl_core_get_related_entity_ids( $entity_post->ID );
+	$related_entities_ids = wl_core_get_related_entity_ids($entity_post->ID);
 
-	if ( is_array( $related_entities_ids ) ) {
-		foreach ( $related_entities_ids as $entity_post_id ) {
-			$related_entity_uri = wl_sparql_escape_uri( wl_get_entity_uri( $entity_post_id ) );
+	if (is_array($related_entities_ids)) {
+		foreach ($related_entities_ids as $entity_post_id) {
+			$related_entity_uri = wl_sparql_escape_uri(wl_get_entity_uri($entity_post_id));
 			// create a two-way relationship.
 			$sparql .= " <$uri_e> dct:relation <$related_entity_uri> . \n";
 			$sparql .= " <$related_entity_uri> dct:relation <$uri_e> . \n";
@@ -235,9 +235,9 @@ 
 	}
 
 	// Add SPARQL stmts to write the schema:image.
-	$sparql .= wl_get_sparql_images( $uri, $entity_post->ID );
+	$sparql .= wl_get_sparql_images($uri, $entity_post->ID);
 
-	$query = rl_sparql_prefixes() . <<<EOF
+	$query = rl_sparql_prefixes().<<<EOF
     $delete_stmt
     DELETE { <$uri_e> rdfs:label ?o } WHERE  { <$uri_e> rdfs:label ?o };
     DELETE { <$uri_e> owl:sameAs ?o . } WHERE  { <$uri_e> owl:sameAs ?o . };
@@ -249,7 +249,7 @@ 
     INSERT DATA { $sparql };
 EOF;
 
-	rl_execute_sparql_update_query( $query );
+	rl_execute_sparql_update_query($query);
 }
 
 /**
@@ -259,18 +259,18 @@ 
  *
  * @return string The SPARQL fragment (or an empty string).
  */
-function wl_get_sparql_post_references( $post_id ) {
+function wl_get_sparql_post_references($post_id) {
 
 	// Get the post URI.
-	$post_uri = wordlift_esc_sparql( wl_get_entity_uri( $post_id ) );
+	$post_uri = wordlift_esc_sparql(wl_get_entity_uri($post_id));
 
 	// Get the related entities IDs.
-	$related = wl_core_get_related_entity_ids( $post_id );
+	$related = wl_core_get_related_entity_ids($post_id);
 
 	// Build the SPARQL fragment.
 	$sparql = '';
-	foreach ( $related as $id ) {
-		$uri = wordlift_esc_sparql( wl_get_entity_uri( $id ) );
+	foreach ($related as $id) {
+		$uri = wordlift_esc_sparql(wl_get_entity_uri($id));
 		$sparql .= "<$post_uri> dct:references <$uri> . ";
 	}
 
@@ -285,7 +285,7 @@ 
 function rl_sparql_prefixes() {
 
 	$prefixes = '';
-	foreach ( wl_prefixes() as $prefix => $uri ) {
+	foreach (wl_prefixes() as $prefix => $uri) {
 		$prefixes .= "PREFIX $prefix: <$uri>\n";
 	}
 
@@ -299,7 +299,7 @@ 
  *
  * @return string The escaped string.
  */
-function wordlift_esc_sparql( $string ) {
+function wordlift_esc_sparql($string) {
 	// see http://www.w3.org/TR/rdf-sparql-query/
 	//    '\t'	U+0009 (tab)
 	//    '\n'	U+000A (line feed)
@@ -310,14 +310,14 @@ 
 	//    "\'"	U+0027 (apostrophe-quote, single quote mark)
 	//    '\\'	U+005C (backslash)
 
-	$string = str_replace( '\\', '\\\\', $string );
-	$string = str_replace( '\'', '\\\'', $string );
-	$string = str_replace( '"', '\\"', $string );
-	$string = str_replace( "\f", '\\f', $string );
-	$string = str_replace( "\b", '\\b', $string );
-	$string = str_replace( "\r", '\\r', $string );
-	$string = str_replace( "\n", '\\n', $string );
-	$string = str_replace( "\t", '\\t', $string );
+	$string = str_replace('\\', '\\\\', $string);
+	$string = str_replace('\'', '\\\'', $string);
+	$string = str_replace('"', '\\"', $string);
+	$string = str_replace("\f", '\\f', $string);
+	$string = str_replace("\b", '\\b', $string);
+	$string = str_replace("\r", '\\r', $string);
+	$string = str_replace("\n", '\\n', $string);
+	$string = str_replace("\t", '\\t', $string);
 
 	return $string;
 }
@@ -331,13 +331,13 @@ 
  *
  * @return string The escaped URI.
  */
-function wl_sparql_escape_uri( $string ) {
+function wl_sparql_escape_uri($string) {
 
 	// Should we validate the IRI?
 	// http://www.w3.org/TR/sparql11-query/#QSynIRI
 
-	$string = str_replace( '<', '\<', $string );
-	$string = str_replace( '>', '\>', $string );
+	$string = str_replace('<', '\<', $string);
+	$string = str_replace('>', '\>', $string);
 
 	return $string;
 
@@ -355,25 +355,25 @@ 
 	// wl_write_log( "wordlift_reindex_triple_store" );
 
 	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 		'method'  => 'POST',
 		'headers' => array()
-	) );
+	));
 
-	$response = wp_remote_request( $url, $args );
+	$response = wp_remote_request($url, $args);
 
 	// If an error has been raised, return the error.
-	if ( is_wp_error( $response ) || 200 !== $response['response']['code'] ) {
+	if (is_wp_error($response) || 200 !== $response['response']['code']) {
 
-		$body = ( is_wp_error( $response ) ? $response->get_error_message() : $response['body'] );
+		$body = (is_wp_error($response) ? $response->get_error_message() : $response['body']);
 
-		wl_write_log( "wordlift_reindex_triple_store : error [ url :: $url ][ args :: " );
-		wl_write_log( "\n" . var_export( $args, true ) );
-		wl_write_log( "[ response :: " );
-		wl_write_log( "\n" . var_export( $response, true ) );
-		wl_write_log( "][ body :: " );
-		wl_write_log( "\n" . $body );
-		wl_write_log( "]" );
+		wl_write_log("wordlift_reindex_triple_store : error [ url :: $url ][ args :: ");
+		wl_write_log("\n".var_export($args, true));
+		wl_write_log("[ response :: ");
+		wl_write_log("\n".var_export($response, true));
+		wl_write_log("][ body :: ");
+		wl_write_log("\n".$body);
+		wl_write_log("]");
 
 		return false;
 	}